linux/poky.git/meta/recipes-devtools/rpm, branch styhead

rpm: fix expansion of %_libdir in macros

2024-08-06T10:33:58+00:00

There is a patch in oe-core[1] to avoid hardcoded paths in macros. It tries to use libdir to expand %_libdir in macros.in. However, in upstream commit[2], libdir for macros in CMakeLists.txt is set to ${prefix}/=LIB=, which causes %_libdir to expand to ${prefix}/=LIB= instead of the correct path in the final macros. On target: $ rpm --showrc | grep _libdir [snip] -13: _libdir ${prefix}/=LIB= [snip] This also causes %__pkgconfig_path in fileattrs/pkgconfig.attr to become an invalid regular expression when building rpm packages. This results a warning in log.do_package_write_rpm in all packages: Warning: Ignoring invalid regular expression ^((${prefix}/=LIB=|usr/share)/pkgconfig/.*.pc|usr/bin/pkg-config)$ Set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} instead of ${prefix}/=LIB= to make sure it is expanded to the correct path in macros. After the patch: On target: $ rpm --showrc | grep _libdir [snip] -13: _libdir /usr/lib [snip] [1] https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch [2] https://github.com/rpm-software-management/rpm/commit/d2abb7a48760418aacd7f17c8b64e39c25ca50c9 (From OE-Core rev: ae0e217145f45d065124aeb0a7d72a0c25f621ef) Signed-off-by: Yi Zhao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie

rpm: update 4.19.1 -> 4.19.1.1

2024-04-16T07:07:01+00:00

Drop patches: files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch (upstream resolved the issue) files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch (backports) (From OE-Core rev: d233e33a5ca12f95878c3ee9e34d9d9c61e49f68) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

rpm: Fix the following error when run nativesdk-rpm in nativesdk environment.

2024-02-29T10:26:13+00:00

package busybox-inittab-1.36.1-r0.ubinux_x86_64 is intended for a different architecture package busybox-udhcpc-1.36.1-r0.core2_64 is intended for a different architecture package ldconfig-2.39+git0+312e159626-r0.core2_64 is intended for a different architecture ...... CMAKE_INSTALL_SYSCONFDIR is necessary. If not set CMAKE_INSTALL_SYSCONFDIR, nativesdk-rpm will use the default setting: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-ubinuxsdk-linux/etc to find rpmrc file. (From OE-Core rev: c9cb2eb2e662e19d68d27f2eec791986715c3abe) Signed-off-by: Lei Maohui Signed-off-by: Richard Purdie

rpm: add missing dependencies for packageconfig

2024-02-03T22:08:26+00:00

Add depenency libselinux for PACKAGECONFIG[selinux]. Add depenency audit for PACKAGECONFIG[audit]. (From OE-Core rev: 97b5d0c85af0b667854eea90ace0a8c2f51ecefe) Signed-off-by: Yi Zhao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie

rpm: fix dependency for package config imaevm

2024-02-03T21:43:35+00:00

The dependency `ima-evm-utils` of package config `imaevm` has been removed during rpm upgrade. Add it back, otherwise it fails to run do_configure when the package config `imaevm` enabled. (From OE-Core rev: 15df110b79bfa2428f70453aa6aabe7239f8e25a) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie

rpm: override curl executable search with just 'curl'

2024-02-03T21:43:35+00:00

rpm is searching for curl executable at do_configure time and result is non-deterministic, depending on whether curl is in native sysroot or not: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240201-8dcic6ea/packages/diff-html/ (From OE-Core rev: 785c39701ea17e6a539709b9ae905f7b0667bceb) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

rpm: update 4.18.1 -> 4.19.1

2024-01-27T08:20:02+00:00

Upstream has replaced autoconf with cmake, which necessitates a rewrite of the recipe and available options, and a rebase to cmake of 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : the patch was removing the NULL marker at the end of function arguments, and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch was restoring it (in addition to the actual change the patch was making). Now both patches preserve the NULL terminator. (From OE-Core rev: 38549d462b399e3a63335f60a44c8bbced98639a) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

rpm: Fix build with musl

2024-01-07T12:24:57+00:00

(From OE-Core rev: cd610101dc8fcb0cabe351085d36823c5bd7eb19) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie

rpm: backport fix to prevent crashes with latest sqlite

2023-07-10T10:36:34+00:00

SQLite 3.42.0 causes crashes when installing RPM packages at rootfs creation time. Backport an upstream fix to resolve the issue. (From OE-Core rev: f6e4227efb29ed9b1680a1c516e4487804f6e64c) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

rpm: write macros under libdir

2023-06-20T22:24:26+00:00

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 /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 Signed-off-by: Richard Purdie