diff options
author | Mark Hatle <mark.hatle@kernel.crashing.org> | 2020-08-26 06:27:28 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:04:37 +0100 |
commit | 966323d80ecc0c443a70a77f67f0d49d1685396f (patch) | |
tree | 5588659e4ab40ca2660477deb8fb939f21cb3ecb /meta/classes | |
parent | 0f2bb6b010fc70240b2ea4f5286da77e92f6a048 (diff) | |
download | poky-966323d80ecc0c443a70a77f67f0d49d1685396f.tar.gz |
package_tar.bbclass: Sync to the other package_* classes
Sync up the anonymous python definition with the other package_*.bbclass
files. This should make future maintenance easier, even though it has
no difference in behavior from what was there.
Additional, there was a missing deltask in the nopackages.bbclass related
to the package_tar which has been corrected. This could cause problems on
native recipes when package_tar was enabled.
(From OE-Core rev: 2ac25329fd2efbfdcc2b97948cdcb3402ee497e0)
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f87452942f6391a239b50e3f3f9fa100e74a78fa)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/nopackages.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/package_tar.bbclass | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass index 559f5078bd..7a4f632d71 100644 --- a/meta/classes/nopackages.bbclass +++ b/meta/classes/nopackages.bbclass | |||
@@ -2,6 +2,7 @@ deltask do_package | |||
2 | deltask do_package_write_rpm | 2 | deltask do_package_write_rpm |
3 | deltask do_package_write_ipk | 3 | deltask do_package_write_ipk |
4 | deltask do_package_write_deb | 4 | deltask do_package_write_deb |
5 | deltask do_package_write_tar | ||
5 | deltask do_package_qa | 6 | deltask do_package_qa |
6 | deltask do_packagedata | 7 | deltask do_packagedata |
7 | deltask do_package_setscene | 8 | deltask do_package_setscene |
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index ce3ab4c8e2..d6c1b306fc 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass | |||
@@ -57,10 +57,8 @@ python do_package_tar () { | |||
57 | 57 | ||
58 | python () { | 58 | python () { |
59 | if d.getVar('PACKAGES') != '': | 59 | if d.getVar('PACKAGES') != '': |
60 | deps = (d.getVarFlag('do_package_write_tar', 'depends') or "").split() | 60 | deps = ' tar-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' |
61 | deps.append('tar-native:do_populate_sysroot') | 61 | d.appendVarFlag('do_package_write_tar', 'depends', deps) |
62 | deps.append('virtual/fakeroot-native:do_populate_sysroot') | ||
63 | d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps)) | ||
64 | d.setVarFlag('do_package_write_tar', 'fakeroot', "1") | 62 | d.setVarFlag('do_package_write_tar', 'fakeroot', "1") |
65 | } | 63 | } |
66 | 64 | ||