From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by mail.openembedded.org (Postfix) with ESMTP id 0F1207BE09 for ; Sun, 6 Jan 2019 15:54:59 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id u18so28458279lff.10 for ; Sun, 06 Jan 2019 07:55:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YnQlYfk53mCQ4DVV048j/QEoaglcfkYeYBxQXnBU+hs=; b=XHJ3Tmj8ytuTjyd8U1NgMxiZ1xSaA2L/y9ZejkuK39TgtjSIPQMYavvzOQgI7p+V+s +D13pcQhGSwVGpcsZ41eTWiFml5WNeW72QsPiXf6BHJXYNEAdgZA2AIjj4tpP0XSGM7W lELcagI8WNwyPAqDhkJuwAoov8i6THMlYp6vderV7gTOqERWTVQNlRwVjXu3Guiqx7pV QD4sY9AZ6YAJ3oPT0cmfIlZbt3quJqMmbGvcYlxFudiCt0oAlcm3MccxJ6eAo7uJE+t1 Ez2jlhZCm+EX2VUrk4iDMNas1fHYLLQQvrO/uOYN1T0sUAglroTuJF5fE+mTASIvhyST jHMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YnQlYfk53mCQ4DVV048j/QEoaglcfkYeYBxQXnBU+hs=; b=TGXrUXniRaInCSoetfI6smEjrHnaTamSd3FWUoLRd8pWPoa8RfRXVzyyf3jQhtpHpe Uas89wsldDEIepmneLI/opGZMlZWk5GL6UZhcTZLZgOWhhQQYy95ax4/xZRRlauzWsK1 s1EUwar2fJeFWMgL1sd1D491HBa/ToPLmVn6wSR+TP+hv/7fPU6l7q3fAV9BN1uKqzUy rOrupQ+aTMb5+LHaW5UKOi81sx4/IQmKdhp6nq2iF//hp6gZSYOgfp0CQHaxlwLM/89y qTIHnOouiYLEd1pRaMBBTkB7syfUjDshVOl+peXOnqONkgxwLmwF2LcfRBwglKzuhUR2 tGsA== X-Gm-Message-State: AA+aEWYERJ2aqYmEeTdL/9e+kui6nygOOg7lgg/xUwdVnjDGFsrw6Z4X mMq+JDNh70b+DXBjdtSUKT4Ar/PD X-Google-Smtp-Source: AFSGD/WPomTOv6ygFLYIapNNexwysefEXCyxy1Fg3P8Hs6Bg40wG5/6d6+xlX9TPefX8gun2tW5p6Q== X-Received: by 2002:a19:d242:: with SMTP id j63mr31241608lfg.26.1546790100117; Sun, 06 Jan 2019 07:55:00 -0800 (PST) Received: from peterliu-Precision-M4800.lan (c-b09ee253.022-417-73746f13.bbcust.telenor.se. [83.226.158.176]) by smtp.gmail.com with ESMTPSA id k14sm12211288lfc.70.2019.01.06.07.54.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Jan 2019 07:54:59 -0800 (PST) From: liu.ming50@gmail.com To: openembedded-core@lists.openembedded.org Date: Sun, 6 Jan 2019 16:54:56 +0100 Message-Id: <1546790096-31237-1-git-send-email-liu.ming50@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Ming Liu Subject: [PATCH] meta: handle IMAGE_ROOTFS/IMGDEPLOYDIR by task varflags 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: , X-List-Received-Date: Sun, 06 Jan 2019 15:55:00 -0000 From: Ming Liu I found a issue that sometimes there are leftovers in IMAGE_ROOTFS that are generated by the previous builds. I think this is caused by IMAGE_ROOTFS is not in do_rootfs[cleandirs], so add it in. IMGDEPLOYDIR could be added to do_rootfs[dirs] as well, hence some code in rootfs.py to generate the IMAGE_ROOTFS/IMGDEPLOYDIR directories could be removed. Signed-off-by: Ming Liu --- meta/classes/image.bbclass | 4 ++-- meta/lib/oe/rootfs.py | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 11927f3..464cc5d 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -251,8 +251,8 @@ fakeroot python do_rootfs () { progress_reporter.finish() } -do_rootfs[dirs] = "${TOPDIR}" -do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" +do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}" +do_rootfs[cleandirs] += "${S} ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}" do_rootfs[umask] = "022" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 4273891..945c769 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -19,7 +19,6 @@ class Rootfs(object, metaclass=ABCMeta): self.d = d self.pm = None self.image_rootfs = self.d.getVar('IMAGE_ROOTFS') - self.deploydir = self.d.getVar('IMGDEPLOYDIR') self.progress_reporter = progress_reporter self.logcatcher = logcatcher @@ -188,10 +187,6 @@ class Rootfs(object, metaclass=ABCMeta): post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND") rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND') - bb.utils.mkdirhier(self.image_rootfs) - - bb.utils.mkdirhier(self.deploydir) - execute_pre_post_process(self.d, pre_process_cmds) if self.progress_reporter: -- 2.7.4