From patchwork Tue Aug 8 19:16:09 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: 799418 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="EjD49Z6r"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xRkqD4f1Pz9s78; Wed, 9 Aug 2017 05:24:24 +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 1dfA72-0003A9-VV; Tue, 08 Aug 2017 19:24:20 +0000 Received: from mail-vk0-f41.google.com ([209.85.213.41]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1df9zV-00019Z-Lt for kernel-team@lists.ubuntu.com; Tue, 08 Aug 2017 19:16:33 +0000 Received: by mail-vk0-f41.google.com with SMTP id j189so17518790vka.0 for ; Tue, 08 Aug 2017 12:16:33 -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=Y5WW5hiloHs8WyounqJNbxXhmmKtOO09IywEWEmMsIY=; b=EjD49Z6rlBRjU8/LhL2UCos4JLZh7Xmd6iUX3DNhSCMLCI9SVGsVQth22kFWhmuC8P OuKvnXyMbAaUk10ikTamOTiWzlvriBGX/PgEovfLzOaWTClFNQWWrilybj+eNx7Edq9I OMqJDTvVq+r8a1XZh8GhzS/DupgqgTgq2ws88EnzBdcEVAZYHI7eYJo3jFeDXakCwal+ B5YPVRLINYGlWoNYKYAZs5CBltksYeo4/eciPBkhud8S6ex3jrynpQmPLSDTdQUXLXrD mws+EJHUzG5U0zYw4PNmLfVCr1LvCS/H5IO6WHj8INigVw/JMoJrSegYSfqEbw3o8v32 vNIw== 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=Y5WW5hiloHs8WyounqJNbxXhmmKtOO09IywEWEmMsIY=; b=HRtwGwA4DVdHtrX2hMXa8fbyx3sQHIww4+FHdI3VTJJX2DtPEbIeBE+hzU+TqTLg0d S6/jWEeLsYXDujM31egSYeJ/HOmbBuSSJ9gQ/a1mYUy9xRpjIah0epCLIvzyFKQVgyKO AzUp3JPq05kfHcpLljvgPBKeSqFKMAyJrSUH+PVAk6CCxz9US8Nn+Xq8GRAVM3/WFEoG TZy2cSu8P5T1FHLW0l9KNAsJrwmZ10WsHl5HbVkAGnOpHeLOmm+I7SHN+CDT/Hl95aBo oKDusEyCiQcb4LUCAoX0pfDErr4fxUjDntKJTBjaQ5sK8TuKn+uEQFojUJ/fRQ8Mx6rp Xr5g== X-Gm-Message-State: AHYfb5hownZ8qWCUMvRfSIN+MafHIxUPb5AlG5OGlHyOE1OnHW2usudZ BPDI73UY5a0oVUhz3ug= X-Received: by 10.31.3.146 with SMTP id f18mr3690797vki.184.1502219792305; Tue, 08 Aug 2017 12:16:32 -0700 (PDT) Received: from localhost.localdomain ([191.8.84.147]) by smtp.gmail.com with ESMTPSA id d185sm709257vkb.51.2017.08.08.12.16.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 12:16:31 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [aws][PATCH] UBUNTU: [Debian] Don't depend on initramfs-tools Date: Tue, 8 Aug 2017 16:16:09 -0300 Message-Id: <1502219771-14143-8-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.aws/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.aws/control.d/flavour-control.stub b/debian.aws/control.d/flavour-control.stub index bdefd9b830c8..0140035e3ac6 100644 --- a/debian.aws/control.d/flavour-control.stub +++ b/debian.aws/control.d/flavour-control.stub @@ -27,9 +27,9 @@ 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 +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod Recommends: BOOTLOADER -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, initramfs-tools | linux-initramfs-tool Description: Linux kernel image for version PKGVER on DESC This package contains the Linux kernel image for version PKGVER on DESC. diff --git a/debian/control-scripts/postinst b/debian/control-scripts/postinst index 808575ce8a80..43de83fa5891 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;