[Ocfs2-commits] jlbec commits r1837 - in trunk: . vendor/redhat
vendor/suse
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Jan 24 15:13:39 CST 2005
Author: jlbec
Date: 2005-01-24 15:13:37 -0600 (Mon, 24 Jan 2005)
New Revision: 1837
Modified:
trunk/Kbuild-24.make
trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
o Name ocfs2 packages as ocfs2-`uname -r`, because that is much nicer
Modified: trunk/Kbuild-24.make
===================================================================
--- trunk/Kbuild-24.make 2005-01-24 20:07:07 UTC (rev 1836)
+++ trunk/Kbuild-24.make 2005-01-24 21:13:37 UTC (rev 1837)
@@ -98,10 +98,17 @@
build-modules: $(single-used-m) $(multi-used-m)
+
+# Kbuild uses INSTALL_MOD_PATH for rooted installs. Makebo uses
+# DESTDIR. Folks really should set INSTALL_MOD_PATH, but in case they
+# don't...
+INSTALL_MOD_PATH ?= $(DESTDIR)
+MODLIB = $(INSTALL_MOD_PATH)$(MODULEDIR)
+
install-modules: $(obj-m)
- $(TOPDIR)/mkinstalldirs $(DESTDIR)$(MODULEDIR)/$(INSTALL_MOD_DIR)
+ $(TOPDIR)/mkinstalldirs $(MODLIB)/$(INSTALL_MOD_DIR)
for file in $(obj-m); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(MODULEDIR)/$(INSTALL_MOD_DIR)/$$file; \
+ $(INSTALL_DATA) $$file $(MODLIB)/$(INSTALL_MOD_DIR)/$$file; \
done
clean-modules:
Modified: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in 2005-01-24 20:07:07 UTC (rev 1836)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in 2005-01-24 21:13:37 UTC (rev 1837)
@@ -67,7 +67,7 @@
uniprocessor kernels.
%if %{buildsmp}
-%package smp
+%package -n ocfs2-%{kver}smp
Summary: The Oracle Cluster Filesystem 2 for SMP systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
@@ -77,14 +77,14 @@
AutoReqProv: no
-%description smp
+%description -n ocfs2-%{kver}smp
OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
symmetric multiprocessor kernels.
%endif
%if %{buildhugemem}
-%package hugemem
+%package -n ocfs2-%{kver}hugemem
Summary: The Oracle Cluster Filesystem for huge memory systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
@@ -94,14 +94,14 @@
AutoReqProv: no
-%description hugemem
+%description -n ocfs2-%{kver}hugemem
OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
symmetric multiprocessor kernels.
%endif
%if %{builddebug}
-%package debug
+%package -n ocfs2-%{kver}debug
Summary: The Oracle Cluster Filesystem 2 for debugging systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
@@ -111,7 +111,7 @@
AutoReqProv: no
-%description debug
+%description -n ocfs2-%{kver}debug
OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
debugging kernels.
%endif
@@ -164,28 +164,28 @@
%endif
%if %{buildsmp}
-%post smp
+%post -n ocfs2-%{kver}smp
depmod -a
-%files smp
+%files -n ocfs2-%{kver}smp
%defattr(-,root,root)
/lib/modules/%{kver}smp/kernel/fs
%endif
%if %{buildhugemem}
-%post hugemem
+%post -n ocfs2-%{kver}hugemem
depmod -a
-%files hugemem
+%files -n ocfs2-%{kver}hugemem
%defattr(-,root,root)
/lib/modules/%{kver}hugemem/kernel/fs
%endif
%if %{builddebug}
-%post debug
+%post -n ocfs2-%{kver}debug
depmod -a
-%files debug
+%files -n ocfs2-%{kver}debug
%defattr(-,root,root)
/lib/modules/%{kver}debug/kernel/fs
%endif
Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2005-01-24 20:07:07 UTC (rev 1836)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2005-01-24 21:13:37 UTC (rev 1837)
@@ -68,8 +68,6 @@
%endif
-
-# This must be changed to the minimum ABI compat kernel version expected
%define base 2.6.5
%define sver %{generic}
%define kver %{base}-%{sver}
@@ -272,7 +270,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/default"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -280,7 +287,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/smp"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -288,7 +304,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/bigsmp"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -296,7 +321,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/64k-pagesize"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -304,7 +338,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/sn2"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-sn2/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -312,7 +355,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/iseries64"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-iseries64/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -320,7 +372,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pmac64"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-pmac64/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -328,7 +389,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pseries64"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-pseries64/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -336,7 +406,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-s390/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -344,7 +423,16 @@
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390x"
%configure --with-kernel="${KPATH}"
make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-s390x/kernel/drivers/addon/ocfs2" install
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}/ocfs2*.ko" "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/usysfs"
+mv "${EXTRA_MODLIB}/usysfs.ko" "${INST_MODLIB}/fs/usysfs/"
+
make clean
%endif
@@ -359,7 +447,7 @@
%files default
%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-default/kernel/fs
%endif
@@ -369,7 +457,7 @@
%files smp
%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-smp/kernel/fs
%endif
@@ -379,7 +467,7 @@
%files bigsmp
%defattr(-,root,root)
-/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-bigsmp/kernel/fs
%endif
@@ -389,7 +477,7 @@
%files 64k-pagesize
%defattr(-,root,root)
-/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-64k-pagesize/kernel/fs
%endif
@@ -399,7 +487,7 @@
%files sn2
%defattr(-,root,root)
-/lib/modules/%{kver}-sn2/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-sn2/kernel/fs
%endif
@@ -409,7 +497,7 @@
%files iseries64
%defattr(-,root,root)
-/lib/modules/%{kver}-iseries64/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-iseries64/kernel/fs
%endif
@@ -419,7 +507,7 @@
%files pmac64
%defattr(-,root,root)
-/lib/modules/%{kver}-pmac64/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-pmac64/kernel/fs
%endif
@@ -429,7 +517,7 @@
%files pseries64
%defattr(-,root,root)
-/lib/modules/%{kver}-pseries64/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-pseries64/kernel/fs
%endif
@@ -439,7 +527,7 @@
%files s390
%defattr(-,root,root)
-/lib/modules/%{kver}-s390/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-s390/kernel/fs
%endif
@@ -449,7 +537,7 @@
%files s390x
%defattr(-,root,root)
-/lib/modules/%{kver}-s390x/kernel/drivers/addon/ocfs2
+/lib/modules/%{kver}-s390x/kernel/fs
%endif
More information about the Ocfs2-commits
mailing list