Remove multiboot support (external package multiboot-kernel-power can be used)

diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 9b63093..b3eb2be 100644 (file)
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -19,16 +19,15 @@ Package: kernel-power-bootimg
 Section: user/system
 Architecture: armel
 Depends: kernel-power-modules (= ${binary:Version})
-Conflicts: multiboot-kernel-power
 Replaces: kernel-power-bootimg
-Recommends: u-boot-flasher | multiboot, kernel-power-flasher, kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
-XB-Maemo-Display-Name: Linux kernel for power user (boot image for U-Boot and Multiboot)
+Recommends: u-boot-flasher, kernel-power-flasher, kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
+XB-Maemo-Display-Name: Linux kernel for power user (boot image for U-Boot)
 Description: Linux kernel boot image (kernel power 2.6.28.10)
- This package provides a bootable kernel image and config files
- for U-Boot Bootmenu and Multiboot.
+ This package provides a bootable kernel image and config file
+ for U-Boot Bootmenu.
  .
  This package does not flash kernel image. Instead it install
- config files for proper Bootmenu entry in U-Boot and Multiboot
+ config files for proper Bootmenu entry in U-Boot.
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABmJLR0QAAAAA
  AAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAwAAAAMADO

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 5c9ba3b..921596c 100755 (executable)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -17,8 +17,6 @@ DEBUG_PACKAGE := $(PACKAGE)-debug
 DEBUG_MODULES_PACKAGE := $(PACKAGE)-modules-debug
 LIBC_PACKAGE := linux-$(PACKAGE)-headers
 
-MULTIBOOTDIR := etc/multiboot.d
-MULTIBOOTFILE := $(MULTIBOOTDIR)/20-Maemo5-$(PACKAGE)-$(RELEASE).item
 BOOTMENUDIR := etc/bootmenu.d
 BOOTMENUFILE := $(BOOTMENUDIR)/20-Maemo5-$(PACKAGE)-$(RELEASE).item
 
@@ -109,14 +107,11 @@ install-bootimg:
        dh_testdir
        dh_testroot
        mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot
-       mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTDIR)
        mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUDIR)
        install -m644 $(KSRC)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
-       echo "ITEM_NAME=\"Maemo 5 with $(PACKAGE) $(RELEASE) (Internal Nand)\"" > $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
-       echo "ITEM_KERNEL=\"$(RELEASE)\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
-       echo "ITEM_OMAPATAG=\"1\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
-       cp $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
-       chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+       echo "ITEM_NAME=\"Maemo 5 with $(PACKAGE) $(RELEASE) (Internal Nand)\"" > $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
+       echo "ITEM_KERNEL=\"$(RELEASE)\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
+       echo "ITEM_OMAPATAG=\"1\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
        chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
 
 install-flasher: