From patchwork Tue Aug 8 19:16:11 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: 799415 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="EdBKx1pB"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xRkfz6zxHz9sMN; Wed, 9 Aug 2017 05:17:15 +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 1dfA09-0001YV-42; Tue, 08 Aug 2017 19:17:13 +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 1df9zY-0001Bm-Ng for kernel-team@lists.ubuntu.com; Tue, 08 Aug 2017 19:16:36 +0000 Received: by mail-vk0-f41.google.com with SMTP id d124so17556461vkf.2 for ; Tue, 08 Aug 2017 12:16:36 -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=dbqjidveZG/AHrMRt8upDpEMU4ug1j3/r+sEsfmeS0c=; b=EdBKx1pBv4nyrGpG/tJ1sl1grwSDSyZWpM1MGXHRXTISZ1s43HhFQ+WObIBQRwXqK7 g/YN+wLMKwk1yp1X6Dd33yNeJJSdGra4/FbXrSTjOg81QPvphrRGEbwRy7ini1osf+s7 Qwyu5Pqnjp7tf8UY1RVDhtceNONInUd+W6eUHai4LxOVduSFeKc7ajQ95S1Ti4kx4Jd9 +Bwx+OyPTl5I8B5qu12wouXoivV4lABAgVCp4RJLBV0oDbxnscRoj7CPeQG7tpV5zhH4 99AaBYMivsueHI+nA4yXdGV6mhUb+jOVwrPDJ017F7YxyLUCRS4tKZfdrBJLF5vk6QvQ T6Lw== 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=dbqjidveZG/AHrMRt8upDpEMU4ug1j3/r+sEsfmeS0c=; b=bI1nKBU7ZNAX/C03iFx+0xrZIoNoEPT8BMQ1A5KmF780BTdOP3Gc80nBQpPL7Snzg/ XwQBLT4F4jOTHX6B+xY3SBwzfId5IpoAZHnNiMCWwt9GjAEsJjQQvxNvhEUTWDv4islG ZNQuv1rB0BlX+WJXZOmGUU1O0V3sqLHxW8CdtcZBZ6RAv69VphdYMg0nHsoLfdpdYZuF ABdHxd0ra8Sb07EwDMtkS+Z57YewO5Gjqpz/9NRhqgo95XxgHAhFj8Bd0CFaFILPea5q AGMys+JUW4o3MfziisFsTlr9k8SWHbjLTH58p892P9aLrESnW6AhjTAiZ/Lo3tgmOHN8 gsTA== X-Gm-Message-State: AHYfb5i1PEvrJKJxg4bpCDq+EMcRwIonsP6AFgCMgheW2Zj3DA+0WZIe 04yC1Tf/Ub5BYbPIb/c= X-Received: by 10.31.191.214 with SMTP id p205mr3576850vkf.84.1502219795263; Tue, 08 Aug 2017 12:16:35 -0700 (PDT) Received: from localhost.localdomain ([191.8.84.147]) by smtp.gmail.com with ESMTPSA id d185sm709257vkb.51.2017.08.08.12.16.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 12:16:34 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [gke][PATCH] UBUNTU: [Debian] Don't depend on initramfs-tools Date: Tue, 8 Aug 2017 16:16:11 -0300 Message-Id: <1502219771-14143-10-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.gke/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.gke/control.d/flavour-control.stub b/debian.gke/control.d/flavour-control.stub index 6a9d11ba56fc..2dbb25c17958 100644 --- a/debian.gke/control.d/flavour-control.stub +++ b/debian.gke/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;