diff options
Diffstat (limited to 'meta/classes-global')
-rw-r--r-- | meta/classes-global/debian.bbclass | 3 | ||||
-rw-r--r-- | meta/classes-global/package.bbclass | 19 | ||||
-rw-r--r-- | meta/classes-global/package_deb.bbclass | 4 | ||||
-rw-r--r-- | meta/classes-global/package_ipk.bbclass | 4 | ||||
-rw-r--r-- | meta/classes-global/package_rpm.bbclass | 4 |
5 files changed, 12 insertions, 22 deletions
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 @@ | |||
14 | # | 14 | # |
15 | # Better expressed as ensure all RDEPENDS package before we package | 15 | # Better expressed as ensure all RDEPENDS package before we package |
16 | # This means we can't have circular RDEPENDS/RRECOMMENDS | 16 | # This means we can't have circular RDEPENDS/RRECOMMENDS |
17 | # | ||
18 | # Logic of processing dependencies moved to a package.bbclass to | ||
19 | # allow removing inheritance on debian.bbclass | ||
20 | 17 | ||
21 | AUTO_LIBNAME_PKGS = "${PACKAGES}" | 18 | AUTO_LIBNAME_PKGS = "${PACKAGES}" |
22 | 19 | ||
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 () { | |||
613 | } | 613 | } |
614 | addtask do_packagedata_setscene | 614 | addtask do_packagedata_setscene |
615 | 615 | ||
616 | # This part ensures all the runtime packages built by the time | ||
617 | # dynamic renaming occures, if any. | ||
618 | # This part moved here from debian.bbclass (see for reference) in | ||
619 | # order to allow disabling default inheritance on debian package renaming. | ||
620 | |||
621 | PKGRDEP = "do_packagedata" | ||
622 | do_package_write_ipk[deptask] = "${PKGRDEP}" | ||
623 | do_package_write_deb[deptask] = "${PKGRDEP}" | ||
624 | do_package_write_tar[deptask] = "${PKGRDEP}" | ||
625 | do_package_write_rpm[deptask] = "${PKGRDEP}" | ||
626 | do_package_write_ipk[rdeptask] = "${PKGRDEP}" | ||
627 | do_package_write_deb[rdeptask] = "${PKGRDEP}" | ||
628 | do_package_write_tar[rdeptask] = "${PKGRDEP}" | ||
629 | do_package_write_rpm[rdeptask] = "${PKGRDEP}" | ||
630 | |||
631 | python () { | ||
632 | if not d.getVar("PACKAGES"): | ||
633 | d.setVar("PKGRDEP", "") | ||
634 | } | ||
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 () { | |||
313 | deps = ' dpkg-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' | 313 | deps = ' dpkg-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' |
314 | d.appendVarFlag('do_package_write_deb', 'depends', deps) | 314 | d.appendVarFlag('do_package_write_deb', 'depends', deps) |
315 | d.setVarFlag('do_package_write_deb', 'fakeroot', "1") | 315 | d.setVarFlag('do_package_write_deb', 'fakeroot', "1") |
316 | |||
317 | # Needed to ensure PKG_xxx renaming of dependency packages works | ||
318 | d.setVarFlag('do_package_write_deb', 'deptask', "do_packagedata") | ||
319 | d.setVarFlag('do_package_write_deb', 'rdeptask', "do_packagedata") | ||
316 | } | 320 | } |
317 | 321 | ||
318 | python do_package_write_deb () { | 322 | 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 () { | |||
276 | deps = ' opkg-utils-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot xz-native:do_populate_sysroot' | 276 | deps = ' opkg-utils-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot xz-native:do_populate_sysroot' |
277 | d.appendVarFlag('do_package_write_ipk', 'depends', deps) | 277 | d.appendVarFlag('do_package_write_ipk', 'depends', deps) |
278 | d.setVarFlag('do_package_write_ipk', 'fakeroot', "1") | 278 | d.setVarFlag('do_package_write_ipk', 'fakeroot', "1") |
279 | |||
280 | # Needed to ensure PKG_xxx renaming of dependency packages works | ||
281 | d.setVarFlag('do_package_write_ipk', 'deptask', "do_packagedata") | ||
282 | d.setVarFlag('do_package_write_ipk', 'rdeptask', "do_packagedata") | ||
279 | } | 283 | } |
280 | 284 | ||
281 | python do_package_write_ipk () { | 285 | 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 () { | |||
726 | deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' | 726 | deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' |
727 | d.appendVarFlag('do_package_write_rpm', 'depends', deps) | 727 | d.appendVarFlag('do_package_write_rpm', 'depends', deps) |
728 | d.setVarFlag('do_package_write_rpm', 'fakeroot', '1') | 728 | d.setVarFlag('do_package_write_rpm', 'fakeroot', '1') |
729 | |||
730 | # Needed to ensure PKG_xxx renaming of dependency packages works | ||
731 | d.setVarFlag('do_package_write_rpm', 'deptask', "do_packagedata") | ||
732 | d.setVarFlag('do_package_write_rpm', 'rdeptask', "do_packagedata") | ||
729 | } | 733 | } |
730 | 734 | ||
731 | SSTATETASKS += "do_package_write_rpm" | 735 | SSTATETASKS += "do_package_write_rpm" |