diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-12-29 17:21:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-31 17:08:29 +0000 |
commit | 0174379afce8fe2e291a41a75bc6f4aa6304b695 (patch) | |
tree | 55f499eca2832f03d41a533513a830271ea1de26 /meta/recipes-devtools/rpm/files | |
parent | 40ad83204fa2b9128930a587ce48c593eaaa423b (diff) | |
download | poky-0174379afce8fe2e291a41a75bc6f4aa6304b695.tar.gz |
nativesdk-rpm: export RPM_ETCCONFIGDIR and MAGIC in environment like RPM_CONFIGDIR
* the paths in wrapper don't work for rpmdeps which is installed in
${libdir}/rpm unlike other wrapped bins from ${bindir} these relative
paths don't work there
* replace environment.d-rpm.sh with here-doc so that we can use
OE variables
* in the end it might be better to just get rid of the wrappers at
this point and depend on environment.d to always set right values
* the wrappers were added in:
commit 760103cdaed3e820888d8984ec0b76cfc831d534
Author: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri May 25 10:48:29 2018 +0800
nativesdk-rpm: Add wrappers for nativesdk support
When installing the SDK to a non-default path, running "rpm --showrc" from the
sdk will produce the following error:
error: Unable to open /opt/windriver/wrlinux-small/10.17.41/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/rpm/rpmrc for reading: No such file or directory.
Fix this by adding wrappers that dynamically export the RPM_CONFIGDIR,
RPM_ETCCONFIGDIR and MAGIC environment variables, pointing to the proper
sdk locations.
* the rpm.sh in environment.d a bit later:
commit 5f16fd0bf774314c79572daf4ba7e4a8ae209ba1
Author: hongxu <hongxu.jia@windriver.com>
Date: Wed Jul 29 01:22:06 2020 -0700
nativesdk-rpm: adjust RPM_CONFIGDIR paths dynamically
While installing/extracting SDK to a non-default dir(not /opt),
run rpm failed:
$ python3 -c "import rpm"
|error: Unable to open /opt/windriver/wrlinux-graphics/20.31/sysroots/
x86_64-wrlinuxsdk-linux/usr/lib/rpm/rpmrc for reading: No such file or
directory.
This patch adds a flexible way to configure RPM_CONFIGDIR in SDK.
(From OE-Core rev: f40a2658f5be6739c5dddab7f9f11e1f85a17102)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files')
-rw-r--r-- | meta/recipes-devtools/rpm/files/environment.d-rpm.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/files/environment.d-rpm.sh b/meta/recipes-devtools/rpm/files/environment.d-rpm.sh deleted file mode 100644 index 9b669a18d1..0000000000 --- a/meta/recipes-devtools/rpm/files/environment.d-rpm.sh +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT/usr/lib/rpm" | ||