Multiboot support in kernel-power-bootimg package

Changed version string to 2.6.28.10-power47
Changed maintainer to me

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 3827256..9f6ebb1 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,10 +1,11 @@
-kernel-power (2.6.28-pali1) fremantle; urgency=low
+kernel-power (2.6.28-10power47) fremantle; urgency=low
 
   * enabled additional kernel modules (for usb host mode)
   * backported bq27x00_battery patch
   * some patches from kernel-power bugtracker
+  * multiboot support in kernel-power-bootimg package
 
- -- Pali Rohár <pali.rohar@gmail.com>  Sat, 16 Apr 2011 08:21:47 +0200
+ -- Pali Rohár <pali.rohar@gmail.com>  Sun, 01 May 2011 01:22:09 +0200
 
 kernel-power (2.6.28-maemo46) fremantle; urgency=low
 
@@ -506,12 +507,6 @@ kernel (2.6.28-20102101) unstable; urgency=low
   * Fixes: NB#160073 - wl1251_cmd_data_path leaks small buffer on error path
 
  -- Eugene Lyubimkin <ext-lyubimkin.eugene@nokia.com>  Fri, 28 May 2010 10:55:06 +0300
-kernel (2.6.28-20101501+0m5) unstable; urgency=low
-
-  * This entry has been added by BIFH queue processor
-    version has been changed to 2.6.28-20101501+0m5
-
- -- Lyubimkin Eugene <ext-lyubimkin.eugene@nokia.com>  Thu, 15 Apr 2010 09:13:02 +0300
 
 kernel (2.6.28-20101501) unstable; urgency=low
 
@@ -548,13 +543,6 @@ kernel (2.6.28-20100904) unstable; urgency=low
 
  -- Eugene Lyubimkin <ext-lyubimkin.eugene@nokia.com>  Fri, 05 Mar 2010 12:11:31 +0200
 
-kernel (2.6.28-20100903+0m5) unstable; urgency=low
-
-  * This entry has been added by BIFH queue processor
-    version has been changed to 2.6.28-20100903+0m5
-
- -- Lyubimkin Eugene <ext-lyubimkin.eugene@nokia.com>  Wed, 03 Mar 2010 10:11:53 +0200
-
 kernel (2.6.28-20100903) unstable; urgency=low
 
   * Fixes: NB#149006 - PVR: fix kernel crash due to freeing resource still in
@@ -729,37 +717,6 @@ kernel (2.6.28-20095001) intrepid; urgency=low
 
  -- Yauheni Kaliuta <yauheni.kaliuta@nokia.com>  Wed, 09 Dec 2009 09:50:07 +0200
 
-kernel (2.6.28-20094803.3+0m5) intrepid; urgency=low
-
-  * This entry has been added by BIFH queue processor
-    Suffix +0m5 added to package revision
-
- -- mika yrjola <ext-mika.2.yrjola@nokia.com>  Thu, 17 Dec 2009 09:23:47 +0200
-
-kernel (2.6.28-20094803.3) intrepid; urgency=low
-
-  * Fixes: NB#145487 - Some devices are rebooting when the device is idle
-  * No changes in any certification category.
-
- -- Yauheni Kaliuta <yauheni.kaliuta@nokia.com>  Wed, 16 Dec 2009 14:58:39 +0200
-
-kernel (2.6.28-20094803.2) intrepid; urgency=low
-
-  * fs+usb build
-  * fix enumeration problem
-  * Fixes: NB#150109 - Re-enumerate USB after rebooting the PC in
-    ACT_DEAD
-  * Fixes: NB#148525 - Free space disappears after PR1.0.1 to PR1.1 upgrade
-  * No changes in any certification category.
-
- -- Yauheni Kaliuta <yauheni.kaliuta@nokia.com>  Mon, 14 Dec 2009 10:00:53 +0200
-
-kernel (2.6.28-20094803.1) intrepid; urgency=low
-
-  * Fixes: NB#150262 - repeating kernel oopses in ieee80211_beacon_loss
-
- -- Yauheni Kaliuta <yauheni.kaliuta@nokia.com>  Fri, 11 Dec 2009 09:54:31 +0200
-
 kernel (2.6.28-20094803) intrepid; urgency=low
 
   * packaging: clean up kernel package.

diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 6c78f35..9b9e930 100644 (file)
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -1,7 +1,7 @@
 Source: kernel-power
 Section: utils
 Priority: optional
-Maintainer: Thomas Tanner <maemo@tannerlab.com>
+Maintainer: Pali Rohár <pali.rohar@gmail.com>
 XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528
 Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils
 Standards-Version: 3.8.0
@@ -123,7 +123,7 @@ Package: kernel-power-bootimg
 Architecture: armel
 Description: Linux kernel boot image
  This package provides a bootable and flashable kernel image for kexec and
- flashing via USB cable in /boot.
+ flashing via USB cable in /boot. It contains item file for multiboot entry.
  This package is optional and only useful for multiboot or experts.
 
 Package: kernel-power-headers

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index c497ec7..0813102 100755 (executable)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -2,8 +2,8 @@
 #
 
 WEEK := $(shell date +%Y%W)
-RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-pali\(.*\)/.10pali\2/')
+RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/-/\./;s/power/\-power/')
+REVISION := $(shell echo "$(RELEASE)" | sed 's/.*\./\./')
 EXTRAVERSION := EXTRAVERSION=$(REVISION)
 
 PACKAGE := kernel
@@ -15,6 +15,8 @@ HEADERS_PACKAGE := $(PACKAGE)-power-headers
 KBUILD_PACKAGE := $(PACKAGE)-power-kbuild
 LIBC_PACKAGE := linux-kernel-power-headers
 
+MULTIBOOTFILE := etc/multiboot.d/01-Maemo-kernel-power.item
+
 BUILDTMP := $(CURDIR)/debian/build
 #KSRC := $(BUILDTMP)/$(PACKAGE)
 KSRC := $(CURDIR)
@@ -109,6 +111,10 @@ install-bootimg:
        install -c -m 644 $(BUILDTMP)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
        chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
 
+       echo "ITEM_NAME=\"Maemo kernel-power $(RELEASE)\"" > $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+       echo "ITEM_KERNEL=\"$(RELEASE)\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+       echo "ITEM_MODULES=\"ext3\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+
 install-modules:
        dh_testdir
        dh_testroot