diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-01-26 14:34:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-27 08:20:02 +0000 |
commit | 05d0b9eafb855dcf6ce5c3f641b5c155e274c833 (patch) | |
tree | d4b1c36e60dae916e83e4a334d3ef542a04bfe74 /meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch | |
parent | 482ed7cd8035233dbe5aa6db1e606fa4b3f03948 (diff) | |
download | poky-05d0b9eafb855dcf6ce5c3f641b5c155e274c833.tar.gz |
rpm: update 4.18.1 -> 4.19.1
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 <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch new file mode 100644 index 0000000000..db83b176b4 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 16 Jan 2024 13:43:36 +0100 | ||
4 | Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit | ||
5 | option | ||
6 | |||
7 | This was lost in autotools -> cmake transition. The particular | ||
8 | reason to make it explicit is that readline is gpl version 3 | ||
9 | licensed, and in some builds components under that license | ||
10 | need to be excluded. | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] | ||
13 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
14 | --- | ||
15 | CMakeLists.txt | 7 ++++++- | ||
16 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 0a474106e..89e27417f 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) | ||
23 | option(WITH_FSVERITY "Build with fsverity support" OFF) | ||
24 | option(WITH_IMAEVM "Build with IMA support" OFF) | ||
25 | option(WITH_FAPOLICYD "Build with fapolicyd support" ON) | ||
26 | +option(WITH_READLINE "Build with readline support" ON) | ||
27 | |||
28 | set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") | ||
29 | set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") | ||
30 | @@ -193,7 +194,11 @@ find_package(BZip2) | ||
31 | find_package(Iconv) | ||
32 | |||
33 | pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) | ||
34 | -pkg_check_modules(READLINE IMPORTED_TARGET readline) | ||
35 | + | ||
36 | +if (WITH_READLINE) | ||
37 | + pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) | ||
38 | +endif() | ||
39 | + | ||
40 | pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) | ||
41 | pkg_check_modules(LIBELF IMPORTED_TARGET libelf) | ||
42 | pkg_check_modules(LIBDW IMPORTED_TARGET libdw) | ||