[Balloon-svn] r1839 - balloon/branches/menuconfig2/package/k…

Author: codehelp
Date: 2012-02-23 17:26:13 +0000 (Thu, 23 Feb 2012)
New Revision: 1839

Modified:
balloon/branches/menuconfig2/package/kernel/Config.in
balloon/branches/menuconfig2/package/kernel/kernel.mk
Log:
Reinstate linux-2.6.38-rc6 for SPECS support

Modified: balloon/branches/menuconfig2/package/kernel/Config.in
===================================================================
--- balloon/branches/menuconfig2/package/kernel/Config.in    2012-02-21 11:59:56 UTC (rev 1838)
+++ balloon/branches/menuconfig2/package/kernel/Config.in    2012-02-23 17:26:13 UTC (rev 1839)
@@ -42,6 +42,10 @@
     bool "2.6.38.2"
     depends on !BR2_BALLOON2 && BR2_EXPERT

+config BR2_KERNEL_2.6.38-rc6 
+    bool "2.6.38-rc6" 
+    depends on (BR2_BALLOON3 || BR2_BALLOON4) && BR2_EXPERT
+
 config BR2_KERNEL_2.6.39.1
     bool "2.6.39.1"
     depends on !BR2_BALLOON2 && BR2_EXPERT

Modified: balloon/branches/menuconfig2/package/kernel/kernel.mk
===================================================================
--- balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-02-21 11:59:56 UTC (rev 1838)
+++ balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-02-23 17:26:13 UTC (rev 1839)
@@ -50,6 +50,16 @@
 endif
 endif

+ifdef BR2_KERNEL_2.6.38-rc6
+KERNVER:=2.6.38-rc6
+INITRAMFSOPTS:=CONFIG_INITRAMFS_SOURCE=usr/initramfs.cpio
+ifdef BR2_KERNEL_INITRD_GZIP
+INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+else
+INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_NONE=y
+endif
+endif
+
ifdef BR2_KERNEL_2.6.38.2
KERNVER:=2.6.38.2
INITRAMFSOPTS:=CONFIG_INITRAMFS_SOURCE=usr/initramfs.cpio
@@ -172,7 +182,7 @@

ifeq ($(BR2_KERNEL_INITRAMFS_BUILDROOT),y)
KERNOPTS+=INITRAMFS=$(BUILDDIR)/buildroot/rootfs.cpio
-else
+else
KERNOPTS+=INITRAMFS=$(BR2_KERNEL_INITRAMFS_PATH)
endif

@@ -188,7 +198,7 @@
 kernel-menuconfig: kernel-check-current
     ($(KERNOPTS) $(MAKE) $(MAKEOPTS) -C $(PACKAGEDIR)/kernel menuconfig)

-kernel: zImageBoot zImageBootModules
+kernel: zImageBoot zImageBootModules

.phony: kernel-menuconfig kernel-check-current kernel

@@ -232,7 +242,7 @@
 #zImageBoot-menuconfig:
 #    ($(MAKE) $(MAKEOPTS) -C $(BUILDDIR)/kernel/linux-$(KERNVER) menuconfig)

-zImageBootModules: $(BUILDDIR)/kernel/kernel.deps.stamp kernel-check-current 
+zImageBootModules: $(BUILDDIR)/kernel/kernel.deps.stamp kernel-check-current
     ($(KERNOPTS) $(MAKE) $(MAKEOPTS) -C $(PACKAGEDIR)/kernel modules)
 ifeq ($(BR2_KERNEL_CUSTOM_MODULE),y)
     ($(KERNOPTS) $(MAKE) $(MAKEOPTS) -C $(PACKAGEDIR)/kernel custom_module)
@@ -258,7 +268,7 @@

.phony: zImageBootModules zImageBootModules-clean zImageBootModules-dist zImageBootModules-distclean

-zImageInitrd: $(BUILDDIR)/kernel/kernel.deps.stamp kernel-check-current 
+zImageInitrd: $(BUILDDIR)/kernel/kernel.deps.stamp kernel-check-current
 ifeq ($(BR2_INITRD_MODULES),y)
     echo "I: building initrd kernel package with modules"
 ifeq ($(BR2_KERNEL_UBOOT),y)