r2074 - in trunk/utils/kernel-kbuild-2.6-3: . debian

[Joshua Kwan]

Author: joshk
Date: 2004-12-27 16:52:40 -0700 (Mon, 27 Dec 2004)
New Revision: 2074

Modified:
   trunk/utils/kernel-kbuild-2.6-3/
   trunk/utils/kernel-kbuild-2.6-3/debian/
   trunk/utils/kernel-kbuild-2.6-3/debian/rules
   trunk/utils/kernel-kbuild-2.6-3/decide.sh
Log:
works!



Property changes on: trunk/utils/kernel-kbuild-2.6-3
___________________________________________________________________
Name: svn:ignore
   + *-stamp
kernel-source-2.6.8
decide.sh.out



Property changes on: trunk/utils/kernel-kbuild-2.6-3/debian
___________________________________________________________________
Name: svn:ignore
   + kernel-kbuild-2.6-3*
files


Modified: trunk/utils/kernel-kbuild-2.6-3/debian/rules
===================================================================
--- trunk/utils/kernel-kbuild-2.6-3/debian/rules	2004-12-27 22:44:41 UTC (rev 2073)
+++ trunk/utils/kernel-kbuild-2.6-3/debian/rules	2004-12-27 23:52:40 UTC (rev 2074)
@@ -25,40 +25,46 @@
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 unpack: unpack-stamp
-unpack-stamp:
+unpack-stamp: decide.sh.out
 	dh_testdir
 	tar jxf /usr/src/kernel-source-$(version).tar.bz2
+	touch $@
+
+decide.sh.out: decide.sh
 	sed 's/@kbuild@/$(kbpkg)/' decide.sh > decide.sh.out
 	chmod +x decide.sh.out
-	touch unpack-stamp
 
-build: unpack-stamp
+build: build-stamp
+build-stamp: unpack-stamp
 	dh_testdir
 
 ifneq ($(DEB_HOST_ARCH),sparc)
 	cd kernel-source-$(version); \
-		make defconfig; \
+		$(MAKE) defconfig; \
 		mv .config .config.old; \
 		sed 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \
 			.config.old > .config; \
-		make prepare
+		$(MAKE) prepare
 else
 	cd kernel-source-$(version); \
-	for karch in sparc sparc64; \
-		make ARCH=$$karch defconfig; \
+	for karch in sparc sparc64; do \
+		$(MAKE) mrproper; \
+		$(MAKE) ARCH=$$karch defconfig; \
 		mv .config .config.old; \
 		sed 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \
 			.config.old > .config; \
-		make ARCH=$$karch prepare; \
+		$(MAKE) ARCH=$$karch prepare; \
+		$(MAKE) ARCH=$$karch scripts; \
 		mkdir -p scripts/mod/$$karch; \
 		cp -a scripts/mod/mk_elfconfig scripts/mod/modpost scripts/mod/$$karch/; \
 		rm scripts/mod/modpost scripts/mod/mk_elfconfig scripts/mod/*.o; \
 	done
 endif
+	touch $@
 
 clean:
 	dh_testdir
-	rm -f unpack-stamp
+	rm -f unpack-stamp decide.sh.out
 	rm -rf kernel-source-$(version)
 	dh_clean
 
@@ -67,11 +73,19 @@
 	dh_clean -k
 	dh_installdirs
 
+ifeq ($(DEB_HOST_ARCH),sparc)
 	cd kernel-source-$(version); \
-		find . -type f -path './scripts/*' ! -name '*.o' | \
+		cp ../decide.sh.out scripts/mod/decide.sh; \
+		ln -sf decide.sh scripts/mod/modpost; \
+		ln -sf decide.sh scripts/mod/mk_elfconfig
+endif
+
+	cd kernel-source-$(version); \
+		find . \( -type f -or -type l \) -path './scripts/*' ! -name '*.o' | \
 			cpio -pd $(kbtarget)
-	> $(kbtarget)/scripts/Makefile
+	:> $(kbtarget)/scripts/Makefile
 
+
 # Build architecture-independent files here.
 binary-indep:
 

Modified: trunk/utils/kernel-kbuild-2.6-3/decide.sh
===================================================================
--- trunk/utils/kernel-kbuild-2.6-3/decide.sh	2004-12-27 22:44:41 UTC (rev 2073)
+++ trunk/utils/kernel-kbuild-2.6-3/decide.sh	2004-12-27 23:52:40 UTC (rev 2074)
@@ -1,7 +1,19 @@
 #!/bin/sh
 
-arch="$(uname -m)"
+if [ -n "$srctree" ]; then
+	if [ -f "$srctree/.config" ]; then
+		case "$(grep 'CONFIG_SPARC=..=y' .config | cut -d= -f1)" in
+			CONFIG_SPARC64) arch=sparc64 ;;
+			CONFIG_SPARC32) arch=sparc ;;
+		esac
+	fi
+fi
 
+# Bah
+if [ -z "$arch" ]; then	
+	arch="$(uname -m)"
+fi
+
 case "$arch" in
 	sparc | sparc64) ;;
 	*)