From patchwork Tue Aug 8 19:16:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 799413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="mIZg3qLt"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xRkft3Z5tz9s81; Wed, 9 Aug 2017 05:17:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dfA03-0001Ve-OW; Tue, 08 Aug 2017 19:17:07 +0000 Received: from mail-ua0-f171.google.com ([209.85.217.171]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1df9zM-00013y-Qt for kernel-team@lists.ubuntu.com; Tue, 08 Aug 2017 19:16:24 +0000 Received: by mail-ua0-f171.google.com with SMTP id w45so19439243uac.5 for ; Tue, 08 Aug 2017 12:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=rq9XNN8/G9Y0UEFMCZ1E0POQ5WaUD662GB/A2d9njGA=; b=mIZg3qLtLjGI6f2lQ4jwvgUb0iDsSB5VuL3vb8M4CGL4+0czV9bFScdKLAqd/I1BBe pVypFUDh9EZqjnkMT2gImeDf91TiuBYaTaXTAd58S1WvSWZLdcrdSbhKgOp2/6mUpwVx BvW9qydakSajhLdPKqN10ap1aFcmtCToWux22VxOAexk9bng/oksNcntvnwUGHRqENzc 7sCm79kZNIFuaE7nef7dUUzQ+CX8I78MTnAcwNpzgdATAtMppivDo7FoB18Sf0qUn64H wCiDyMbJRBTo6LDlfaddOFFcSDA47SYPj95j20F+sYi5djxqrozYzXR0LhXwnUvrHZt6 okLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=rq9XNN8/G9Y0UEFMCZ1E0POQ5WaUD662GB/A2d9njGA=; b=MVR6tSPfe990lbo7mgEozP3HhkVjmrYPPS8o+D0JpQwJWfgCLQB11TGsiihU/SkjRJ Q5Hj6BhgGrHeuNP45M+vzcEIJnybtXsXe5nl3GtHhqtGhOtufJqzF0hk05c2ksB6mxa3 gqMYp7Gs/DRskaqI8uiez2EDm9n1HuNv+xRuFh8AYLI7uXqYfKhhCyanUUK7PvgyXCeU Ux4QckX5EqkttjFS7T8fKEU3RqLc6Dt2ijAEOa7Pbv3DafpU+o3aJT/+9CsFAkPrNHbd jE40cHF6gk1edzfRc9/o74ic9MdJ6uHBTI3ntCzm+lw+7cRNknk3eSFYh5kAP+YM2e1w RymA== X-Gm-Message-State: AHYfb5iEA4Ik4tm6dLhdYrKi1AQstFhCZwDQ9V6b0/mYdJXTcr/hF08k F0NGfvGefYkjpAz2C2Q= X-Received: by 10.176.24.216 with SMTP id d24mr4101209uah.23.1502219783287; Tue, 08 Aug 2017 12:16:23 -0700 (PDT) Received: from localhost.localdomain ([191.8.84.147]) by smtp.gmail.com with ESMTPSA id d185sm709257vkb.51.2017.08.08.12.16.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 12:16:22 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [trusty][PATCH] UBUNTU: [Debian] Don't depend on initramfs-tools Date: Tue, 8 Aug 2017 16:16:04 -0300 Message-Id: <1502219771-14143-3-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502219771-14143-1-git-send-email-marcelo.cerri@canonical.com> References: <1502219771-14143-1-git-send-email-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 --- debian.master/control.d/flavour-control.stub | 4 ++-- debian/control-scripts/postinst | 2 +- debian/control-scripts/postrm | 2 ++ debian/control-scripts/preinst | 2 ++ debian/control-scripts/prerm | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index 3ecf4102d38e..31db80382da3 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -27,9 +27,9 @@ Section: kernel Priority: optional Pre-Depends: dpkg (>= 1.10.24) Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES= -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) +Depends: ${misc:Depends}, ${shlibs:Depends}, module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) -Recommends: BOOTLOADER +Recommends: BOOTLOADER, initramfs-tools (>= 0.36ubuntu6) Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR Description: Linux kernel image for version PKGVER on DESC This package contains the Linux kernel image for version PKGVER on diff --git a/debian/control-scripts/postinst b/debian/control-scripts/postinst index c4fc23f680c3..f8c884a96e81 100644 --- 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 227e351fc59b..9879178e2147 100644 --- 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 972377609fce..4c70e36b9631 100644 --- 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 07e41461d3ab..755247f8e35e 100644 --- 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;