Patchwork classes/package: ensure pkgdata is cleaned out first

login
register
mail settings
Submitter Paul Eggleton
Date July 29, 2012, 5:41 a.m.
Message ID <1343540484-5817-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/33263/
State Accepted
Commit 5dee47b476a6f715ab02af5e758441a2a934eea3
Headers show

Comments

Paul Eggleton - July 29, 2012, 5:41 a.m.
If do_package needs to be re-run and packages are removed/renamed as a
result, we want the corresponding stale pkgdata files to no longer be
present; for that we need to ensure all of the old pkgdata files are
cleaned out prior to creating the new ones. This is particularly
important now we rely on pkgdata more heavily (for complementary
packages, license manifest, etc.).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/package.bbclass |    1 +
 1 file changed, 1 insertion(+)
Richard Purdie - July 30, 2012, 6:26 a.m.
On Sun, 2012-07-29 at 06:41 +0100, Paul Eggleton wrote:
> If do_package needs to be re-run and packages are removed/renamed as a
> result, we want the corresponding stale pkgdata files to no longer be
> present; for that we need to ensure all of the old pkgdata files are
> cleaned out prior to creating the new ones. This is particularly
> important now we rely on pkgdata more heavily (for complementary
> packages, license manifest, etc.).
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/classes/package.bbclass |    1 +
>  1 file changed, 1 insertion(+)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index f55b3e0..6142911 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1795,6 +1795,7 @@  addtask package before do_build after do_install
 PACKAGELOCK = "${STAGING_DIR}/package-output.lock"
 SSTATETASKS += "do_package"
 do_package[sstate-name] = "package"
+do_package[cleandirs] = "${PKGDESTWORK}"
 do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST}"
 do_package[sstate-inputdirs] = "${PKGDESTWORK} ${SHLIBSWORKDIR}"
 do_package[sstate-outputdirs] = "${PKGDATA_DIR} ${SHLIBSDIR}"