Return-Path: Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mail.openembedded.org (Postfix) with ESMTP id 539867BE11 for ; Sun, 6 Jan 2019 16:31:00 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id u18so28492428lff.10 for ; Sun, 06 Jan 2019 08:31: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=di8692eV2/ks57d93Wa2q8lom72Hi0oERCXpE6zkrV8=; b=DBNfxmO4ISiAMByheTRnRH72gUU6TUq4qTKzTximcYE0ldubID+1MkRuGl0ESAAwru 18Gn/3XhihhejXS09NW4to/I433ZXQ4za7jF6ML3qUIFgv/ylb03sGMCd2qixzdDokzl t8sUuc0zEe8XGYHVXzIJkmikSFHXP545Z71IvnRE8SPFR+FkyKyoosGSIYbvn8IdiCNq 5bxwiQAdgKPcBGwONrDRLzHeKP3+xZOm+7uVkLRZIBtWdbx6mDad4RnkJjl1LTEkHvJu x8KgW5AZDOXpEepaaIwtzlRx+oiUFWe7K+tjL2lnG/Zpis4WvdB3VJkxQGWjWT9d0Kfj Jb3w== 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=di8692eV2/ks57d93Wa2q8lom72Hi0oERCXpE6zkrV8=; b=F6q8iU/s9tnd+q2NmgNq6MJhaNk2mdScgUesWvFYv0336+Dd2tU0R7gHg3ECTJWZMm IqOszZu5pE3pDY3MuOosUNuIScfKd63/g+fOz+Dd1c1FNJXdOJR9jrEHYKcrDp5vI0QX w9XwwRB37uyfgpuTAdVYHYDwmQKizY2RsBSd3qIB/6Q9KbVOiURSexAxnzDwvoKgDUsp PHTA0sHTySZlQQ2F/n2jwuKqzJdXG5N8ER0ytOq2LojGRrYQtkTnQhNQVnfSzvcodDG3 sHUa6BPRTgVFrMN2JzfZh7BD8Rk0WxKYHx/W74I6NcURx5u2DX7iM5BeGwU+6VkhBV/I tCKA== X-Gm-Message-State: AA+aEWZav9SYgz6y7sCVxXp63ifMvR5zl/QhWimymiWHMgbTg4/XyuVl hcbz+Mj6GVLiIIE86FPb9xFNnSwO X-Google-Smtp-Source: AFSGD/X90O7o/ZrrFPVBlZ9wgjLiULz+ZUS/oZ+O7t9HT+wG6srI8HlzBEhg4hWTFPXqTC0Jjfm+AQ== X-Received: by 2002:a19:a60c:: with SMTP id p12mr31011615lfe.63.1546792260878; Sun, 06 Jan 2019 08:31: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 c133sm13496489lfc.45.2019.01.06.08.31.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Jan 2019 08:31:00 -0800 (PST) From: liu.ming50@gmail.com To: openembedded-core@lists.openembedded.org Date: Sun, 6 Jan 2019 17:30:57 +0100 Message-Id: <1546792257-4686-1-git-send-email-liu.ming50@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Ming Liu Subject: [PATCH V2] 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 16:31:01 -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 provided that INC_RPM_IMAGE_GEN is not set. 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..b6bf97a 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} ${IMGDEPLOYDIR} ${@["${IMAGE_ROOTFS}", ""][(d.getVar('INC_RPM_IMAGE_GEN') == '1')]}" 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