diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-03-22 00:45:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-22 23:17:27 +0000 |
commit | 23212c8c44315ed6612009e0e667d14ad26459b0 (patch) | |
tree | 1daed34997427d32db812c769d07d59d44ead435 /meta/recipes-devtools/rpm | |
parent | f5c671e201e98f071a7e5e4cbd83af9751c34201 (diff) | |
download | poky-23212c8c44315ed6612009e0e667d14ad26459b0.tar.gz |
rpm: fix RPM_ETCCONFIGDIR value in SDK
The RPM_ETCCONFIGDIR should be some root directory instead of the
etc directory as in patch 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
RPM_ETCCONFIGDIR is used to prefix /etc.
The regression was introduced in the following patch.
"""
nativesdk-rpm: export RPM_ETCCONFIGDIR and MAGIC in environment like RPM_CONFIGDIR
"""
The patch incorrectly set RPM_ETCCONFIGDIR, maybe because this variable's
name is a little misleading.
Note that this patch modifies both RPM_ETCCONFIGDIR and RPM_CONFIGDIR.
The RPM_CONFIGDIR's value happened to be correct because of the ${libdir},
not $OECORE_NATIVE_SYSROOT. In fact, due to the substitution mechanism,
the $OECORE_NATIVE_SYSROOT is empty.
(From OE-Core rev: 2c6388e5bbf45a71891aa90047eef980d8a27c9d)
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb index be81c3eb08..cdb4f227f4 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.0.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.0.bb | |||
@@ -122,8 +122,8 @@ do_install:append:class-nativesdk() { | |||
122 | 122 | ||
123 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 123 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
124 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh | 124 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh |
125 | export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT${libdir}/rpm" | 125 | export RPM_CONFIGDIR="${libdir}/rpm" |
126 | export RPM_ETCCONFIGDIR="$OECORE_NATIVE_SYSROOT${sysconfdir}" | 126 | export RPM_ETCCONFIGDIR="${SDKPATHNATIVE}" |
127 | export RPM_NO_CHROOT_FOR_SCRIPTS=1 | 127 | export RPM_NO_CHROOT_FOR_SCRIPTS=1 |
128 | EOF | 128 | EOF |
129 | } | 129 | } |