dslinux/toolchain Makefile

stsp stsp at user.in-berlin.de
Tue Aug 15 03:48:08 CEST 2006


Update of /cvsroot/dslinux/dslinux/toolchain
In directory antilope:/tmp/cvs-serv17060

Modified Files:
	Makefile 
Log Message:
While configuring Linux kernel headers, backup and restore
kernel config if present.


Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/toolchain/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	15 Aug 2006 01:30:11 -0000	1.13
+++ Makefile	15 Aug 2006 01:48:06 -0000	1.14
@@ -309,7 +309,7 @@
 
 sysroot-create: copy-headers
 sysroot-reset:
-	rm -f $(foreach f, .kernel-headers-configured \
+	rm -f $(foreach f, .kernel-configured \
 		.uClibc-headers-compiled .headers-copied, $(SRCDIR)/$(f))
 sysroot-clean: 
 	rm -rf $(SYSROOT)
@@ -318,6 +318,9 @@
 
 # configure kernel headers
 $(SRCDIR)/.kernel-configured:
+	# backup kernel config if exists
+	-[ -e $(KERNEL_SRCDIR)/.config ] \
+		&& cp $(KERNEL_SRCDIR)/.config $(CWD)/.kernelconfig.saved
 	make -C $(KERNEL_SRCDIR) mrproper
 	-cd $(KERNEL_SRCDIR) && yes "" | $(MAKE) ARCH=arm oldconfig prepare
 	touch $@
@@ -327,6 +330,9 @@
 	mkdir -p $(SYSROOT)/usr
 	tar -C $(UCLIBC_SRCDIR) --exclude=CVS -h -c -f - include \
 		| tar -C $(SYSROOT)/usr -x -f -
+	# restore kernel config if backup exists
+	-[ -e $(CWD)/.kernelconfig.saved ] \
+		&& mv $(CWD)/.kernelconfig.saved $(KERNEL_SRCDIR)/.config
 	touch $@
 
 #######################################################################




More information about the dslinux-commit mailing list