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/rpm | |
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/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb index 95a6f5cf71..9cb8f551a2 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | |||
@@ -5,16 +5,16 @@ verifying, querying, and updating software packages. Each software \ | |||
5 | package consists of an archive of files along with information about \ | 5 | package consists of an archive of files along with information about \ |
6 | the package like its version, a description, etc." | 6 | the package like its version, a description, etc." |
7 | 7 | ||
8 | SUMMARY_${PN}-dev = "Development files for manipulating RPM packages" | 8 | SUMMARY:${PN}-dev = "Development files for manipulating RPM packages" |
9 | DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \ | 9 | DESCRIPTION:${PN}-dev = "This package contains the RPM C library and header files. These \ |
10 | development files will simplify the process of writing programs that \ | 10 | development files will simplify the process of writing programs that \ |
11 | manipulate RPM packages and databases. These files are intended to \ | 11 | manipulate RPM packages and databases. These files are intended to \ |
12 | simplify the process of creating graphical package managers or any \ | 12 | simplify the process of creating graphical package managers or any \ |
13 | other tools that need an intimate knowledge of RPM packages in order \ | 13 | other tools that need an intimate knowledge of RPM packages in order \ |
14 | to function." | 14 | to function." |
15 | 15 | ||
16 | SUMMARY_python3-rpm = "Python bindings for apps which will manupulate RPM packages" | 16 | SUMMARY:python3-rpm = "Python bindings for apps which will manupulate RPM packages" |
17 | DESCRIPTION_python3-rpm = "The python3-rpm package contains a module that permits applications \ | 17 | DESCRIPTION:python3-rpm = "The python3-rpm package contains a module that permits applications \ |
18 | written in the Python programming language to use the interface \ | 18 | written in the Python programming language to use the interface \ |
19 | supplied by the RPM Package Manager libraries." | 19 | supplied by the RPM Package Manager libraries." |
20 | 20 | ||
@@ -48,7 +48,7 @@ SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd" | |||
48 | S = "${WORKDIR}/git" | 48 | S = "${WORKDIR}/git" |
49 | 49 | ||
50 | DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" | 50 | DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" |
51 | DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" | 51 | DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" |
52 | 52 | ||
53 | inherit autotools gettext pkgconfig python3native | 53 | inherit autotools gettext pkgconfig python3native |
54 | export PYTHON_ABI | 54 | export PYTHON_ABI |
@@ -56,24 +56,24 @@ export PYTHON_ABI | |||
56 | AUTOTOOLS_AUXDIR = "${S}/build-aux" | 56 | AUTOTOOLS_AUXDIR = "${S}/build-aux" |
57 | 57 | ||
58 | # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe | 58 | # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe |
59 | EXTRA_AUTORECONF_append = " --exclude=gnu-configize" | 59 | EXTRA_AUTORECONF:append = " --exclude=gnu-configize" |
60 | 60 | ||
61 | EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt" | 61 | EXTRA_OECONF:append = " --without-lua --enable-python --with-crypto=libgcrypt" |
62 | EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" | 62 | EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" |
63 | 63 | ||
64 | # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs | 64 | # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs |
65 | # --localstatedir prevents rpm from writing its database to native sysroot when building images | 65 | # --localstatedir prevents rpm from writing its database to native sysroot when building images |
66 | # Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset | 66 | # Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset |
67 | # plugins both behave badly inside builds. | 67 | # plugins both behave badly inside builds. |
68 | EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" | 68 | EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" |
69 | EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --disable-plugins" | 69 | EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" |
70 | 70 | ||
71 | BBCLASSEXTEND = "native nativesdk" | 71 | BBCLASSEXTEND = "native nativesdk" |
72 | 72 | ||
73 | PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" | 73 | PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" |
74 | # The inhibit plugin serves no purpose outside of the target | 74 | # The inhibit plugin serves no purpose outside of the target |
75 | PACKAGECONFIG_remove_class-native = "inhibit" | 75 | PACKAGECONFIG:remove:class-native = "inhibit" |
76 | PACKAGECONFIG_remove_class-nativesdk = "inhibit" | 76 | PACKAGECONFIG:remove:class-nativesdk = "inhibit" |
77 | 77 | ||
78 | PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" | 78 | PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" |
79 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" | 79 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" |
@@ -98,11 +98,11 @@ WRAPPER_TOOLS = " \ | |||
98 | ${libdir}/rpm/rpmdeps \ | 98 | ${libdir}/rpm/rpmdeps \ |
99 | " | 99 | " |
100 | 100 | ||
101 | do_configure_prepend() { | 101 | do_configure:prepend() { |
102 | mkdir -p ${S}/build-aux | 102 | mkdir -p ${S}/build-aux |
103 | } | 103 | } |
104 | 104 | ||
105 | do_install_append_class-native() { | 105 | do_install:append:class-native() { |
106 | for tool in ${WRAPPER_TOOLS}; do | 106 | for tool in ${WRAPPER_TOOLS}; do |
107 | test -x ${D}$tool && create_wrapper ${D}$tool \ | 107 | test -x ${D}$tool && create_wrapper ${D}$tool \ |
108 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ | 108 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ |
@@ -112,7 +112,7 @@ do_install_append_class-native() { | |||
112 | done | 112 | done |
113 | } | 113 | } |
114 | 114 | ||
115 | do_install_append_class-nativesdk() { | 115 | do_install:append:class-nativesdk() { |
116 | for tool in ${WRAPPER_TOOLS}; do | 116 | for tool in ${WRAPPER_TOOLS}; do |
117 | test -x ${D}$tool && create_wrapper ${D}$tool \ | 117 | test -x ${D}$tool && create_wrapper ${D}$tool \ |
118 | RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ | 118 | RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ |
@@ -128,11 +128,11 @@ do_install_append_class-nativesdk() { | |||
128 | } | 128 | } |
129 | 129 | ||
130 | # Rpm's make install creates var/tmp which clashes with base-files packaging | 130 | # Rpm's make install creates var/tmp which clashes with base-files packaging |
131 | do_install_append_class-target() { | 131 | do_install:append:class-target() { |
132 | rm -rf ${D}/var | 132 | rm -rf ${D}/var |
133 | } | 133 | } |
134 | 134 | ||
135 | do_install_append () { | 135 | do_install:append () { |
136 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ | 136 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ |
137 | ${D}/${libdir}/rpm/macros | 137 | ${D}/${libdir}/rpm/macros |
138 | 138 | ||
@@ -140,17 +140,17 @@ do_install_append () { | |||
140 | ${D}${libdir}/rpm/pythondistdeps.py | 140 | ${D}${libdir}/rpm/pythondistdeps.py |
141 | } | 141 | } |
142 | 142 | ||
143 | FILES_${PN} += "${libdir}/rpm-plugins/*.so \ | 143 | FILES:${PN} += "${libdir}/rpm-plugins/*.so \ |
144 | " | 144 | " |
145 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" | 145 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" |
146 | 146 | ||
147 | FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \ | 147 | FILES:${PN}-dev += "${libdir}/rpm-plugins/*.la \ |
148 | " | 148 | " |
149 | PACKAGE_BEFORE_PN += "${PN}-build ${PN}-sign ${PN}-archive" | 149 | PACKAGE_BEFORE_PN += "${PN}-build ${PN}-sign ${PN}-archive" |
150 | 150 | ||
151 | RRECOMMENDS_${PN} += "rpm-build rpm-sign rpm-archive" | 151 | RRECOMMENDS:${PN} += "rpm-build rpm-sign rpm-archive" |
152 | 152 | ||
153 | FILES_${PN}-build = "\ | 153 | FILES:${PN}-build = "\ |
154 | ${bindir}/rpmbuild \ | 154 | ${bindir}/rpmbuild \ |
155 | ${bindir}/gendiff \ | 155 | ${bindir}/gendiff \ |
156 | ${bindir}/rpmspec \ | 156 | ${bindir}/rpmspec \ |
@@ -172,20 +172,20 @@ FILES_${PN}-build = "\ | |||
172 | ${libdir}/rpm/fileattrs/* \ | 172 | ${libdir}/rpm/fileattrs/* \ |
173 | " | 173 | " |
174 | 174 | ||
175 | FILES_${PN}-sign = "\ | 175 | FILES:${PN}-sign = "\ |
176 | ${bindir}/rpmsign \ | 176 | ${bindir}/rpmsign \ |
177 | ${libdir}/librpmsign.so.* \ | 177 | ${libdir}/librpmsign.so.* \ |
178 | " | 178 | " |
179 | 179 | ||
180 | FILES_${PN}-archive = "\ | 180 | FILES:${PN}-archive = "\ |
181 | ${bindir}/rpm2archive \ | 181 | ${bindir}/rpm2archive \ |
182 | " | 182 | " |
183 | 183 | ||
184 | PACKAGES += "python3-rpm" | 184 | PACKAGES += "python3-rpm" |
185 | PROVIDES += "python3-rpm" | 185 | PROVIDES += "python3-rpm" |
186 | FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" | 186 | FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" |
187 | 187 | ||
188 | RDEPENDS_${PN}-build = "bash perl python3-core" | 188 | RDEPENDS:${PN}-build = "bash perl python3-core" |
189 | 189 | ||
190 | PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" | 190 | PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" |
191 | 191 | ||