SPECS: kernel-block-gnbd.spec, kernel-cluster-cman.spec, kernel-cl...

zbyniu zbyniu at pld-linux.org
Mon May 15 02:14:16 CEST 2006


Author: zbyniu                       Date: Mon May 15 00:14:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.02.00; updated kernel modules build procedure

---- Files affected:
SPECS:
   kernel-block-gnbd.spec (1.6 -> 1.7) , kernel-cluster-cman.spec (1.10 -> 1.11) , kernel-cluster-dlm.spec (1.10 -> 1.11) , kernel-fs-gfs.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/kernel-block-gnbd.spec
diff -u SPECS/kernel-block-gnbd.spec:1.6 SPECS/kernel-block-gnbd.spec:1.7
--- SPECS/kernel-block-gnbd.spec:1.6	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-block-gnbd.spec	Mon May 15 02:14:11 2006
@@ -9,13 +9,13 @@
 Summary:	Block device driver to share storage to many machines over a network
 Summary(pl):	Sterownik urządzenia blokowego do współdzielenia przestrzeni między wieloma maszynami w sieci
 Name:		kernel-block-gnbd
-Version:	1.01.00
+Version:	1.02.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
+# Source0-md5:	131c34c8b66d8d7d74384839ed4091d0
 URL:		http://sources.redhat.com/cluster/gnbd/
 BuildRequires:	perl-base
 %if %{with kernel}
@@ -71,28 +71,35 @@
 cd src
 ln -s . linux
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-	exit 1
-    fi
-    rm -rf include
-    install -d include/{linux,config}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-    %if %{without dist_kernel}
-        [ ! -x %{_kernelsrcdir}/scripts/kallsyms ] || ln -sf %{_kernelsrcdir}/scripts
-    %endif
-    touch include/config/MARKER
-    %{__make} -C %{_kernelsrcdir} clean \
-	RCS_FIND_IGNORE="-name '*.ko' -o" \
-	M=$PWD O=$PWD \
-	%{?with_verbose:V=1}
-    %{__make} -C %{_kernelsrcdir} modules \
-	RCS_FIND_IGNORE="-name '*.ko' -o" \
-	CC="%{__cc}" CPP="%{__cpp}" \
-	M=$PWD O=$PWD \
-	%{?with_verbose:V=1}
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	rm -rf o
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
+	%{__make} -C %{_kernelsrcdir} clean \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		USING_KBUILD=yes \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
+	%{__make} -C %{_kernelsrcdir} modules \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		USING_KBUILD=yes \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
 
 	mv gnbd.ko gnbd-$cfg.ko
 done
@@ -140,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/05/15 00:14:11  zbyniu
+- up to 1.02.00; updated kernel modules build procedure
+
 Revision 1.6  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/kernel-cluster-cman.spec
diff -u SPECS/kernel-cluster-cman.spec:1.10 SPECS/kernel-cluster-cman.spec:1.11
--- SPECS/kernel-cluster-cman.spec:1.10	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-cluster-cman.spec	Mon May 15 02:14:11 2006
@@ -10,13 +10,13 @@
 Summary:	General-purpose symmetric cluster manager
 Summary(pl):	Zarządca klastrów symetrycznych ogólnego przeznaczenia
 Name:		kernel-cluster-cman
-Version:	1.01.00
+Version:	1.02.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
+# Source0-md5:	131c34c8b66d8d7d74384839ed4091d0
 URL:		http://sources.redhat.com/cluster/cman/
 BuildRequires:	perl-base
 %if %{with kernel}
@@ -106,24 +106,31 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	rm -rf o
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	%if %{without dist_kernel}
-	[ ! -x %{_kernelsrcdir}/scripts/kallsyms ] || ln -sf %{_kernelsrcdir}/scripts
-	%endif
-	touch include/config/MARKER
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 	%{__make} -C %{_kernelsrcdir} clean \
+		USING_KBUILD=yes \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
 		CC="%{__cc}" CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
