Commit 8a3015ac authored by Marcelo Henrique Cerri's avatar Marcelo Henrique Cerri Committed by Thadeu Lima de Souza Cascardo

UBUNTU: [Debian] Don't depend on initramfs-tools

BugLink: http://bugs.launchpad.net/bugs/1700972

Allow images to be created without the need of an initrd and also allow
users to run without an initrd if they want to.
Signed-off-by: default avatarMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent eb06f5f2
...@@ -27,8 +27,8 @@ Architecture: ARCH ...@@ -27,8 +27,8 @@ Architecture: ARCH
Section: kernel Section: kernel
Priority: optional Priority: optional
Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides} Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod Depends: ${misc:Depends}, ${shlibs:Depends}, kmod
Recommends: BOOTLOADER Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
Description: Linux kernel image for version PKGVER on DESC Description: Linux kernel image for version PKGVER on DESC
This package contains the Linux kernel image for version PKGVER on This package contains the Linux kernel image for version PKGVER on
......
...@@ -142,7 +142,7 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { ...@@ -142,7 +142,7 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
} }
} }
$initrd = '' if (! -x "$ramdisk");
# For some versions of kernel-package, we had this warning in the # For some versions of kernel-package, we had this warning in the
# postinst, but the rules did not really interpolate the value in. # postinst, but the rules did not really interpolate the value in.
......
...@@ -156,6 +156,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { ...@@ -156,6 +156,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
} }
} }
$initrd = '' if (! -x "$ramdisk");
if ($link_in_boot) { if ($link_in_boot) {
$image_dest = "/$image_dir/"; $image_dest = "/$image_dir/";
$image_dest =~ s|^/*|/|o; $image_dest =~ s|^/*|/|o;
......
...@@ -161,6 +161,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { ...@@ -161,6 +161,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
} }
} }
$initrd = '' if (! -x "$ramdisk");
$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
# About to upgrade this package from version $2 TO THIS VERSION. # About to upgrade this package from version $2 TO THIS VERSION.
......
...@@ -163,6 +163,7 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { ...@@ -163,6 +163,7 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
} }
} }
$initrd = '' if (! -x "$ramdisk");
$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment