[elbe-devel] [PATCH] debianize: fix z/uImage install target and Image name

John Ogness john.ogness at linutronix.de
Tue Jan 24 21:40:33 CET 2017


For zImage and uImage (arm), the install targets are zinstall and
uinstall, respectively.

Also, if the Image type is used, the installed kernel should be
called vmlinux, not vmlinuz.

Signed-off-by: John Ogness <john.ogness at linutronix.de>
---
 .../linux/0001-debian-workaround-broken-installkernel-in-jessie.patch | 2 +-
 elbepack/debianize/kernel.py                                          | 4 +++-
 elbepack/makofiles/debianize/kernel/rules.mako                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch b/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
index d710db8..0ecc284 100644
--- a/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
+++ b/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
@@ -139,7 +139,7 @@ index 0000000..3aef978
 +  fi
 +}
 +
-+if [ "$(basename $img)" = "vmlinux" ] ; then
++if [ "$(basename $img)" = "vmlinux" -o "$(basename $img)" = "Image" ] ; then
 +  img_dest=vmlinux
 +else
 +  img_dest=vmlinuz
diff --git a/elbepack/debianize/kernel.py b/elbepack/debianize/kernel.py
index 00171ae..c14ae40 100644
--- a/elbepack/debianize/kernel.py
+++ b/elbepack/debianize/kernel.py
@@ -30,7 +30,8 @@ from elbepack.debianize.base import DebianizeBase, template
 
 class Kernel (DebianizeBase):
     def __init__ (self):
-        self.imgtypes = ["bzImage", "zImage", "uImage", "Image"]
+        self.imgtypes = ["bzImage", "zImage", "uImage", "Image" ]
+        self.imgtypes_install = ["install", "zinstall", "uinstall", "install"]
         DebianizeBase.__init__ (self)
 
     def gui (self):
@@ -64,6 +65,7 @@ class Kernel (DebianizeBase):
         self.deb['loadaddr']      = self.loadaddr.get_value ()
         self.deb['defconfig']     = self.defconfig.get_value ()
         self.deb['imgtype']       = self.imgtypes [self.imgtype.get_value ()[0]]
+        self.deb['imgtype_install'] = self.imgtypes_install [self.imgtype.get_value ()[0]]
         self.deb['cross_compile'] = self.cross.get_value ()
         self.deb['k_version']     = self.k_version.get_value ()
 
diff --git a/elbepack/makofiles/debianize/kernel/rules.mako b/elbepack/makofiles/debianize/kernel/rules.mako
index a45d524..ff48fa4 100755
--- a/elbepack/makofiles/debianize/kernel/rules.mako
+++ b/elbepack/makofiles/debianize/kernel/rules.mako
@@ -37,7 +37,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	mkdir -p $(MOD_PATH) $(FW_PATH) $(HDR_PATH) $(KERNEL_PATH) $(DTBS_PATH)
-	make $(MAKE_OPTS) install
+	make $(MAKE_OPTS) ${imgtype_install}
 	make $(MAKE_OPTS) INSTALL_MOD_STRIP=1 modules_install
 	make $(MAKE_OPTS) firmware_install
 	make $(MAKE_OPTS) headers_install
-- 
2.1.4




More information about the elbe-devel mailing list