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: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 6318ad236538367dd9679e926bc7b11138ca63fd..b85b6cd001a207a344c0a1f1e7423602023e5287 100644 (file)
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,8 +27,8 @@ Architecture: ARCH
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
-Recommends: BOOTLOADER
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod
+Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.0~rc.4ubuntu64) [arm64]
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC

diff --git a/debian/control-scripts/postinst b/debian/control-scripts/postinst
index 808575ce8a80f853473256cef5d54d9eeb799edd..43de83fa5891d02bb6c6c7655575938866431dd0 100644 (file)
--- a/debian/control-scripts/postinst
+++ b/debian/control-scripts/postinst
@@ -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
 # postinst, but the rules did not really interpolate the value in.

diff --git a/debian/control-scripts/postrm b/debian/control-scripts/postrm
index 227e351fc59bdffc2828a7ab8464a1a3b48b6f49..9879178e2147dc86100e34631e9cae381141f666 100644 (file)
--- a/debian/control-scripts/postrm
+++ b/debian/control-scripts/postrm
@@ -156,6 +156,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC"  ) {
   }
 }
 
+$initrd = '' if (! -x "$ramdisk");
+
 if ($link_in_boot) {
   $image_dest = "/$image_dir/";
   $image_dest =~ s|^/*|/|o;

diff --git a/debian/control-scripts/preinst b/debian/control-scripts/preinst
index 972377609fceb3256cb973ed047f5e03b2caf248..4c70e36b9631b020e788a9800a9417ab24471aaa 100644 (file)
--- a/debian/control-scripts/preinst
+++ b/debian/control-scripts/preinst
@@ -161,6 +161,8 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC"  ) {
   }
 }
 
+$initrd = '' if (! -x "$ramdisk");
+
 $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
 
 # About to upgrade this package from version $2 TO THIS VERSION.

diff --git a/debian/control-scripts/prerm b/debian/control-scripts/prerm
index 07e41461d3ab58a8550f42bead8c9bb1124188d8..755247f8e35e27944a52dc5cadc1fb616c03b75e 100644 (file)
--- a/debian/control-scripts/prerm
+++ b/debian/control-scripts/prerm
@@ -163,6 +163,7 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC"  ) {
   }
 }
 
+$initrd = '' if (! -x "$ramdisk");
 
 $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;