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.

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>

diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb
index be81c3eb0866fc4a6268b7a6fa1faf7bc605ef99..cdb4f227f40c02584de1c43632ebf69c35443b6b 100644 (file)
--- 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() {
 
        mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
        cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh
-               export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT${libdir}/rpm"
-               export RPM_ETCCONFIGDIR="$OECORE_NATIVE_SYSROOT${sysconfdir}"
+               export RPM_CONFIGDIR="${libdir}/rpm"
+               export RPM_ETCCONFIGDIR="${SDKPATHNATIVE}"
                export RPM_NO_CHROOT_FOR_SCRIPTS=1
        EOF
 }