diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-06-19 00:41:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-20 23:24:26 +0100 |
commit | f669fe7ead9e1bce4577a8411a7ba737c4dd2ef8 (patch) | |
tree | 953653fa5f51130f8d335a92dd35bff1cc2201d7 | |
parent | 16f56a0680283cf0aa3e77f86e78bfdb01a5177b (diff) | |
download | poky-f669fe7ead9e1bce4577a8411a7ba737c4dd2ef8.tar.gz |
rpm: write macros under libdir
If we create a macros file under etc/, the populate_sdk task would
fail if 'package-management' is in SDKIMAGE_FEATURES and nativesdk-rpm-build
is installed.. The error message is like below:
unable to place /.../sdk/image/etc/rpm in final SDK location
This is because it's trying to move the etc/rpm dictory into the
host sysroot but the <host_sysroot>/etc/rpm has already exists.
To solve this problem, avoid creating /etc/rpm/macros for nativesdk-rpm-build,
use ${libdir}/macros instead. In this way, the macros file is hold
in nativesdk-rpm. As nativesdk-rpm-build depends on nativesdk-rpm,
the 'rpmbuild' command inside SDK can still correctly find find-debuginfo
binary.
(From OE-Core rev: 5fde0eadf16d34d88a599009013913fe55d89283)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.18.1.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.18.1.bb index 6da2edddf3..83537d4761 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.1.bb | |||
@@ -134,8 +134,8 @@ do_install:append:class-target() { | |||
134 | do_install:append:class-nativesdk() { | 134 | do_install:append:class-nativesdk() { |
135 | rm -rf ${D}${SDKPATHNATIVE}/var | 135 | rm -rf ${D}${SDKPATHNATIVE}/var |
136 | # Ensure find-debuginfo is located correctly inside SDK | 136 | # Ensure find-debuginfo is located correctly inside SDK |
137 | mkdir -p ${D}${SDKPATHNATIVE}/etc/rpm | 137 | mkdir -p ${D}${libdir}/rpm |
138 | echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${SDKPATHNATIVE}/etc/rpm/macros | 138 | echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${libdir}/rpm/macros |
139 | } | 139 | } |
140 | 140 | ||
141 | do_install:append () { | 141 | do_install:append () { |
@@ -173,7 +173,6 @@ FILES:${PN}-build = "\ | |||
173 | ${libdir}/rpm/macros.p* \ | 173 | ${libdir}/rpm/macros.p* \ |
174 | ${libdir}/rpm/fileattrs/* \ | 174 | ${libdir}/rpm/fileattrs/* \ |
175 | " | 175 | " |
176 | FILES:${PN}-build:append:class-nativesdk = " ${SDKPATHNATIVE}/etc/rpm/macros" | ||
177 | 176 | ||
178 | FILES:${PN}-sign = "\ | 177 | FILES:${PN}-sign = "\ |
179 | ${bindir}/rpmsign \ | 178 | ${bindir}/rpmsign \ |