summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-12-04 07:49:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-12 13:22:08 +0000
commitea9c2cfb6901251b95e07e052616a512b91ea0c7 (patch)
treeb414b0c1e78803bdd8f598996edb612807f8e4b3
parent21a9165058a60aaee3ec5c40c6cfecfff0ff64d8 (diff)
downloadpoky-ea9c2cfb6901251b95e07e052616a512b91ea0c7.tar.gz
rpm: update 4.19.1.1 -> 4.20.0
With this release, as expected, deprecated openpgp support has been fully removed and replaced with sequoia: https://github.com/rpm-software-management/rpm-sequoia/ Alas, it's written in rust, and has no recipe, so for now signing rpm packages has to be disabled. Remove package name parameter to %prep in source archiving, as it's been dropped in the new rpm, and wasn't needed to begin with. Drop 0001-perl-disable-auto-reqs.patch (files removed upstream). (From OE-Core rev: 8c15b4577d5e554cc2dd5adfb88b816894b05a9a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/classes-global/package_rpm.bbclass2
-rw-r--r--meta/lib/oeqa/selftest/cases/signing.py1
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch10
-rw-r--r--meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch10
-rw-r--r--meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch9
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch6
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch18
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch20
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch6
-rw-r--r--meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch8
-rw-r--r--meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch4
-rw-r--r--meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch4
-rw-r--r--meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch39
-rw-r--r--meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch32
-rw-r--r--meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch4
-rw-r--r--meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch12
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.20.0.bb (renamed from meta/recipes-devtools/rpm/rpm_4.19.1.1.bb)11
17 files changed, 77 insertions, 119 deletions
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass
index a3be823c9d..3579d0d695 100644
--- a/meta/classes-global/package_rpm.bbclass
+++ b/meta/classes-global/package_rpm.bbclass
@@ -104,7 +104,7 @@ python write_specfile () {
104 # append information for logs and patches to %prep 104 # append information for logs and patches to %prep
105 def add_prep(d, spec_files_bottom): 105 def add_prep(d, spec_files_bottom):
106 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): 106 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
107 spec_files_bottom.append('%%prep -n %s' % d.getVar('PN')) 107 spec_files_bottom.append('%%prep')
108 spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"") 108 spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"")
109 spec_files_bottom.append('') 109 spec_files_bottom.append('')
110 110
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index 18cce0ba25..51d1c3fa64 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -71,6 +71,7 @@ class Signing(OESelftestTestCase):
71 """ 71 """
72 import oe.packagedata 72 import oe.packagedata
73 73
74 self.skipTest('This test requires rpm-sequoia support in rpm')
74 self.setup_gpg() 75 self.setup_gpg()
75 76
76 package_classes = get_bb_var('PACKAGE_CLASSES') 77 package_classes = get_bb_var('PACKAGE_CLASSES')
diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
index 25aa69d7da..769d7b3409 100644
--- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
@@ -1,4 +1,4 @@
1From f4cf90b5a298d6a3199e8b4c07f520aaf593ce2b Mon Sep 17 00:00:00 2001 1From 38e38437e83ed961dc1fa6d5b534bbdaae5b535e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 9 Mar 2017 18:54:02 +0200 3Date: Thu, 9 Mar 2017 18:54:02 +0200
4Subject: [PATCH] Add a color setting for mips64_n32 binaries 4Subject: [PATCH] Add a color setting for mips64_n32 binaries
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 2 files changed, 6 insertions(+) 11 2 files changed, 6 insertions(+)
12 12
13diff --git a/build/rpmfc.c b/build/rpmfc.c 13diff --git a/build/rpmfc.c b/build/rpmfc.c
14index 4b67a9bae..ed7e4e623 100644 14index 86dd36d14..df421a23f 100644
15--- a/build/rpmfc.c 15--- a/build/rpmfc.c
16+++ b/build/rpmfc.c 16+++ b/build/rpmfc.c
17@@ -660,6 +660,7 @@ exit: 17@@ -716,6 +716,7 @@ static int rpmfcHelper(rpmfc fc, int *fnx, int nfn, const char *proto,
18 static const struct rpmfcTokens_s rpmfcTokens[] = { 18 static const struct rpmfcTokens_s rpmfcTokens[] = {
19 { "directory", RPMFC_INCLUDE }, 19 { "directory", RPMFC_INCLUDE },
20 20
@@ -22,8 +22,8 @@ index 4b67a9bae..ed7e4e623 100644
22 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, 22 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
23 { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, 23 { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
24 24
25@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) 25@@ -1258,6 +1259,9 @@ static uint32_t getElfColor(const char *fn)
26 color = RPMFC_ELF32; 26 color = 0;
27 break; 27 break;
28 } 28 }
29+ if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE) 29+ if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE)
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
index e4edc884b1..83552dd5c2 100644
--- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
+++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch
@@ -1,4 +1,4 @@
1From c39a074ff3c4d21c100d387661c7d725b5eae7b0 Mon Sep 17 00:00:00 2001 1From 99d02b8e8ce2c93c10a7924cd7571b76b0f45eb1 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 29 Nov 2023 14:06:15 +0100 3Date: Wed, 29 Nov 2023 14:06:15 +0100
4Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than 4Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than
@@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 4a383ceba..ed847c09a 100644 16index 9a3aba071..08dabffd3 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -190,7 +190,7 @@ set(REQFUNCS 19@@ -196,7 +196,7 @@ set(REQFUNCS
20 ) 20 )
21 21
22 find_package(PkgConfig REQUIRED) 22 find_package(PkgConfig REQUIRED)
23-find_package(Lua 5.2 REQUIRED) 23-find_package(Lua 5.2 REQUIRED)
24+pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) 24+pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2)
25 find_package(ZLIB REQUIRED) 25 find_package(ZLIB REQUIRED)
26 find_package(BZip2) 26 if (WITH_BZIP2)
27 find_package(Iconv) 27 find_package(BZip2 REQUIRED)
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch
index 1bd83e7bef..7db643871f 100644
--- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch
+++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch
@@ -1,4 +1,4 @@
1From fea9cea49aa0844de14126e54d05b91ba619427f Mon Sep 17 00:00:00 2001 1From cb5355da9b47166253dbe5ab3215e433b55068d1 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 26 Jul 2024 17:18:30 +0800 3Date: Fri, 26 Jul 2024 17:18:30 +0800
4Subject: [PATCH] CMakeLists.txt: set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} in 4Subject: [PATCH] CMakeLists.txt: set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} in
@@ -36,10 +36,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
36 1 file changed, 1 insertion(+), 1 deletion(-) 36 1 file changed, 1 insertion(+), 1 deletion(-)
37 37
38diff --git a/CMakeLists.txt b/CMakeLists.txt 38diff --git a/CMakeLists.txt b/CMakeLists.txt
39index ed847c09a1..385b5040c6 100644 39index 08dabffd3..1b7661139 100644
40--- a/CMakeLists.txt 40--- a/CMakeLists.txt
41+++ b/CMakeLists.txt 41+++ b/CMakeLists.txt
42@@ -84,7 +84,7 @@ function(makemacros) 42@@ -96,7 +96,7 @@ function(makemacros)
43 set(sysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}") 43 set(sysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
44 set(sharedstatedir "${CMAKE_INSTALL_FULL_SHAREDSTATEDIR}") 44 set(sharedstatedir "${CMAKE_INSTALL_FULL_SHAREDSTATEDIR}")
45 set(localstatedir "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}") 45 set(localstatedir "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
@@ -48,6 +48,3 @@ index ed847c09a1..385b5040c6 100644
48 set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") 48 set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
49 set(oldincludedir "${CMAKE_INSTALL_FULL_OLDINCLUDEDIR}") 49 set(oldincludedir "${CMAKE_INSTALL_FULL_OLDINCLUDEDIR}")
50 set(infodir "\${prefix}/${CMAKE_INSTALL_INFODIR}") 50 set(infodir "\${prefix}/${CMAKE_INSTALL_INFODIR}")
51--
522.25.1
53
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
index d0ed711086..96a5e14999 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
@@ -1,4 +1,4 @@
1From 86e585cc0dd06dfa20f584af8b59d52a59accb45 Mon Sep 17 00:00:00 2001 1From dc40261464de1a1799704967906f5bd113b53793 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 9 Jan 2017 18:52:11 +0200 3Date: Mon, 9 Jan 2017 18:52:11 +0200
4Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in 4Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 4 deletions(-) 14 1 file changed, 4 deletions(-)
15 15
16diff --git a/build/pack.c b/build/pack.c 16diff --git a/build/pack.c b/build/pack.c
17index f7dac6d9a..f382c7da0 100644 17index eb9c7b3f1..fb1f1bed8 100644
18--- a/build/pack.c 18--- a/build/pack.c
19+++ b/build/pack.c 19+++ b/build/pack.c
20@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch 20@@ -712,10 +712,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
21 headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); 21 headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
22 } 22 }
23 23
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
index b571a0ae8c..6a44f4f22d 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
@@ -1,4 +1,4 @@
1From 73d6841d9ef2a8ac7bd63f9645a3efe8038dfdd4 Mon Sep 17 00:00:00 2001 1From 651310691a8a41ab3a766545c53b69e6e0c4f88d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 27 Feb 2017 09:43:30 +0200 3Date: Mon, 27 Feb 2017 09:43:30 +0200
4Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for 4Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -12,24 +12,24 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 7808115c1..4a383ceba 100644 15index de0b578a6..9a3aba071 100644
16--- a/CMakeLists.txt 16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
18@@ -33,7 +33,7 @@ option(WITH_IMAEVM "Build with IMA support" OFF) 18@@ -41,7 +41,7 @@ option(WITH_LIBELF "Build with libelf support" ON)
19 option(WITH_FAPOLICYD "Build with fapolicyd support" ON) 19 option(WITH_LIBLZMA "Build with liblzma support" ON)
20 option(WITH_READLINE "Build with readline support" ON) 20 option(WITH_DOXYGEN "Build API docs with doxygen" OFF)
21 21
22-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") 22-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
23+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") 23+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home")
24 set(RPM_MACROSDIR "${RPM_CONFIGDIR}/macros.d")
24 set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") 25 set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
25 26
26 # Emulate libtool versioning. Before a public release:
27diff --git a/macros.in b/macros.in 27diff --git a/macros.in b/macros.in
28index b49ffaad4..3acbe78f6 100644 28index 4d3e8afdc..66e31320f 100644
29--- a/macros.in 29--- a/macros.in
30+++ b/macros.in 30+++ b/macros.in
31@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ 31@@ -964,7 +964,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
32 %_sharedstatedir %{_prefix}/com 32 %_sharedstatedir %{_var}/lib
33 %_localstatedir %{_prefix}/var 33 %_localstatedir %{_prefix}/var
34 %_lib lib 34 %_lib lib
35-%_libdir %{_exec_prefix}/%{_lib} 35-%_libdir %{_exec_prefix}/%{_lib}
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
index 796088df53..bfc9a74b6c 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
@@ -1,4 +1,4 @@
1From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001 1From 874679725c443e5d73e3a33d1158ab25442c8a5f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Jan 2017 14:11:30 +0200 3Date: Tue, 10 Jan 2017 14:11:30 +0200
4Subject: [PATCH] Do not read config files from $HOME 4Subject: [PATCH] Do not read config files from $HOME
@@ -10,26 +10,26 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 1 file changed, 2 insertions(+), 4 deletions(-) 10 1 file changed, 2 insertions(+), 4 deletions(-)
11 11
12diff --git a/lib/rpmrc.c b/lib/rpmrc.c 12diff --git a/lib/rpmrc.c b/lib/rpmrc.c
13index 9437a0ff1..483585ae4 100644 13index 5d778b8b7..dc8d42aeb 100644
14--- a/lib/rpmrc.c 14--- a/lib/rpmrc.c
15+++ b/lib/rpmrc.c 15+++ b/lib/rpmrc.c
16@@ -459,8 +459,7 @@ static void setDefaults(void) 16@@ -485,8 +485,7 @@ static void setDefaults(void)
17 if (!defrcfiles) { 17 if (!defrcfiles) {
18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", 18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
19 confdir, "/" RPM_VENDOR "/rpmrc", ":", 19 confdir, "/" RPM_VENDOR "/rpmrc", ":",
20- SYSCONFDIR "/rpmrc", ":", 20- SYSCONFDIR "/rpmrc", ":",
21- "~/.rpmrc", NULL); 21- userrc, NULL);
22+ SYSCONFDIR "/rpmrc", NULL); 22+ SYSCONFDIR "/rpmrc", NULL);
23 } 23 }
24 24
25 #ifndef MACROFILES 25 /* macrofiles may be pre-set from --macros */
26@@ -472,8 +471,7 @@ static void setDefaults(void) 26@@ -498,8 +497,7 @@ static void setDefaults(void)
27 confdir, "/" RPM_VENDOR "/macros", ":", 27 confdir, "/" RPM_VENDOR "/macros", ":",
28 SYSCONFDIR "/rpm/macros.*", ":", 28 SYSCONFDIR "/rpm/macros.*", ":",
29 SYSCONFDIR "/rpm/macros", ":", 29 SYSCONFDIR "/rpm/macros", ":",
30- SYSCONFDIR "/rpm/%{_target}/macros", ":", 30- SYSCONFDIR "/rpm/%{_target}/macros", ":",
31- "~/.rpmmacros", NULL); 31- usermacros, NULL);
32+ SYSCONFDIR "/rpm/%{_target}/macros", NULL); 32+ SYSCONFDIR "/rpm/%{_target}/macros", NULL);
33 } 33 }
34 #else 34
35 macrofiles = MACROFILES; 35 free(usermacros);
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
index 328fbf86ac..d3263896ef 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
@@ -1,4 +1,4 @@
1From a8fe7a7a2e41c9f127ed26407d57076babcb89e8 Mon Sep 17 00:00:00 2001 1From 4cf76bb57d3480420e734da99a5c839ac3a9976a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Jan 2017 13:32:06 +0200 3Date: Fri, 20 Jan 2017 13:32:06 +0200
4Subject: [PATCH] Do not reset the PATH environment variable before running 4Subject: [PATCH] Do not reset the PATH environment variable before running
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/lib/rpmscript.c b/lib/rpmscript.c 15diff --git a/lib/rpmscript.c b/lib/rpmscript.c
16index 57689bb68..7b7e26606 100644 16index 060fd8124..4dc6466a8 100644
17--- a/lib/rpmscript.c 17--- a/lib/rpmscript.c
18+++ b/lib/rpmscript.c 18+++ b/lib/rpmscript.c
19@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, 19@@ -251,7 +251,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
20 if (ipath && ipath[5] != '%') 20 if (ipath && ipath[5] != '%')
21 path = ipath; 21 path = ipath;
22 22
diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
index e4251a1a73..fc6d7e0d29 100644
--- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
+++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
@@ -1,4 +1,4 @@
1From 34c0d3263f3e0b366a2320e0823f46673f7ba928 Mon Sep 17 00:00:00 2001 1From 3603cf181b69ab1e0077dcd8a124e669dcb9dd9c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 Jan 2017 14:07:17 +0200 3Date: Tue, 17 Jan 2017 14:07:17 +0200
4Subject: [PATCH] When cross-installing, execute package scriptlets without 4Subject: [PATCH] When cross-installing, execute package scriptlets without
@@ -29,10 +29,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
29 1 file changed, 8 insertions(+), 3 deletions(-) 29 1 file changed, 8 insertions(+), 3 deletions(-)
30 30
31diff --git a/lib/rpmscript.c b/lib/rpmscript.c 31diff --git a/lib/rpmscript.c b/lib/rpmscript.c
32index 3f6313278..57689bb68 100644 32index 097c9055a..060fd8124 100644
33--- a/lib/rpmscript.c 33--- a/lib/rpmscript.c
34+++ b/lib/rpmscript.c 34+++ b/lib/rpmscript.c
35@@ -448,8 +448,7 @@ exit: 35@@ -447,8 +447,7 @@ exit:
36 Fclose(out); /* XXX dup'd STDOUT_FILENO */ 36 Fclose(out); /* XXX dup'd STDOUT_FILENO */
37 37
38 if (fn) { 38 if (fn) {
@@ -42,7 +42,7 @@ index 3f6313278..57689bb68 100644
42 free(fn); 42 free(fn);
43 } 43 }
44 free(mline); 44 free(mline);
45@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, 45@@ -482,7 +481,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
46 46
47 if (rc != RPMRC_FAIL) { 47 if (rc != RPMRC_FAIL) {
48 if (script_type & RPMSCRIPTLET_EXEC) { 48 if (script_type & RPMSCRIPTLET_EXEC) {
diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch
index 2f6397aa8a..0c29e5543a 100644
--- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch
+++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch
@@ -1,4 +1,4 @@
1From ae4fdd8e8d052835973e6ff4b7550f93bde30a98 Mon Sep 17 00:00:00 2001 1From e688eb54fd54d65181e94b854b3568d99cbf3a24 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 31 Aug 2021 10:37:05 +0200 3Date: Tue, 31 Aug 2021 10:37:05 +0200
4Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata 4Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/build/pack.c b/build/pack.c 16diff --git a/build/pack.c b/build/pack.c
17index f382c7da0..0889dd993 100644 17index fb1f1bed8..45885a6ac 100644
18--- a/build/pack.c 18--- a/build/pack.c
19+++ b/build/pack.c 19+++ b/build/pack.c
20@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) 20@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg)
diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch
index 98e52da3a8..7d443ccc6c 100644
--- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch
+++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch
@@ -1,4 +1,4 @@
1From b04ecb793a3c859985eead5e261785b27a4c4a20 Mon Sep 17 00:00:00 2001 1From ad530868e37f09e9236c085d25a834304750704b Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 7 May 2020 17:40:58 +0800 3Date: Thu, 7 May 2020 17:40:58 +0800
4Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 4Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32
@@ -32,7 +32,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
32 1 file changed, 12 insertions(+), 1 deletion(-) 32 1 file changed, 12 insertions(+), 1 deletion(-)
33 33
34diff --git a/lib/transaction.c b/lib/transaction.c 34diff --git a/lib/transaction.c b/lib/transaction.c
35index 70d2587ac..b89b30060 100644 35index 5e4414d2a..b1c55bd44 100644
36--- a/lib/transaction.c 36--- a/lib/transaction.c
37+++ b/lib/transaction.c 37+++ b/lib/transaction.c
38@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, 38@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts,
diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
deleted file mode 100644
index 55108e7f1c..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 58bf006646a063837c46b695f7e7ebb69bee7238 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Tue, 15 Aug 2017 16:41:57 -0500
4Subject: [PATCH] perl: disable auto requires
5
6When generating automatic requirements, it's possible for perl scripts to
7declare 'optional' dependencies. These seem to often be incorrect and will
8cause installation failures in OE. Instead of fixing the perl scripts, it
9was decided it is better to simply disable the automatic dependency
10generation. This matches the behavior from the previous RPM5 implementation.
11
12Upstream-Status: Inappropriate [OE specific configuration]
13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15---
16 fileattrs/perl.attr | 2 +-
17 fileattrs/perllib.attr | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr
21index 0daef58d5..81ddf5305 100644
22--- a/fileattrs/perl.attr
23+++ b/fileattrs/perl.attr
24@@ -1,3 +1,3 @@
25-%__perl_requires %{_rpmconfigdir}/perl.req
26+#__perl_requires %{_rpmconfigdir}/perl.req
27 %__perl_magic ^.*[Pp]erl .*$
28 %__perl_flags exeonly
29diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr
30index fcad48099..495a28927 100644
31--- a/fileattrs/perllib.attr
32+++ b/fileattrs/perllib.attr
33@@ -1,5 +1,5 @@
34 %__perllib_provides %{_rpmconfigdir}/perl.prov
35-%__perllib_requires %{_rpmconfigdir}/perl.req
36+#__perllib_requires %{_rpmconfigdir}/perl.req
37 %__perllib_magic ^Perl[[:digit:]] module source.*
38 %__perllib_path \\.pm$
39 %__perllib_flags magic_and_path
diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
index c5caa7dc5e..082fb343c2 100644
--- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
+++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
@@ -1,4 +1,4 @@
1From d7143dc4e75c8bcc5cc4c852a4b972942b7e4d07 Mon Sep 17 00:00:00 2001 1From 7cc1c8cfcc620dec284204be0ae4416fd9fed95d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Jan 2017 13:33:05 +0200 3Date: Fri, 20 Jan 2017 13:33:05 +0200
4Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR 4Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR
@@ -10,21 +10,21 @@ from target rootfs instead of its own native sysroot.
10Upstream-Status: Inappropriate [oe-core specific] 10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12--- 12---
13 lib/rpmrc.c | 19 ++++++++++++++----- 13 lib/rpmrc.c | 18 +++++++++++++-----
14 1 file changed, 14 insertions(+), 5 deletions(-) 14 1 file changed, 13 insertions(+), 5 deletions(-)
15 15
16diff --git a/lib/rpmrc.c b/lib/rpmrc.c 16diff --git a/lib/rpmrc.c b/lib/rpmrc.c
17index 483585ae4..ea858c290 100644 17index dc8d42aeb..3f2996850 100644
18--- a/lib/rpmrc.c 18--- a/lib/rpmrc.c
19+++ b/lib/rpmrc.c 19+++ b/lib/rpmrc.c
20@@ -456,10 +456,14 @@ const char * lookupInDefaultTable(const char * name, 20@@ -481,11 +481,14 @@ static void setDefaults(void)
21 static void setDefaults(void) 21 userrc = xstrdup(oldrc);
22 { 22 }
23 const char *confdir = rpmConfigDir(); 23 }
24+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR"); 24+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR");
25+ if (etcconfdir == NULL) 25+ if (etcconfdir == NULL)
26+ etcconfdir = ""; 26+ etcconfdir = "";
27+ 27
28 if (!defrcfiles) { 28 if (!defrcfiles) {
29 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", 29 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
30 confdir, "/" RPM_VENDOR "/rpmrc", ":", 30 confdir, "/" RPM_VENDOR "/rpmrc", ":",
@@ -32,11 +32,11 @@ index 483585ae4..ea858c290 100644
32+ etcconfdir, SYSCONFDIR "/rpmrc", NULL); 32+ etcconfdir, SYSCONFDIR "/rpmrc", NULL);
33 } 33 }
34 34
35 #ifndef MACROFILES 35 /* macrofiles may be pre-set from --macros */
36@@ -469,9 +473,9 @@ static void setDefaults(void) 36@@ -495,9 +498,9 @@ static void setDefaults(void)
37 confdir, "/platform/%{_target}/macros", ":", 37 confdir, "/platform/%{_target}/macros", ":",
38 confdir, "/fileattrs/*.attr", ":", 38 confdir, "/fileattrs/*.attr", ":",
39 confdir, "/" RPM_VENDOR "/macros", ":", 39 confdir, "/" RPM_VENDOR "/macros", ":",
40- SYSCONFDIR "/rpm/macros.*", ":", 40- SYSCONFDIR "/rpm/macros.*", ":",
41- SYSCONFDIR "/rpm/macros", ":", 41- SYSCONFDIR "/rpm/macros", ":",
42- SYSCONFDIR "/rpm/%{_target}/macros", NULL); 42- SYSCONFDIR "/rpm/%{_target}/macros", NULL);
@@ -44,9 +44,9 @@ index 483585ae4..ea858c290 100644
44+ etcconfdir, SYSCONFDIR "/rpm/macros", ":", 44+ etcconfdir, SYSCONFDIR "/rpm/macros", ":",
45+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); 45+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL);
46 } 46 }
47 #else 47
48 macrofiles = MACROFILES; 48 free(usermacros);
49@@ -1115,7 +1119,11 @@ static void read_auxv(void) 49@@ -1142,7 +1145,11 @@ static void read_auxv(void)
50 */ 50 */
51 static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) 51 static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
52 { 52 {
@@ -59,7 +59,7 @@ index 483585ae4..ea858c290 100644
59 static struct utsname un; 59 static struct utsname un;
60 char * chptr; 60 char * chptr;
61 canonEntry canon; 61 canonEntry canon;
62@@ -1435,6 +1443,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) 62@@ -1462,6 +1469,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
63 63
64 if (arch) *arch = un.machine; 64 if (arch) *arch = un.machine;
65 if (os) *os = un.sysname; 65 if (os) *os = un.sysname;
diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
index 23dce30086..00fe19108e 100644
--- a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
+++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch
@@ -1,4 +1,4 @@
1From 29c2a0c18b0c773128bf62c611b4c53fe4471105 Mon Sep 17 00:00:00 2001 1From d8972ff7fa0a30e199144ba135223bf561874e01 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 16 Jan 2024 09:59:26 +0100 3Date: Tue, 16 Jan 2024 09:59:26 +0100
4Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C 4Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
16 1 file changed, 6 insertions(+) 16 1 file changed, 6 insertions(+)
17 17
18diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c 18diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c
19index 243568766..43c27074a 100644 19index eb439cad8..1eef0b851 100644
20--- a/rpmio/rpmglob.c 20--- a/rpmio/rpmglob.c
21+++ b/rpmio/rpmglob.c 21+++ b/rpmio/rpmglob.c
22@@ -33,6 +33,12 @@ 22@@ -33,6 +33,12 @@
diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
index 732202c46f..278fa38bad 100644
--- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
+++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
@@ -1,4 +1,4 @@
1From f01d9c24bb86bc47ad2453483518dbb25953cac7 Mon Sep 17 00:00:00 2001 1From 452b696ea3e1975ea30cf7a92678aa4b316e6300 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 10 Jan 2019 18:14:18 +0100 3Date: Thu, 10 Jan 2019 18:14:18 +0100
4Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO 4Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 4 insertions(+), 4 deletions(-) 14 1 file changed, 4 insertions(+), 4 deletions(-)
15 15
16diff --git a/lib/rpmscript.c b/lib/rpmscript.c 16diff --git a/lib/rpmscript.c b/lib/rpmscript.c
17index 7b7e26606..1dcd23be5 100644 17index 4dc6466a8..6d3c19d01 100644
18--- a/lib/rpmscript.c 18--- a/lib/rpmscript.c
19+++ b/lib/rpmscript.c 19+++ b/lib/rpmscript.c
20@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) 20@@ -290,7 +290,7 @@ static char * writeScript(const char *cmd, const char *script)
21 if (Ferror(fd)) 21 if (Ferror(fd))
22 goto exit; 22 goto exit;
23 23
@@ -26,7 +26,7 @@ index 7b7e26606..1dcd23be5 100644
26 static const char set_x[] = "set -x\n"; 26 static const char set_x[] = "set -x\n";
27 /* Assume failures will be caught by the write below */ 27 /* Assume failures will be caught by the write below */
28 Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); 28 Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
29@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, 29@@ -322,7 +322,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
30 char *mline = NULL; 30 char *mline = NULL;
31 rpmRC rc = RPMRC_FAIL; 31 rpmRC rc = RPMRC_FAIL;
32 32
@@ -35,7 +35,7 @@ index 7b7e26606..1dcd23be5 100644
35 35
36 if (script) { 36 if (script) {
37 fn = writeScript(*argvp[0], script); 37 fn = writeScript(*argvp[0], script);
38@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, 38@@ -374,7 +374,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
39 sname, strerror(errno)); 39 sname, strerror(errno));
40 goto exit; 40 goto exit;
41 } else if (pid == 0) {/* Child */ 41 } else if (pid == 0) {/* Child */
@@ -44,7 +44,7 @@ index 7b7e26606..1dcd23be5 100644
44 sname, *argvp[0], (unsigned)getpid()); 44 sname, *argvp[0], (unsigned)getpid());
45 45
46 fclose(in); 46 fclose(in);
47@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, 47@@ -417,7 +417,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
48 reaped = waitpid(pid, &status, 0); 48 reaped = waitpid(pid, &status, 0);
49 } while (reaped == -1 && errno == EINTR); 49 } while (reaped == -1 && errno == EINTR);
50 50
diff --git a/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb b/meta/recipes-devtools/rpm/rpm_4.20.0.bb
index 9330323797..ec4276d16e 100644
--- a/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.20.0.bb
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org"
24LICENSE = "GPL-2.0-only" 24LICENSE = "GPL-2.0-only"
25LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" 25LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f"
26 26
27SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.x;protocol=https \ 27SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protocol=https \
28 file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ 28 file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
29 file://0001-Do-not-read-config-files-from-HOME.patch \ 29 file://0001-Do-not-read-config-files-from-HOME.patch \
30 file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \ 30 file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \
@@ -32,7 +32,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.x;protoc
32 file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ 32 file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \
33 file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ 33 file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \
34 file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ 34 file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
35 file://0001-perl-disable-auto-reqs.patch \
36 file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ 35 file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
37 file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ 36 file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \
38 file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ 37 file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \
@@ -42,7 +41,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.x;protoc
42 " 41 "
43 42
44PE = "1" 43PE = "1"
45SRCREV = "13b4521341781293c41ac898aa9c2d2f6bc1f21d" 44SRCREV = "b3323786668cf99bc9aed7e60ccdab0bc25e19da"
46 45
47S = "${WORKDIR}/git" 46S = "${WORKDIR}/git"
48 47
@@ -62,13 +61,13 @@ OECMAKE_GENERATOR = "Unix Makefiles"
62 61
63BBCLASSEXTEND = "native nativesdk" 62BBCLASSEXTEND = "native nativesdk"
64 63
65PACKAGECONFIG ??= "internal-openpgp" 64PACKAGECONFIG ??= ""
66 65
67PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" 66PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF"
68PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" 67PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF"
69 68
70# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia 69# has replaced openpgp support and is written in rust: https://fedoraproject.org/wiki/Changes/RpmSequoia
71PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" 70PACKAGECONFIG[sequoia] = "-DWITH_SEQUOIA=ON,-DWITH_SEQUOIA=OFF,rpm-sequoia"
72 71
73PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" 72PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF"
74PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" 73PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-14 10:12:06 +0000