SPECS: squashfs_lzma.spec - new module build system - use __cxx as...

sparky sparky at pld-linux.org
Mon Feb 20 00:52:55 CET 2006


Author: sparky                       Date: Sun Feb 19 23:52:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new module build system
- use __cxx as userspace linker

---- Files affected:
SPECS:
   squashfs_lzma.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/squashfs_lzma.spec
diff -u SPECS/squashfs_lzma.spec:1.4 SPECS/squashfs_lzma.spec:1.5
--- SPECS/squashfs_lzma.spec:1.4	Thu Dec 15 22:52:00 2005
+++ SPECS/squashfs_lzma.spec	Mon Feb 20 00:52:50 2006
@@ -116,6 +116,7 @@
 %if %{with userspace}
 %{__make} -C squashfs-tools \
 	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	CFLAGS="-I. %{rpmcflags}"
 %endif
 
@@ -126,31 +127,29 @@
 	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
-%ifarch ppc
-	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-		install -d include/asm
-		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-	else
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	fi
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
 %endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
 
 	%{__make} -C %{_kernelsrcdir} clean \
 		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 \
 		CC="%{__cc}" CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	mv squashfs_lzma{,-$cfg}.ko
@@ -215,6 +214,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/02/19 23:52:50  sparky
+- new module build system
+- use __cxx as userspace linker
+
 Revision 1.4  2005/12/15 21:52:00  qboosh
 - pl fixes, cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squashfs_lzma.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list