From patchwork Fri Apr 27 15:58:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 134627 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp887200lji; Fri, 27 Apr 2018 08:58:31 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpyHH6gUFpmIqMByQVogSS3wmZ89QwR4YF7w3sxDdroajQdRC54HjbSqWwJpHCP4+2bUCiH X-Received: by 2002:a65:5247:: with SMTP id q7-v6mr2562885pgp.27.1524844711807; Fri, 27 Apr 2018 08:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524844711; cv=none; d=google.com; s=arc-20160816; b=TFDowhryxEGdzE/2GLP4uiyl9oMjuvrfYzCXJOwqP9vyJIeLGZdK3BTZ8tHuWaZ2SY il7eqetPJECEm/p/vbHBbnHTVGpf3DfSzpf3W9vHo9kKxZRLFJpgx+0pRJ4dPRZzR7ch aXELSdrYd1S3uJPuzZlHh31TTGf8FqHlLWqAOeGu/J051jNupPSIM4TUSetfPhpYHR4M ugKRuh6u2+Kuxpxz8TZHl3aLj9A7NVH13lZnoqlsSn3DaJXw0yG37WmCdP/LHhmufc4N mW7d/yFwMFxiuN4VhBvm1FN6Z3jurr8HKYbHyeokFoRtkmcQDSQkTJ6eP7SdMRbae+9L XreQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=/yb8xa9Cvp5XXkEoi/U4ntScoM0GmKIFu8CQb+MoKXk=; b=KvG795qW7IkJ/RPlz/eEZ2WQHYgMY/gC7cQwxV1javsGtjYbawDlEE7DNzMPMTnvls YVm3m5vnt69JKQNPn2GHKXlsT+EGQH6bYGSig1emvdpU0rR4nRJ3jVzpZ9JtyFSdTN0a ebkQhMFzCnfaFI3Tfsx72wnSHpUXkapX2xaO5GCLFpcIpmPb+w4DARKjtDDwytKc9M2b 2Ztz5r6+49CPXmAQ7oUYT9sV1LtHlhGddfqr9sbc1lfoKwWJdaHEbyC7xCkRbYBNnMBJ GzJFm4BqA2blyui2XnkPJeQdpd4NAkkQgY+6C2ZRECA792cPM7CKUDoXFVx5EeBTrKr7 6sEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cKzFQaN8; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a13-v6si1364181pgt.642.2018.04.27.08.58.31; Fri, 27 Apr 2018 08:58:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cKzFQaN8; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 89E4A7458C; Fri, 27 Apr 2018 15:58:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 0230774559 for ; Fri, 27 Apr 2018 15:58:25 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id n10so3770373wmc.1 for ; Fri, 27 Apr 2018 08:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=vMZghzcsX36IwBY5y/ktbzx7schHI3Vs68IHbz9FP1M=; b=cKzFQaN8YfwAvgpTDFE4SVohm9L3ZJfiBX8EuIax13+LM9H803KYlSL/cW1+ZR1/e0 zwr1C0UkyPUjrD1U/5NunzrQJclSj4O2mPFw6QPIk8odf4qnyIvtl/+Qr0GYpF4F+Y58 3XKOPSEZtj4OYJMUUN7qa3PkjOdid8nnsuEK6I6uhp1GV+Hn3uibaGXsshjmhCHc3hvz J1T73d9TavmltnYm6Dd1WAeyP5TTpCAeeslXpfgc4ccHatZby+VheNEX5e8ygbc+jd8D CjRLYAFdDeSfQyarQNIoRmUDH+9+0J0jtPL/6tAxSBorLj1VvWQmB8Q9/pstdoWpS7CG B8Ig== 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; bh=vMZghzcsX36IwBY5y/ktbzx7schHI3Vs68IHbz9FP1M=; b=GBudJE6+BKY2nCK3kLAX54ln1NHhNXMNSbYPEwalSUhxRUv/o8Y1IvIAzVBc8xyIUF e8gfk3IYFk5gSiGUUixZ8O3/IS2/Izz0kyqbrEQVBpKzqParmFQ7CDD2tD4C0w7/uHkr qRWdTlQnXexJGprJaAFgfeeHNsPpauIKKj/pA9mV8ebYLK6lH1NQAJWl5EEH4sIqeK/h H6ZilLGm0xPUbeVLU0r+iDrl7ZQ+aiTR3BrYy/a7wm0YExed7Yx/nB5hFTaon6k9/tEW 8j8L9q3hpbsYEsSuRkZ7lGauRDa3Ktk1NhhzfppAaoIBCx+zqgRZRRqnupHuB7eMN+Oc 77BQ== X-Gm-Message-State: ALQs6tAmmiHtY/Zt6g6fPBwi8oNLo8c1/0SSUugOmlER8kEFo0d7PItD gOI5pGiBxXTMPXLzpQiR7clU+3r2 X-Received: by 10.28.94.201 with SMTP id s192mr1862759wmb.42.1524844706109; Fri, 27 Apr 2018 08:58:26 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q138sm1724000wmd.1.2018.04.27.08.58.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 08:58:25 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Apr 2018 16:58:22 +0100 Message-Id: <20180427155823.30464-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] package_manager: expand the removal list for RPM X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org If package management is disabled we remove the state and configuration for the package manager after the rootfs has been populated. This list wasn't complete and the DNF/RPM configuration files were left behind. Signed-off-by: Ross Burton --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2d8aeba037c..813f6799fef 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -668,7 +668,7 @@ class RpmPM(PackageManager): self.saved_packaging_data = self.d.expand('${T}/saved_packaging_data/%s' % self.task_name) if not os.path.exists(self.d.expand('${T}/saved_packaging_data')): bb.utils.mkdirhier(self.d.expand('${T}/saved_packaging_data')) - self.packaging_data_dirs = ['var/lib/rpm', 'var/lib/dnf', 'var/cache/dnf'] + self.packaging_data_dirs = ['etc/rpm', 'etc/rpmrc', 'etc/dnf', 'var/lib/rpm', 'var/lib/dnf', 'var/cache/dnf'] self.solution_manifest = self.d.expand('${T}/saved/%s_solution' % self.task_name) if not os.path.exists(self.d.expand('${T}/saved')): From patchwork Fri Apr 27 15:58:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 134628 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp887498lji; Fri, 27 Apr 2018 08:58:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoQyS/LcEtn1q8yzfoWHEqAtjNDTM7mIPma2Al016NhYX05YlonjLdM+a7gnx4tYBlZK7qL X-Received: by 10.98.161.17 with SMTP id b17mr2362151pff.132.1524844728911; Fri, 27 Apr 2018 08:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524844728; cv=none; d=google.com; s=arc-20160816; b=ZZ/5I2frmGlxuDStc4qS0J6+p3ER1JL8Uh55993KUoN4yk0K9iBmsFTRwL2mRfTrxM Gk0SDem7hOL4SngscegV3jAUIKNEF/KUi6XEYwkSThOgutckO+uBRvi3MOMPY901YsZD w3f4lb95T4ZM/4eQLK1nJQ48PA35ONiDR/n+czQvwjOSbGarldOe0LuJB+2LQcgfFsB8 o1m8ZLlZdt4VH9rLYAk5ECvwqbNoVG1S5mwSDEYWZCSh7vynQQNIRnmlrRRxHL4grd7T Y0NPVpuLe+tXkxEUYPnsl9FpHtRWwHyHBBKKAn8q5NbB320vbtuoL3QrLmMbUgUHh5Jb CZmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ytihgABZf476uWj5MyfPukLC//easIBx98rlV+LJML0=; b=uyqUUrnUBLVypCxuPQZ+tDytMvR7OGQrA2cviPZr0ePGkBAWUnMF4Uh5jl5C18kLA8 GE0knOxVZ23+Icq71b51aV1CG3KX7wW3M1Hqevi83zEbKSLnqz6r3VjzXHlZ70byXmxW PibJXekDHpY3UnIXWd9DVoCmuvxrAJFW5Cl/9tfN5NlZD7h5+NykYaJ3B1W5yNic5/4j XgOCjZb77CDALD83hgFt5LGT+Np8yOuPI7txFlXbwpXYkUeyXloqeaeX8bWpraqyU3+P h7kwcgTW9SfkB3z3HyQPJGTeOzAgfHvGaJljIJZkFoawjcJyzOKmKWbpHmu2lY7t5m6h +tRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jin22o2m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t14-v6si1444662pgf.93.2018.04.27.08.58.48; Fri, 27 Apr 2018 08:58:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jin22o2m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 00FFD745A7; Fri, 27 Apr 2018 15:58:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 622DC74559 for ; Fri, 27 Apr 2018 15:58:26 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id i3so3757816wmf.3 for ; Fri, 27 Apr 2018 08:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=hTroKJzLuTpn8xYXHHpbsPeMSiUIx1COB+MXcAu8yZQ=; b=jin22o2mOGqEPf1FHeKUA3F4LwkZkwrXjKC5mpK+uJgAh+jBg/Ri6Awm3LuXHHDjpp OLetqqQiBS9JFnLSSn9bLEEqMFjRfW9PIzTcadvAWwxazEFxqZzZZgIIPBCi3ckDjgtS Lb04CMaXwRuREt9wEEnlGqtiY/HRKuXuijy66DfR/SqwyMRKfFXxDNvYzb2aRZp1jwe1 aFwL0oDs9gYDlZ8SReVriw2VYeZdiPFxATSqhJ19w+zPvh6rl/+NUm3CSS+vsS4q63HC sHQQ2G6B+qlxl9HFBDAddNHXJnS+dMHCzuElY2DwczZicC0gO8SkTYXvWvdHEZhMtoZS /N0A== 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=hTroKJzLuTpn8xYXHHpbsPeMSiUIx1COB+MXcAu8yZQ=; b=XggtCDj5k4GgGaZ7+5YoNzwxUytnVlX64lsJH9bZLmc7VqjAPcRlAQs6CGuN0jshkL d6oAeIz5cPUrFl/gJffGXI9e3qRwtmja+rxKL+PtlmmJZsjMNvVVtsFLmQtN4U428Jh2 RTLDQY0gpBIZxneltNMd42ShVqPR0e73FNYSiJRVb4HUbBVD21oV9zGk1rAFZehxL+pa mfl1vcpvNFh3kiYZtvgCu7ovcatFn4zsSjvUmC+DJq/Gk/YyygEXCoDwDtBLbRgZJ9wk mNjPlV0bFMxvySccWZLYowb/oq8xxu90DpUowx1eSEraLeANtZgBybPYjClm5B4ebfKc 1w5Q== X-Gm-Message-State: ALQs6tBLrAQ6gyCOXk+j3FuSycYHmgP796jfiIi+RHrP/pZXodYNk3Pg hb/tmey70m97sQMEwFhUpT70uDVs X-Received: by 10.28.24.11 with SMTP id 11mr1898128wmy.21.1524844707007; Fri, 27 Apr 2018 08:58:27 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q138sm1724000wmd.1.2018.04.27.08.58.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 08:58:26 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Apr 2018 16:58:23 +0100 Message-Id: <20180427155823.30464-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180427155823.30464-1-ross.burton@intel.com> References: <20180427155823.30464-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] rootfs: only use dnf to cleanup if package management is enabled X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org If package management has been disabled then we've already removed all the state, and running 'dnf clean all' again will simply recreate a lot of the files. Signed-off-by: Ross Burton --- meta/lib/oe/rootfs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index f8f717c0505..c51e76ddfcb 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -472,7 +472,8 @@ class RpmRootfs(Rootfs): self._log_check_error() def _cleanup(self): - self.pm._invoke_dnf(["clean", "all"]) + if bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d): + self.pm._invoke_dnf(["clean", "all"]) class DpkgOpkgRootfs(Rootfs):