+		USING_KBUILD=yes \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	mv cman.ko cman-$cfg.ko
@@ -185,6 +192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/05/15 00:14:11  zbyniu
+- up to 1.02.00; updated kernel modules build procedure
+
 Revision 1.10  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/kernel-cluster-dlm.spec
diff -u SPECS/kernel-cluster-dlm.spec:1.10 SPECS/kernel-cluster-dlm.spec:1.11
--- SPECS/kernel-cluster-dlm.spec:1.10	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-cluster-dlm.spec	Mon May 15 02:14:11 2006
@@ -10,13 +10,13 @@
 Summary:	General-purpose distributed lock manager
 Summary(pl):	Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:		kernel-cluster-dlm
-Version:	1.01.00
+Version:	1.02.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
+# Source0-md5:	131c34c8b66d8d7d74384839ed4091d0
 URL:		http://sources.redhat.com/cluster/dlm/
 BuildRequires:	kernel-cluster-cman-devel
 %if %{with kernel}
@@ -92,25 +92,32 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	rm -rf o
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	%if %{without dist_kernel}
-	[ ! -x %{_kernelsrcdir}/scripts/kallsyms ] || ln -sf %{_kernelsrcdir}/scripts
-	%endif
-	touch include/config/MARKER
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 	%{__make} -C %{_kernelsrcdir} clean \
-	RCS_FIND_IGNORE="-name '*.ko' -o" \
-	M=$PWD O=$PWD \
-	%{?with_verbose:V=1}
+		USING_KBUILD=yes \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
-	RCS_FIND_IGNORE="-name '*.ko' -o" \
-	CC="%{__cc}" CPP="%{__cpp}" \
-	M=$PWD O=$PWD \
-	%{?with_verbose:V=1}
+		CC="%{__cc}" CPP="%{__cpp}" \
+		USING_KBUILD=yes \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
 
 	mv dlm.ko dlm-$cfg.ko
 done
@@ -171,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/05/15 00:14:11  zbyniu
+- up to 1.02.00; updated kernel modules build procedure
+
 Revision 1.10  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/kernel-fs-gfs.spec
diff -u SPECS/kernel-fs-gfs.spec:1.8 SPECS/kernel-fs-gfs.spec:1.9
--- SPECS/kernel-fs-gfs.spec:1.8	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-fs-gfs.spec	Mon May 15 02:14:11 2006
@@ -10,13 +10,13 @@
 Summary:	Shared-disk cluster file system
 Summary(pl):	System plików dla klastrów z współdzieloną przestrzenią dyskową
 Name:		kernel-fs-gfs
-Version:	1.01.00
+Version:	1.02.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
+# Source0-md5:	131c34c8b66d8d7d74384839ed4091d0
 URL:		http://sources.redhat.com/cluster/gfs/
 BuildRequires:	kernel-cluster-cman-devel
 BuildRequires:	kernel-cluster-dlm-devel
@@ -120,24 +120,31 @@
 	    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	    fi
-	    rm -rf include
-	    install -d include/{linux,config}
-	    ln -sf %{_kernelsrcdir}/config-$cfg .config
-	    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	    rm -rf o
+	    install -d o/include/linux
+	    ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 	    ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	    %if %{without dist_kernel}
-	        [ ! -x %{_kernelsrcdir}/scripts/kallsyms ] || ln -sf %{_kernelsrcdir}/scripts
-	    %endif
-	    touch include/config/MARKER
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 	    %{__make} -C %{_kernelsrcdir} clean \
+		USING_KBUILD=yes \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	    %{__make} -C %{_kernelsrcdir} modules \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		USING_KBUILD=yes \
 		CC="%{__cc}" CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	    case "$dir" in
@@ -250,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/05/15 00:14:11  zbyniu
+- up to 1.02.00; updated kernel modules build procedure
+
 Revision 1.8  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-block-gnbd.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/kernel-cluster-cman.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/kernel-cluster-dlm.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/kernel-fs-gfs.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list