[Balloon-svn] r1156 - balloon/branches/menuconfig/kernel

Author: nick
Date: 2010-06-13 19:21:51 +0100 (Sun, 13 Jun 2010)
New Revision: 1156

Modified:
balloon/branches/menuconfig/kernel/Makefile
Log:
implement kernel menuconfig option

Modified: balloon/branches/menuconfig/kernel/Makefile
===================================================================
--- balloon/branches/menuconfig/kernel/Makefile    2010-06-13 18:20:47 UTC (rev 1155)
+++ balloon/branches/menuconfig/kernel/Makefile    2010-06-13 18:21:51 UTC (rev 1156)
@@ -41,19 +41,21 @@
 #    (cd $(BUILD) && \
 #    (cd $(BUILD) && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) balloon3_defconfig && \

+$(BUILD)/.config: $(KERNSOURCES) $(RES)/unpacked-$(KERNVER).stamp $(RES)/quilt.stamp
+    (cd $(BUILD) && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) balloon3_defconfig)
+
 #normal boot version of kernel (no initrd)
-$(RES)/zImageBoot: $(KERNSOURCES) $(RES)/unpacked-$(KERNVER).stamp $(RES)/quilt.stamp
+$(RES)/zImageBoot: $(BUILD)/.config
     # make sure initrd is not present before building
     rm -f $(BUILD)/usr/initramfs_data.cpio.gz
     rm -f $(BUILD)/usr/initramfs_data.cpio.bz2
     rm -f $(BUILD)/usr/initramfs.cpio
-    (cd $(BUILD) && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) balloon3_defconfig && \
-          $(CROSSOPTS) $(MAKE) $(MAKEOPTS) $(NOINITRAMFSOPTS)zImage)
+    (cd $(BUILD)  && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) $(NOINITRAMFSOPTS)zImage)
     cp $(BUILD)/arch/arm/boot/zImage $(RES)/zImageBoot

 #installer version of kernel (including initrd)
 #$(RES)/zImageInitrd:  $(KERNSOURCES) $(RES)/zImageBoot $(BUILDDIR)/initrd/$(BUILDROOTIMAGEPATH)rootfs.arm.cpio
-$(RES)/zImageInitrd:  $(KERNSOURCES) $(RES)/zImageBoot $(RES)/rootfs.arm.cpio
+$(RES)/zImageInitrd:  $(RES)/zImageBoot $(RES)/rootfs.arm.cpio
     cp -f $(BUILDINITRDDIR)/$(BUILDROOTIMAGEPATH)rootfs.arm.cpio $(BUILD)/usr/initramfs_data.cpio && \
     cp $(BUILD)/usr/initramfs_data.cpio $(BUILD)/usr/initramfs.cpio && \
     gzip -f $(BUILD)/usr/initramfs_data.cpio && \
@@ -61,7 +63,8 @@
     (cd $(BUILD) && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) $(INITRAMFSOPTS) zImage)
     cp $(BUILD)/arch/arm/boot/zImage $(RES)/zImageInitrd

-$(RES)/rootfs.arm.cpio: initrd
+$(RES)/rootfs.arm.cpio:
+    $(MAKE) -C $(CHECKOUT) initramfs

 # we could make another tarball as below, but currently direct copy of list in initrd build. 
@@ -136,9 +139,8 @@
     fi
     touch $(RES)/series.stamp

-# just use initrd makefile to make sure everything is ready
-initrd: 
-    $(MAKE) -C ../initrd
+menuconfig: $(BUILD)/.config
+    $(MAKE) -C $(BUILD) menuconfig

 clean:
     rm -f $(RES)/zImageBoot $(RES)/zImageInitrd $(RES)/modules.tgz
@@ -169,4 +171,4 @@
     cp $(RES)/yaffs-$(YAFFSCHECKOUT).tar.bz2 $(DISTRODIR)/sources/kernel/
     ( cd $(DISTRODIR)/sources/kernel/ && rm -rf patches && svn export svn://balloonboard.org/balloon/trunk/kernel patches)

-.PHONY: all kernel installer modules initrd clean distclean install dist source
+.PHONY: all kernel installer modules initramfs clean distclean install dist source menuconfig