diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/libxml | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml')
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.12.bb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.9.12.bb b/meta/recipes-core/libxml/libxml2_2.9.12.bb index 2d1e92966f..3105889c16 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.12.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.12.bb | |||
@@ -38,11 +38,11 @@ inherit autotools pkgconfig binconfig-disabled ptest | |||
38 | 38 | ||
39 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | 39 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} |
40 | 40 | ||
41 | RDEPENDS_${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" | 41 | RDEPENDS:${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" |
42 | 42 | ||
43 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 43 | RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |
44 | 44 | ||
45 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us \ | 45 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ |
46 | glibc-gconv-ibm1141 \ | 46 | glibc-gconv-ibm1141 \ |
47 | glibc-gconv-iso8859-5 \ | 47 | glibc-gconv-iso8859-5 \ |
48 | glibc-gconv-euc-jp \ | 48 | glibc-gconv-euc-jp \ |
@@ -53,25 +53,25 @@ export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" | |||
53 | 53 | ||
54 | # WARNING: zlib is required for RPM use | 54 | # WARNING: zlib is required for RPM use |
55 | EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" | 55 | EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" |
56 | EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" | 56 | EXTRA_OECONF:class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" |
57 | EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" | 57 | EXTRA_OECONF:class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" |
58 | EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" | 58 | EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" |
59 | 59 | ||
60 | python populate_packages_prepend () { | 60 | python populate_packages:prepend () { |
61 | # autonamer would call this libxml2-2, but we don't want that | 61 | # autonamer would call this libxml2-2, but we don't want that |
62 | if d.getVar('DEBIAN_NAMES'): | 62 | if d.getVar('DEBIAN_NAMES'): |
63 | d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') | 63 | d.setVar('PKG:libxml2', '${MLPREFIX}libxml2') |
64 | } | 64 | } |
65 | 65 | ||
66 | PACKAGE_BEFORE_PN += "${PN}-utils" | 66 | PACKAGE_BEFORE_PN += "${PN}-utils" |
67 | PACKAGES += "${PN}-python" | 67 | PACKAGES += "${PN}-python" |
68 | 68 | ||
69 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" | 69 | FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" |
70 | FILES_${PN}-dev += "${libdir}/xml2Conf.sh" | 70 | FILES:${PN}-dev += "${libdir}/xml2Conf.sh" |
71 | FILES_${PN}-utils = "${bindir}/*" | 71 | FILES:${PN}-utils = "${bindir}/*" |
72 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | 72 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" |
73 | 73 | ||
74 | do_configure_prepend () { | 74 | do_configure:prepend () { |
75 | # executables take longer to package: these should not be executable | 75 | # executables take longer to package: these should not be executable |
76 | find ${S}/xmlconf/ -type f -exec chmod -x {} \+ | 76 | find ${S}/xmlconf/ -type f -exec chmod -x {} \+ |
77 | } | 77 | } |
@@ -101,7 +101,7 @@ do_install_ptest () { | |||
101 | {} + | 101 | {} + |
102 | } | 102 | } |
103 | 103 | ||
104 | do_install_append_class-native () { | 104 | do_install:append:class-native () { |
105 | # Docs are not needed in the native case | 105 | # Docs are not needed in the native case |
106 | rm ${D}${datadir}/gtk-doc -rf | 106 | rm ${D}${datadir}/gtk-doc -rf |
107 | } | 107 | } |