[Balloon-svn] r1871 - in balloon/branches/menuconfig2: . pac…

Author: codehelp
Date: 2012-05-08 12:24:44 +0100 (Tue, 08 May 2012)
New Revision: 1871

Modified:
balloon/branches/menuconfig2/Config.in
balloon/branches/menuconfig2/package/kernel/Makefile
balloon/branches/menuconfig2/package/kernel/kernel.mk
Log:
Add ability to stamp the linux-image debian package with a name instead of using the board-variant combination

Modified: balloon/branches/menuconfig2/Config.in
===================================================================
--- balloon/branches/menuconfig2/Config.in    2012-05-04 15:41:00 UTC (rev 1870)
+++ balloon/branches/menuconfig2/Config.in    2012-05-08 11:24:44 UTC (rev 1871)
@@ -149,8 +149,17 @@
     bool "Build Debian packages"
     default "y"
     help
-      Allow Debian packages to be created
+      Allow Debian packages to be created using a stamp name,
+      if defined.

+config BR2_DEBIAN_PACKAGES_STAMP
+    string
+    default ""
+    help
+      String used to replace the board-variant-subvariant name
+      used for the linux-image- Debian package. (lower-case only)
+      Do not use underscores.
+
 source package/Config.in

#endmenu

Modified: balloon/branches/menuconfig2/package/kernel/Makefile
===================================================================
--- balloon/branches/menuconfig2/package/kernel/Makefile    2012-05-04 15:41:00 UTC (rev 1870)
+++ balloon/branches/menuconfig2/package/kernel/Makefile    2012-05-08 11:24:44 UTC (rev 1871)
@@ -62,8 +62,13 @@

 debpkg: $(BUILD)/.config
     svn info | grep ^Revision: | cut -d" " -f2 > $(BUILD)/.debversion
+ifneq (,$(PKGSTAMP))
+    echo $(PKGSTAMP) > $(BUILD)/.debboard
+    echo > $(BUILD)/.debvariant
+else
     echo $(BOARD) > $(BUILD)/.debboard
     echo $(VARIANT) > $(BUILD)/.debvariant
+endif
     (cd $(BUILD) && $(CROSSOPTS) $(MAKE) $(MAKEOPTS) $(NOINITRAMFSOPTS) deb-pkg)
     #$(shell rm $(BUILD)/.debversion $(BUILD)/.debboard $(BUILD)/.debvariant)

Modified: balloon/branches/menuconfig2/package/kernel/kernel.mk
===================================================================
--- balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-05-04 15:41:00 UTC (rev 1870)
+++ balloon/branches/menuconfig2/package/kernel/kernel.mk    2012-05-08 11:24:44 UTC (rev 1871)
@@ -163,6 +163,10 @@
 KERNOPTS+=INITRAMFS=$(BR2_KERNEL_INITRAMFS_PATH)
 endif

+ifneq (,$(BR2_DEBIAN_PACKAGES_STAMP))
+KERNOPTS+=PKGSTAMP=$(BR2_DEBIAN_PACKAGES_STAMP)
+endif
+
KERNEL_LAST=$(shell cat $(BUILDDIR)/kernel/current.stamp)
KERNEL_CURRENT=$(BOARD)$(VARIANT)$(KERNVER)$(YAFFSCHECKOUT)