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

Author: nick
Date: 2012-05-08 16:49:22 +0100 (Tue, 08 May 2012)
New Revision: 1872

Modified:
balloon/branches/menuconfig2/package/kernel/Config.in
balloon/branches/menuconfig2/package/kernel/Makefile
balloon/branches/menuconfig2/package/kernel/kernel.mk
Log:
add subvariant support for kernel package

Modified: balloon/branches/menuconfig2/package/kernel/Config.in
===================================================================
--- balloon/branches/menuconfig2/package/kernel/Config.in    2012-05-08 11:24:44 UTC (rev 1871)
+++ balloon/branches/menuconfig2/package/kernel/Config.in    2012-05-08 15:49:22 UTC (rev 1872)
@@ -58,12 +58,16 @@
     bool "3.0"
     depends on !BR2_BALLOON2 && BR2_EXPERT

+config BR2_KERNEL_3.1.10
+    bool "3.1.10"
+    depends on !BR2_BALLOON2 && BR2_EXPERT
+
 config BR2_KERNEL_3.2.9
     bool "3.2.9"
     depends on !BR2_BALLOON2 && BR2_EXPERT

-config BR2_KERNEL_3.3-rc6
-    bool "3.3-rc6"
+config BR2_KERNEL_3.3
+    bool "3.3"
     depends on !BR2_BALLOON2 && BR2_EXPERT
 endchoice

@@ -119,11 +123,6 @@

endchoice

-config BR2_KERNEL_SUBVARIANT
-    depends on BR2_KERNEL_2.6.36-rc5 && BR2_EXPERT
-    bool "Make test subvariant? The series and optionally balloon3config file has -test suffix"
-    default "n"
-
 config BR2_KERNEL_REMAKE
     depends on BR2_EXPERT
     bool "Rebuild Linux kernel"

Modified: balloon/branches/menuconfig2/package/kernel/Makefile
===================================================================
--- balloon/branches/menuconfig2/package/kernel/Makefile    2012-05-08 11:24:44 UTC (rev 1871)
+++ balloon/branches/menuconfig2/package/kernel/Makefile    2012-05-08 15:49:22 UTC (rev 1872)
@@ -280,12 +280,19 @@

 #$(RES)/series.stamp: $(TOPLEVELMAKEFILES)
 $(RES)/series.stamp:
-    if [ -z "$(CONF)/$(VARIANT)" -o ! -f $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) ] ; then \
+    if [ -f $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) ]; then \
+      ln -sf $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) $(CONF)/series; \
+    elif [ -f $(CONF)/series-$(BOARD)$(VARIANT) ]; then \
+      ln -sf $(CONF)/series-$(BOARD)$(VARIANT) $(CONF)/series; \
+    else \
       ln -sf $(CONF)/series-$(BOARD).default $(CONF)/series; \
-    else \
-      ln -sf $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) $(CONF)/series; \
     fi
     touch $(RES)/series.stamp
+#    if [ -z "$(CONF)/$(VARIANT)" -o ! -f $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) ] ; then \
+#      ln -sf $(CONF)/series-$(BOARD).default $(CONF)/series; \
+#    else \
+#      ln -sf $(CONF)/series-$(BOARD)$(VARIANT)$(SUBVARIANT) $(CONF)/series; \
+#    fi

 menuconfig: $(BUILD)/.config
     $(CROSSOPTS) $(MAKE) -C $(BUILD) menuconfig

Modified: balloon/branches/menuconfig2/package/kernel/kernel.mk
===================================================================
--- balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-05-08 11:24:44 UTC (rev 1871)
+++ balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-05-08 15:49:22 UTC (rev 1872)
@@ -64,6 +64,13 @@
 INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_NONE=y
 endif

+ifdef BR2_KERNEL_3.1.10
+KERNELSITE:=http://kernel.org/pub/linux/kernel/v3.0
+KERNVER:=3.1.10
+INITRAMFSOPTS:=CONFIG_INITRAMFS_SOURCE=usr/initramfs.cpio
+INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_NONE=y
+endif
+
ifdef BR2_KERNEL_3.2.9
KERNELSITE:=http://kernel.org/pub/linux/kernel/v3.0
KERNVER:=3.2.9
@@ -71,9 +78,9 @@
INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_NONE=y
endif

-ifdef BR2_KERNEL_3.3-rc6
+ifdef BR2_KERNEL_3.3
KERNELSITE:=http://kernel.org/pub/linux/kernel/v3.0
-KERNVER:=3.3-rc6
+KERNVER:=3.3
INITRAMFSOPTS:=CONFIG_INITRAMFS_SOURCE=usr/initramfs.cpio
INITRAMFSOPTS+=CONFIG_INITRAMFS_COMPRESSION_NONE=y
endif
@@ -127,12 +134,13 @@
ifdef BR2_KERNEL_INITRD_GZIP
KERNOPTS+=INITRD_GZIP=y
endif
+
ifneq ($(VARIANT),)
KERNOPTS+=VARIANT=$(VARIANT)
endif

-ifeq ($(BR2_KERNEL_SUBVARIANT),y)
-KERNOPTS+=SUBVARIANT=-test
+ifneq ($(SUBVARIANT),)
+KERNOPTS+=SUBVARIANT=-$(SUBVARIANT)
endif

ifeq ($(BR2_PACKAGE_ANDROID_KERNEL),y)