[Balloon-svn] r1155 - in balloon/branches/menuconfig/package…

Author: nick
Date: 2010-06-13 19:20:47 +0100 (Sun, 13 Jun 2010)
New Revision: 1155

Modified:
balloon/branches/menuconfig/package/Config.in
balloon/branches/menuconfig/package/initrd/Config.in
balloon/branches/menuconfig/package/initrd/initrd.mk
Log:
move initrd modules menu option into initrd package dir

Modified: balloon/branches/menuconfig/package/Config.in
===================================================================
--- balloon/branches/menuconfig/package/Config.in    2010-06-13 18:18:43 UTC (rev 1154)
+++ balloon/branches/menuconfig/package/Config.in    2010-06-13 18:20:47 UTC (rev 1155)
@@ -6,14 +6,14 @@

if BR2_PACKAGE_KERNEL

-config BR2_KERNEL_ROOTFS
-    bool "embed kernel in rootfs"
-    depends on BR2_PACKAGE_ROOTFS
-    default y
+#config BR2_KERNEL_ROOTFS
+#    bool "embed kernel in rootfs"
+#    depends on BR2_PACKAGE_ROOTFS
+#    default y

-config BR2_KERNEL_INITRD
-    bool "embed kernel in initrd"
-    depends on BR2_PACKAGE_INITRD
-    default n
+#config BR2_KERNEL_INITRD
+#    bool "embed kernel in initrd"
+#    depends on BR2_PACKAGE_INITRD
+#    default n

endif

Modified: balloon/branches/menuconfig/package/initrd/Config.in
===================================================================
--- balloon/branches/menuconfig/package/initrd/Config.in    2010-06-13 18:18:43 UTC (rev 1154)
+++ balloon/branches/menuconfig/package/initrd/Config.in    2010-06-13 18:20:47 UTC (rev 1155)
@@ -15,4 +15,9 @@

endchoice

+config BR2_INITRD_MODULES
+    depends on BR2_PACKAGE_INITRD && BR2_KERNEL_MODULES
+    bool "build initramfs with kernel modules"
+    default "n"
+
 endif

Modified: balloon/branches/menuconfig/package/initrd/initrd.mk
===================================================================
--- balloon/branches/menuconfig/package/initrd/initrd.mk    2010-06-13 18:18:43 UTC (rev 1154)
+++ balloon/branches/menuconfig/package/initrd/initrd.mk    2010-06-13 18:20:47 UTC (rev 1155)
@@ -2,8 +2,15 @@
     -$(MAKE) $(MAKEOPTS) -C $(BUILDDIR)/initrd clean

 initramfs:
-    ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/initrd all)
+    ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/initrd initrd)
+ifeq ($(BR2_INITRD_MODULES),y)
+    # only single thread builds
+    ($(MAKE) -C $(CHECKOUT)/initrd initrd-modules)
+endif

+initramfs-menuconfig:
+    ($(MAKE) $(MAKEOPTS) -C $(CHECKOUT)/initrd menuconfig)
+
 ifeq ($(BR2_PACKAGE_INITRD),y)
 TARGETS+=initramfs

@@ -19,4 +26,4 @@
endif

endif
-.phony: initramfs initramfs-clean
+.phony: initramfs initramfs-clean initramfs-menuconfig