From b177f377285746364354ab26d95b9f2f09f08dcf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Nov 2023 17:31:10 +0000 Subject: package/package_write: Improve packagedata code location Move the do_packagedata dependencies into the package_write codeblocks themselves. Also drop the dependency for the tar package backend which was dropped. (From OE-Core rev: 372a7f2e3c5c03da044e576e1501e86f8938f5e6) Signed-off-by: Richard Purdie --- meta/classes-global/debian.bbclass | 3 --- meta/classes-global/package.bbclass | 19 ------------------- meta/classes-global/package_deb.bbclass | 4 ++++ meta/classes-global/package_ipk.bbclass | 4 ++++ meta/classes-global/package_rpm.bbclass | 4 ++++ 5 files changed, 12 insertions(+), 22 deletions(-) (limited to 'meta/classes-global') diff --git a/meta/classes-global/debian.bbclass b/meta/classes-global/debian.bbclass index c34e04112c..e2a129d028 100644 --- a/meta/classes-global/debian.bbclass +++ b/meta/classes-global/debian.bbclass @@ -14,9 +14,6 @@ # # Better expressed as ensure all RDEPENDS package before we package # This means we can't have circular RDEPENDS/RRECOMMENDS -# -# Logic of processing dependencies moved to a package.bbclass to -# allow removing inheritance on debian.bbclass AUTO_LIBNAME_PKGS = "${PACKAGES}" diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index 820920eadf..2ad820a81f 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -613,22 +613,3 @@ python do_packagedata_setscene () { } addtask do_packagedata_setscene -# This part ensures all the runtime packages built by the time -# dynamic renaming occures, if any. -# This part moved here from debian.bbclass (see for reference) in -# order to allow disabling default inheritance on debian package renaming. - -PKGRDEP = "do_packagedata" -do_package_write_ipk[deptask] = "${PKGRDEP}" -do_package_write_deb[deptask] = "${PKGRDEP}" -do_package_write_tar[deptask] = "${PKGRDEP}" -do_package_write_rpm[deptask] = "${PKGRDEP}" -do_package_write_ipk[rdeptask] = "${PKGRDEP}" -do_package_write_deb[rdeptask] = "${PKGRDEP}" -do_package_write_tar[rdeptask] = "${PKGRDEP}" -do_package_write_rpm[rdeptask] = "${PKGRDEP}" - -python () { - if not d.getVar("PACKAGES"): - d.setVar("PKGRDEP", "") -} diff --git a/meta/classes-global/package_deb.bbclass b/meta/classes-global/package_deb.bbclass index 5aba3837bd..1f10b15a00 100644 --- a/meta/classes-global/package_deb.bbclass +++ b/meta/classes-global/package_deb.bbclass @@ -313,6 +313,10 @@ python () { deps = ' dpkg-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' d.appendVarFlag('do_package_write_deb', 'depends', deps) d.setVarFlag('do_package_write_deb', 'fakeroot', "1") + + # Needed to ensure PKG_xxx renaming of dependency packages works + d.setVarFlag('do_package_write_deb', 'deptask', "do_packagedata") + d.setVarFlag('do_package_write_deb', 'rdeptask', "do_packagedata") } python do_package_write_deb () { diff --git a/meta/classes-global/package_ipk.bbclass b/meta/classes-global/package_ipk.bbclass index b4b7bc9ac2..1ca1308967 100644 --- a/meta/classes-global/package_ipk.bbclass +++ b/meta/classes-global/package_ipk.bbclass @@ -276,6 +276,10 @@ python () { deps = ' opkg-utils-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot xz-native:do_populate_sysroot' d.appendVarFlag('do_package_write_ipk', 'depends', deps) d.setVarFlag('do_package_write_ipk', 'fakeroot', "1") + + # Needed to ensure PKG_xxx renaming of dependency packages works + d.setVarFlag('do_package_write_ipk', 'deptask', "do_packagedata") + d.setVarFlag('do_package_write_ipk', 'rdeptask', "do_packagedata") } python do_package_write_ipk () { diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 5d35962aff..2fc18fe98c 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -726,6 +726,10 @@ python () { deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' d.appendVarFlag('do_package_write_rpm', 'depends', deps) d.setVarFlag('do_package_write_rpm', 'fakeroot', '1') + + # Needed to ensure PKG_xxx renaming of dependency packages works + d.setVarFlag('do_package_write_rpm', 'deptask', "do_packagedata") + d.setVarFlag('do_package_write_rpm', 'rdeptask', "do_packagedata") } SSTATETASKS += "do_package_write_rpm" -- cgit v1.2.3-54-g00ecf