diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-03-21 23:40:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-27 15:44:02 +0100 |
commit | 00c9f39fcb821690934ef0eb9cf8e5bbbcf24676 (patch) | |
tree | f95e6f16e904f4c2abcc0c4076001f8f9d530594 /meta/recipes-devtools/rpm | |
parent | 4ffcbe98e82c73c543aa46105413de2586aa1cee (diff) | |
download | poky-00c9f39fcb821690934ef0eb9cf8e5bbbcf24676.tar.gz |
rpm: add back find-debuginfo support
RPM upstream removed find-debuginfo and switched to use debugedit
since the following commit.
https://github.com/rpm-software-management/rpm/commit/04b0805a756cdd9466fb9dc717846f5bf15518cc
According to https://github.com/rpm-software-management/rpm/blob/master/INSTALL,
debugedit is needed by rpm. More specifically it's needed by rpmbuild
to supporting generating debuginfo package when %debug_package is enabled.
(From OE-Core rev: d06c7c0d288cafa75f14a841f9cb31dcd0714644)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
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.18.0.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb index cdb4f227f4..7790db8b5a 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.0.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.0.bb | |||
@@ -134,6 +134,9 @@ do_install:append:class-target() { | |||
134 | } | 134 | } |
135 | do_install:append:class-nativesdk() { | 135 | do_install:append:class-nativesdk() { |
136 | rm -rf ${D}${SDKPATHNATIVE}/var | 136 | rm -rf ${D}${SDKPATHNATIVE}/var |
137 | # Ensure find-debuginfo is located correctly inside SDK | ||
138 | mkdir -p ${D}${SDKPATHNATIVE}/etc/rpm | ||
139 | echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${SDKPATHNATIVE}/etc/rpm/macros | ||
137 | } | 140 | } |
138 | 141 | ||
139 | do_install:append () { | 142 | do_install:append () { |
@@ -159,9 +162,7 @@ FILES:${PN}-build = "\ | |||
159 | ${libdir}/librpmbuild.so.* \ | 162 | ${libdir}/librpmbuild.so.* \ |
160 | ${libdir}/rpm/brp-* \ | 163 | ${libdir}/rpm/brp-* \ |
161 | ${libdir}/rpm/check-* \ | 164 | ${libdir}/rpm/check-* \ |
162 | ${libdir}/rpm/debugedit \ | ||
163 | ${libdir}/rpm/sepdebugcrcfix \ | 165 | ${libdir}/rpm/sepdebugcrcfix \ |
164 | ${libdir}/rpm/find-debuginfo.sh \ | ||
165 | ${libdir}/rpm/find-lang.sh \ | 166 | ${libdir}/rpm/find-lang.sh \ |
166 | ${libdir}/rpm/*provides* \ | 167 | ${libdir}/rpm/*provides* \ |
167 | ${libdir}/rpm/*requires* \ | 168 | ${libdir}/rpm/*requires* \ |
@@ -173,6 +174,7 @@ FILES:${PN}-build = "\ | |||
173 | ${libdir}/rpm/macros.p* \ | 174 | ${libdir}/rpm/macros.p* \ |
174 | ${libdir}/rpm/fileattrs/* \ | 175 | ${libdir}/rpm/fileattrs/* \ |
175 | " | 176 | " |
177 | FILES:${PN}-build:append:class-nativesdk = " ${SDKPATHNATIVE}/etc/rpm/macros" | ||
176 | 178 | ||
177 | FILES:${PN}-sign = "\ | 179 | FILES:${PN}-sign = "\ |
178 | ${bindir}/rpmsign \ | 180 | ${bindir}/rpmsign \ |
@@ -187,7 +189,7 @@ PACKAGES += "python3-rpm" | |||
187 | PROVIDES += "python3-rpm" | 189 | PROVIDES += "python3-rpm" |
188 | FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" | 190 | FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" |
189 | 191 | ||
190 | RDEPENDS:${PN}-build = "bash perl python3-core" | 192 | RDEPENDS:${PN}-build = "bash perl python3-core debugedit" |
191 | 193 | ||
192 | PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" | 194 | PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" |
193 | 195 | ||