r2458 - in trunk/kernel/sparc: kernel-image-2.6.10-sparc-2.6.10 kernel-image-2.6.10-sparc-2.6.10/debian kernel-image-2.6.8-sparc-2.6.8/debian

[Joshua Kwan]

Author: joshk
Date: 2005-02-08 01:04:00 +0100 (Tue, 08 Feb 2005)
New Revision: 2458

Modified:
   trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/debian/rules
   trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/header-install
   trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/post-install
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules
Log:
fix stuff


Modified: trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/debian/rules	2005-02-07 20:35:06 UTC (rev 2457)
+++ trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/debian/rules	2005-02-08 00:04:00 UTC (rev 2458)
@@ -54,7 +54,7 @@
 endif
 
 unpack: unpack-stamp
-unpack-stamp:
+unpack-stamp: header-install.out
 	tar jxf /usr/src/kernel-source-$(version).tar.bz2
 	cd $(kdir); \
 		/usr/src/kernel-patches/all/$(version)/apply/debian $(ktver)
@@ -76,10 +76,13 @@
 	done
 	cp config/default $(kdir)/.config
 	ln -s `command -v touch` bin/touch.orig
-	sed 's/@kbpkg@/$(kbpkg)/g' header-install > header-install.out
+
 	chmod u+x header-install.out
 	touch $@
 
+header-install.out: header-install
+	sed 's/@kbpkg@/$(kbpkg)/g' header-install > header-install.out
+	
 build: build-stamp
 build-stamp: unpack-stamp
 	PATH=$$PWD/bin:$$PATH; \
@@ -116,10 +119,9 @@
 	dh_testdir
 
 # Link asm-offsets.s into main kernel-headers zone
-	for i in $(flavours); do \
-		karch=$${i%-smp}; karch=$${karch%32}; \
-		ln -f build-$$i/arch/$$karch/kernel/asm-offsets.s $(kdir)/arch/$$karch/kernel/; \
-	done
+	if [ -e "build-sparc32/arch/sparc/kernel/asm-offsets.s" ]; then \
+		ln -f build-sparc32/arch/sparc/kernel/asm-offsets.s $(kdir)/arch/sparc/kernel/; \
+	fi
 
 	cd $(kdir); HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
 		make-kpkg --subarch sparc64 $(appvan) kernel-headers

Modified: trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/header-install
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/header-install	2005-02-07 20:35:06 UTC (rev 2457)
+++ trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/header-install	2005-02-08 00:04:00 UTC (rev 2458)
@@ -11,7 +11,6 @@
 		-path './debian/*' -prune -o \
 		-type f \( -name Makefile -o -name 'Kconfig*' \) -print
 	echo arch/sparc/kernel/asm-offsets.s
-	echo arch/sparc64/kernel/asm-offsets.s
 } | cpio -pd --preserve-modification-time $OLDPWD
 cd - > /dev/null
 ln -s ../$kbpkg/scripts .

Modified: trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/post-install
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/post-install	2005-02-07 20:35:06 UTC (rev 2457)
+++ trunk/kernel/sparc/kernel-image-2.6.10-sparc-2.6.10/post-install	2005-02-08 00:04:00 UTC (rev 2458)
@@ -25,6 +25,9 @@
 top=$PWD/debian/$pkg
 dir=$top/usr/src/kernel-headers-$version
 
+karch=${suffix%-smp}
+karch=${karch%32}
+
 debhelper_pre $pkg
 
 mkdir -p $dir/include/linux
@@ -42,10 +45,11 @@
 cd include
 find . -mindepth 1 -maxdepth 1 \
 	! -name config -a ! -name linux -a \( \
-	! -name 'asm-*' -o -name asm-generic -o -name asm-sparc -o -name asm-sparc64 \) \
+	! -name 'asm-*' -o -name asm-generic -o -name asm-$karch \) \
 	-printf "../../kernel-headers-$prefix/include/%f\n" |
 	xargs ln -s --target-directory=$dir/include
 cp -a config $dir/include
+ln -sf asm-$karch $dir/include/asm
 find linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
 	-printf "../../../kernel-headers-$prefix/include/linux/%f\n" |

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules	2005-02-07 20:35:06 UTC (rev 2457)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/rules	2005-02-08 00:04:00 UTC (rev 2458)
@@ -119,7 +119,9 @@
 	dh_testdir
 
 # Link asm-offsets.s into main kernel-headers zone
-	ln -f build-sparc32/arch/sparc/kernel/asm-offsets.s $(kdir)/arch/sparc/kernel/
+	if [ -e "build-sparc32/arch/sparc/kernel/asm-offsets.s" ]; then \
+		ln -f build-sparc32/arch/sparc/kernel/asm-offsets.s $(kdir)/arch/sparc/kernel/; \
+	fi
 
 	cd $(kdir); HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
 		make-kpkg --subarch sparc64 $(appvan) kernel-headers