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-devtools/opkg | |
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-devtools/opkg')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.4.5.bb | 26 |
3 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb index 0c2dbc9e32..dc17de2e8e 100644 --- a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb | |||
@@ -26,10 +26,10 @@ do_install () { | |||
26 | install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ | 26 | install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ |
27 | } | 27 | } |
28 | 28 | ||
29 | FILES_${PN} = "${sysconfdir}/opkg/ " | 29 | FILES:${PN} = "${sysconfdir}/opkg/ " |
30 | 30 | ||
31 | CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" | 31 | CONFFILES:${PN} += "${sysconfdir}/opkg/arch.conf" |
32 | 32 | ||
33 | RREPLACES_${PN} = "opkg-config-base" | 33 | RREPLACES:${PN} = "opkg-config-base" |
34 | RCONFLICTS_${PN} = "opkg-config-base" | 34 | RCONFLICTS:${PN} = "opkg-config-base" |
35 | RPROVIDES_${PN} = "opkg-config-base" | 35 | RPROVIDES:${PN} = "opkg-config-base" |
diff --git a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb index 07e2402545..84aeb98068 100644 --- a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
5 | # Distro-specific keys can be added to this package in two ways: | 5 | # Distro-specific keys can be added to this package in two ways: |
6 | # | 6 | # |
7 | # 1) In a .bbappend, add .gpg and/or .asc files to SRC_URI and install them to | 7 | # 1) In a .bbappend, add .gpg and/or .asc files to SRC_URI and install them to |
8 | # ${D}${datadir}/opkg/keyrings/ in a do_install_append function. These | 8 | # ${D}${datadir}/opkg/keyrings/ in a do_install:append function. These |
9 | # files should not be named 'key-$name.gpg' to ensure they don't conflict | 9 | # files should not be named 'key-$name.gpg' to ensure they don't conflict |
10 | # with keys exported as per (2). | 10 | # with keys exported as per (2). |
11 | # | 11 | # |
@@ -30,12 +30,12 @@ do_install () { | |||
30 | done | 30 | done |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES_${PN} = "${datadir}/opkg/keyrings" | 33 | FILES:${PN} = "${datadir}/opkg/keyrings" |
34 | 34 | ||
35 | # We need 'opkg-key' to run the postinst script | 35 | # We need 'opkg-key' to run the postinst script |
36 | RDEPENDS_${PN} = "opkg" | 36 | RDEPENDS:${PN} = "opkg" |
37 | 37 | ||
38 | pkg_postinst_ontarget_${PN} () { | 38 | pkg_postinst_ontarget:${PN} () { |
39 | if test -x ${bindir}/opkg-key | 39 | if test -x ${bindir}/opkg-key |
40 | then | 40 | then |
41 | ${bindir}/opkg-key populate | 41 | ${bindir}/opkg-key populate |
diff --git a/meta/recipes-devtools/opkg/opkg_0.4.5.bb b/meta/recipes-devtools/opkg/opkg_0.4.5.bb index 56d6211aee..ef18ccf63a 100644 --- a/meta/recipes-devtools/opkg/opkg_0.4.5.bb +++ b/meta/recipes-devtools/opkg/opkg_0.4.5.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | SUMMARY = "Open Package Manager" | 1 | SUMMARY = "Open Package Manager" |
2 | SUMMARY_libopkg = "Open Package Manager library" | 2 | SUMMARY:libopkg = "Open Package Manager library" |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | HOMEPAGE = "http://code.google.com/p/opkg/" | 4 | HOMEPAGE = "http://code.google.com/p/opkg/" |
5 | DESCRIPTION = "Opkg is a lightweight package management system based on Ipkg." | 5 | DESCRIPTION = "Opkg is a lightweight package management system based on Ipkg." |
@@ -44,9 +44,9 @@ PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" | |||
44 | PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" | 44 | PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" |
45 | 45 | ||
46 | EXTRA_OECONF += " --disable-pathfinder" | 46 | EXTRA_OECONF += " --disable-pathfinder" |
47 | EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" | 47 | EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" |
48 | 48 | ||
49 | do_install_append () { | 49 | do_install:append () { |
50 | install -d ${D}${sysconfdir}/opkg | 50 | install -d ${D}${sysconfdir}/opkg |
51 | install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf | 51 | install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf |
52 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf | 52 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf |
@@ -60,7 +60,7 @@ do_install_ptest () { | |||
60 | sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile | 60 | sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile |
61 | } | 61 | } |
62 | 62 | ||
63 | WARN_QA_append += "openssl-deprecation" | 63 | WARN_QA:append += "openssl-deprecation" |
64 | QAPKGTEST[openssl-deprecation] = "package_qa_check_openssl_deprecation" | 64 | QAPKGTEST[openssl-deprecation] = "package_qa_check_openssl_deprecation" |
65 | def package_qa_check_openssl_deprecation (package, d, messages): | 65 | def package_qa_check_openssl_deprecation (package, d, messages): |
66 | sane = True | 66 | sane = True |
@@ -73,16 +73,16 @@ def package_qa_check_openssl_deprecation (package, d, messages): | |||
73 | return sane | 73 | return sane |
74 | 74 | ||
75 | 75 | ||
76 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" | 76 | RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" |
77 | RDEPENDS_${PN}_class-native = "" | 77 | RDEPENDS:${PN}:class-native = "" |
78 | RDEPENDS_${PN}_class-nativesdk = "" | 78 | RDEPENDS:${PN}:class-nativesdk = "" |
79 | RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" | 79 | RDEPENDS:${PN}-ptest += "make binutils python3-core python3-compression" |
80 | RREPLACES_${PN} = "opkg-nogpg opkg-collateral" | 80 | RREPLACES:${PN} = "opkg-nogpg opkg-collateral" |
81 | RCONFLICTS_${PN} = "opkg-collateral" | 81 | RCONFLICTS:${PN} = "opkg-collateral" |
82 | RPROVIDES_${PN} = "opkg-collateral" | 82 | RPROVIDES:${PN} = "opkg-collateral" |
83 | 83 | ||
84 | FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" | 84 | FILES:libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" |
85 | 85 | ||
86 | BBCLASSEXTEND = "native nativesdk" | 86 | BBCLASSEXTEND = "native nativesdk" |
87 | 87 | ||
88 | CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" | 88 | CONFFILES:${PN} = "${sysconfdir}/opkg/opkg.conf" |