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

Author: nick
Date: 2010-06-19 14:30:39 +0100 (Sat, 19 Jun 2010)
New Revision: 1172

Modified:
balloon/branches/menuconfig/kernel/Makefile
Log:
tidy up Makefile dependencies

Modified: balloon/branches/menuconfig/kernel/Makefile
===================================================================
--- balloon/branches/menuconfig/kernel/Makefile    2010-06-19 13:30:12 UTC (rev 1171)
+++ balloon/branches/menuconfig/kernel/Makefile    2010-06-19 13:30:39 UTC (rev 1172)
@@ -36,11 +36,7 @@
 endif

DEFCONFIGFILE:=arch/arm/configs/balloon3_defconfig
-#DEFCONFIGFILE:=.config

-#    (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)

@@ -50,13 +46,15 @@
     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) $(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
+#    cp -f $(BUILDINITRDDIR)/$(BUILDROOTIMAGEPATH)rootfs.arm.cpio $(BUILD)/usr/initramfs_data.cpio && \
+
 $(RES)/zImageInitrd:  $(RES)/zImageBoot $(RES)/rootfs.arm.cpio
-    cp -f $(BUILDINITRDDIR)/$(BUILDROOTIMAGEPATH)rootfs.arm.cpio $(BUILD)/usr/initramfs_data.cpio && \
+    cp -f $(RES)/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 && \
     touch $(BUILD)/usr/initramfs_data.cpio.gz
@@ -65,6 +63,7 @@

 $(RES)/rootfs.arm.cpio:
     $(MAKE) -C $(CHECKOUT) initramfs
+    cp -f $(BUILDINITRDDIR)/$(BUILDROOTIMAGEPATH)rootfs.arm.cpio $(RES)/rootfs.arm.cpio

# we could make another tarball as below, but currently direct copy of list in initrd build.