MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

package/package_write: Improve packagedata code location

Browse Source 
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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2023-11-06 17:31:10 +00:00
parent 7e0e0ef000
commit b177f37728
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/classes-global/debian.bbclass
View File

@ -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}"

19
meta/classes-global/package.bbclass
View File

@ -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", "")
}

4
meta/classes-global/package_deb.bbclass
View File

@ -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 () {

4
meta/classes-global/package_ipk.bbclass
View File

@ -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 () {

4
meta/classes-global/package_rpm.bbclass
View File

@ -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"