Changeset 507

Timestamp:

Nov 2, 2007, 1:27:49 AM (16 years ago)

Author:

andersk

Message:

Bump to OpenAFS 1.4.5.

Location:

server/fedora

Files:

• Makefile (modified) (2 diffs)
• meta-patches/openafs-client.init.patch (deleted)
• specs/openafs.spec.patch (modified) (2 diffs)

server/fedora/Makefile

@@ -38 +38 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
-
-openafs_rpm_args = -E "%define kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
 
 .PHONY: minimal-clean
@@ -118 +116 @@
 $(allsrc): setup
         PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-        rpmbuild -ba ${tmp_specs}/$@*.spec
+        rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@*.spec
 
 openafs-kernel: setup
         PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-        rpmbuild $(openafs_rpm_args) -bb --define "build_userspace 0" --define "build_modules 1" ${tmp_specs}/openafs*.spec
+        rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/openafs*.spec
+
+openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants ''" --define "kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
+openafs: rpmbuild_args += $(openafs_rpmbuild_args)
+openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 
 suexec: install-srpms

server/fedora/specs/openafs.spec.patch

@@ -10 +10 @@
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -556,6 +558,10 @@
+@@ -556,6 +558,8 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -16 +16 @@
 +%patch1000 -p1 -b .scripts
 +
-+grep -rl '#include <linux/config.h>' . | xargs perl -pi -e's,#include <linux/config.h>,/* #include <linux/config.h> */,'
-+
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
  %patch0 -p1 -b .kmod26