summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-13 18:33:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commit3a7ead55a40bb66b18abb9fd39c012a73f584c20 (patch)
tree488b27fe348d11c799458e86f0ea79121e9b5c06 /meta/recipes-devtools
parent19ecd2d93529e47923b0f1329ff5a5e54ed22097 (diff)
downloadpoky-3a7ead55a40bb66b18abb9fd39c012a73f584c20.tar.gz
rpm: update 4.19.1 -> 4.19.1.1
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 <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch3
-rw-r--r--meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch7
-rw-r--r--meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch42
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch3
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch9
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch9
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch5
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch56
-rw-r--r--meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch5
-rw-r--r--meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch3
-rw-r--r--meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch3
-rw-r--r--meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch3
-rw-r--r--meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch13
-rw-r--r--meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch26
-rw-r--r--meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch2
-rw-r--r--meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch5
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.19.1.1.bb (renamed from meta/recipes-devtools/rpm/rpm_4.19.1.bb)7
17 files changed, 32 insertions, 169 deletions
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 96fe57dfeb..25aa69d7da 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,11 +1,10 @@
1From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 1From f4cf90b5a298d6a3199e8b4c07f520aaf593ce2b 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
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9--- 8---
10 build/rpmfc.c | 4 ++++ 9 build/rpmfc.c | 4 ++++
11 rpmrc.in | 2 ++ 10 rpmrc.in | 2 ++
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 5053caae33..e4edc884b1 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 ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 1From c39a074ff3c4d21c100d387661c7d725b5eae7b0 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
@@ -8,16 +8,15 @@ Otherwise cmake will try to find libm, badly, and fail.
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11
12--- 11---
13 CMakeLists.txt | 2 +- 12 CMakeLists.txt | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 7f0630453..d0ea565f3 100644 16index 4a383ceba..ed847c09a 100644
18--- a/CMakeLists.txt 17--- a/CMakeLists.txt
19+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
20@@ -187,7 +187,7 @@ set(REQFUNCS 19@@ -190,7 +190,7 @@ set(REQFUNCS
21 ) 20 )
22 21
23 find_package(PkgConfig REQUIRED) 22 find_package(PkgConfig REQUIRED)
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
deleted file mode 100644
index db83b176b4..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 16 Jan 2024 13:43:36 +0100
4Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit
5 option
6
7This was lost in autotools -> cmake transition. The particular
8reason to make it explicit is that readline is gpl version 3
9licensed, and in some builds components under that license
10need to be excluded.
11
12Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852]
13Signed-off-by: Alexander Kanavin <alex@linutronix.de>
14---
15 CMakeLists.txt | 7 ++++++-
16 1 file changed, 6 insertions(+), 1 deletion(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 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)
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 df5543873c..d0ed711086 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 d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 1From 86e585cc0dd06dfa20f584af8b59d52a59accb45 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
@@ -9,7 +9,6 @@ hand produces rpms that way by design.
9 9
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
13--- 12---
14 build/pack.c | 4 ---- 13 build/pack.c | 4 ----
15 1 file changed, 4 deletions(-) 14 1 file changed, 4 deletions(-)
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 b056d19741..b571a0ae8c 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 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 1From 73d6841d9ef2a8ac7bd63f9645a3efe8038dfdd4 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
@@ -6,19 +6,18 @@ Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
6 6
7Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] 7Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10--- 9---
11 CMakeLists.txt | 2 +- 10 CMakeLists.txt | 2 +-
12 macros.in | 2 +- 11 macros.in | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
14 13
15diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 2767915fb..7f0630453 100644 15index 7808115c1..4a383ceba 100644
17--- a/CMakeLists.txt 16--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
19@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) 18@@ -33,7 +33,7 @@ option(WITH_IMAEVM "Build with IMA support" OFF)
20 option(WITH_IMAEVM "Build with IMA support" OFF)
21 option(WITH_FAPOLICYD "Build with fapolicyd support" ON) 19 option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
20 option(WITH_READLINE "Build with readline support" ON)
22 21
23-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")
24+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")
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 6a18679da2..796088df53 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,20 +1,19 @@
1From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 1From e210458d125793915abce30420d866a30305c37a 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
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9--- 8---
10 lib/rpmrc.c | 6 ++---- 9 lib/rpmrc.c | 6 ++----
11 1 file changed, 2 insertions(+), 4 deletions(-) 10 1 file changed, 2 insertions(+), 4 deletions(-)
12 11
13diff --git a/lib/rpmrc.c b/lib/rpmrc.c 12diff --git a/lib/rpmrc.c b/lib/rpmrc.c
14index 269d490ac..f39dcfc11 100644 13index 9437a0ff1..483585ae4 100644
15--- a/lib/rpmrc.c 14--- a/lib/rpmrc.c
16+++ b/lib/rpmrc.c 15+++ b/lib/rpmrc.c
17@@ -458,8 +458,7 @@ static void setDefaults(void) 16@@ -459,8 +459,7 @@ static void setDefaults(void)
18 if (!defrcfiles) { 17 if (!defrcfiles) {
19 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", 18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
20 confdir, "/" RPM_VENDOR "/rpmrc", ":", 19 confdir, "/" RPM_VENDOR "/rpmrc", ":",
@@ -24,7 +23,7 @@ index 269d490ac..f39dcfc11 100644
24 } 23 }
25 24
26 #ifndef MACROFILES 25 #ifndef MACROFILES
27@@ -471,8 +470,7 @@ static void setDefaults(void) 26@@ -472,8 +471,7 @@ static void setDefaults(void)
28 confdir, "/" RPM_VENDOR "/macros", ":", 27 confdir, "/" RPM_VENDOR "/macros", ":",
29 SYSCONFDIR "/rpm/macros.*", ":", 28 SYSCONFDIR "/rpm/macros.*", ":",
30 SYSCONFDIR "/rpm/macros", ":", 29 SYSCONFDIR "/rpm/macros", ":",
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 318f65ed37..328fbf86ac 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 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 1From a8fe7a7a2e41c9f127ed26407d57076babcb89e8 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
@@ -8,13 +8,12 @@ We add lots of native stuff into it and scriptlets rely on that.
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12--- 11---
13 lib/rpmscript.c | 2 +- 12 lib/rpmscript.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/lib/rpmscript.c b/lib/rpmscript.c 15diff --git a/lib/rpmscript.c b/lib/rpmscript.c
17index 36e37cf77..37ada014c 100644 16index 57689bb68..7b7e26606 100644
18--- a/lib/rpmscript.c 17--- a/lib/rpmscript.c
19+++ b/lib/rpmscript.c 18+++ b/lib/rpmscript.c
20@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, 19@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch
deleted file mode 100644
index 8e73e07704..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001
2From: Panu Matilainen <pmatilai@redhat.com>
3Date: Mon, 18 Dec 2023 12:25:04 +0200
4Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag
5
6This regressed when we axed our internal glob copy in commit
766fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only
8an optimization so we can just skip it if not available.
9
10Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 CMakeLists.txt | 1 +
14 config.h.in | 1 +
15 rpmio/rpmglob.c | 2 ++
16 3 files changed, 4 insertions(+)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index d0ea565f3..0a474106e 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -351,6 +351,7 @@ if (LIBDW_FOUND)
23 set(HAVE_LIBDW 1)
24 endif()
25
26+check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR)
27 check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS)
28 if (NOT MAJOR_IN_SYSMACROS)
29 check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV)
30diff --git a/config.h.in b/config.h.in
31index cb97827d0..ab1757a9a 100644
32--- a/config.h.in
33+++ b/config.h.in
34@@ -100,6 +100,7 @@
35 #cmakedefine HAVE_ZSTD @HAVE_ZSTD@
36 #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@
37 #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@
38+#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@
39 #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@
40 #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@
41 #cmakedefine RUNDIR @rundir@
42diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c
43index 8276eddb4..243568766 100644
44--- a/rpmio/rpmglob.c
45+++ b/rpmio/rpmglob.c
46@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags,
47 gflags |= GLOB_BRACE;
48 if (home != NULL && strlen(home) > 0)
49 gflags |= GLOB_TILDE;
50+#if HAVE_GLOB_ONLYDIR
51 if (dir_only)
52 gflags |= GLOB_ONLYDIR;
53+#endif
54 if (flags & RPMGLOB_NOCHECK)
55 gflags |= GLOB_NOCHECK;
56
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 fc89b44132..e4251a1a73 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 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 1From 34c0d3263f3e0b366a2320e0823f46673f7ba928 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
@@ -24,13 +24,12 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>:
24 24
25Upstream-Status: Inappropriate [oe-core specific] 25Upstream-Status: Inappropriate [oe-core specific]
26Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 26Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
27
28--- 27---
29 lib/rpmscript.c | 11 ++++++++--- 28 lib/rpmscript.c | 11 ++++++++---
30 1 file changed, 8 insertions(+), 3 deletions(-) 29 1 file changed, 8 insertions(+), 3 deletions(-)
31 30
32diff --git a/lib/rpmscript.c b/lib/rpmscript.c 31diff --git a/lib/rpmscript.c b/lib/rpmscript.c
33index b18f851a3..36e37cf77 100644 32index 3f6313278..57689bb68 100644
34--- a/lib/rpmscript.c 33--- a/lib/rpmscript.c
35+++ b/lib/rpmscript.c 34+++ b/lib/rpmscript.c
36@@ -448,8 +448,7 @@ exit: 35@@ -448,8 +448,7 @@ exit:
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 5820b2e7e5..2f6397aa8a 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 ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 1From ae4fdd8e8d052835973e6ff4b7550f93bde30a98 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
@@ -9,7 +9,6 @@ host to the next and breaks reproducibility for .rpm).
9 9
10Upstream-Status: Inappropriate [oe-core specific] 10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de> 11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12
13--- 12---
14 build/pack.c | 2 +- 13 build/pack.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
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 8b9f1f7294..98e52da3a8 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 bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 1From b04ecb793a3c859985eead5e261785b27a4c4a20 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
@@ -27,7 +27,6 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred".
27Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> 27Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193>
28 28
29Signed-off-by: Changqing Li <changqing.li@windriver.com> 29Signed-off-by: Changqing Li <changqing.li@windriver.com>
30
31--- 30---
32 lib/transaction.c | 13 ++++++++++++- 31 lib/transaction.c | 13 ++++++++++++-
33 1 file changed, 12 insertions(+), 1 deletion(-) 32 1 file changed, 12 insertions(+), 1 deletion(-)
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
index 388694d234..55108e7f1c 100644
--- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
+++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
@@ -1,4 +1,4 @@
1From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 1From 58bf006646a063837c46b695f7e7ebb69bee7238 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com> 2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Tue, 15 Aug 2017 16:41:57 -0500 3Date: Tue, 15 Aug 2017 16:41:57 -0500
4Subject: [PATCH] perl: disable auto requires 4Subject: [PATCH] perl: disable auto requires
@@ -12,7 +12,6 @@ generation. This matches the behavior from the previous RPM5 implementation.
12Upstream-Status: Inappropriate [OE specific configuration] 12Upstream-Status: Inappropriate [OE specific configuration]
13 13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15
16--- 15---
17 fileattrs/perl.attr | 2 +- 16 fileattrs/perl.attr | 2 +-
18 fileattrs/perllib.attr | 2 +- 17 fileattrs/perllib.attr | 2 +-
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 89c23f8197..c5caa7dc5e 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 e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 1From d7143dc4e75c8bcc5cc4c852a4b972942b7e4d07 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
@@ -9,16 +9,15 @@ from target rootfs instead of its own native sysroot.
9 9
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
13--- 12---
14 lib/rpmrc.c | 19 ++++++++++++++----- 13 lib/rpmrc.c | 19 ++++++++++++++-----
15 1 file changed, 14 insertions(+), 5 deletions(-) 14 1 file changed, 14 insertions(+), 5 deletions(-)
16 15
17diff --git a/lib/rpmrc.c b/lib/rpmrc.c 16diff --git a/lib/rpmrc.c b/lib/rpmrc.c
18index f39dcfc11..f27f88753 100644 17index 483585ae4..ea858c290 100644
19--- a/lib/rpmrc.c 18--- a/lib/rpmrc.c
20+++ b/lib/rpmrc.c 19+++ b/lib/rpmrc.c
21@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, 20@@ -456,10 +456,14 @@ const char * lookupInDefaultTable(const char * name,
22 static void setDefaults(void) 21 static void setDefaults(void)
23 { 22 {
24 const char *confdir = rpmConfigDir(); 23 const char *confdir = rpmConfigDir();
@@ -34,7 +33,7 @@ index f39dcfc11..f27f88753 100644
34 } 33 }
35 34
36 #ifndef MACROFILES 35 #ifndef MACROFILES
37@@ -468,9 +472,9 @@ static void setDefaults(void) 36@@ -469,9 +473,9 @@ static void setDefaults(void)
38 confdir, "/platform/%{_target}/macros", ":", 37 confdir, "/platform/%{_target}/macros", ":",
39 confdir, "/fileattrs/*.attr", ":", 38 confdir, "/fileattrs/*.attr", ":",
40 confdir, "/" RPM_VENDOR "/macros", ":", 39 confdir, "/" RPM_VENDOR "/macros", ":",
@@ -47,7 +46,7 @@ index f39dcfc11..f27f88753 100644
47 } 46 }
48 #else 47 #else
49 macrofiles = MACROFILES; 48 macrofiles = MACROFILES;
50@@ -1114,7 +1118,11 @@ static void read_auxv(void) 49@@ -1115,7 +1119,11 @@ static void read_auxv(void)
51 */ 50 */
52 static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) 51 static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
53 { 52 {
@@ -60,7 +59,7 @@ index f39dcfc11..f27f88753 100644
60 static struct utsname un; 59 static struct utsname un;
61 char * chptr; 60 char * chptr;
62 canonEntry canon; 61 canonEntry canon;
63@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) 62@@ -1435,6 +1443,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
64 63
65 if (arch) *arch = un.machine; 64 if (arch) *arch = un.machine;
66 if (os) *os = un.sysname; 65 if (os) *os = un.sysname;
diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch
deleted file mode 100644
index e7f0adc70c..0000000000
--- a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 29 Nov 2023 14:09:06 +0100
4Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html
5
6Building html would require doxygen-native.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10
11---
12 docs/CMakeLists.txt | 1 -
13 1 file changed, 1 deletion(-)
14
15diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
16index 52dce7b4e..c01ff7757 100644
17--- a/docs/CMakeLists.txt
18+++ b/docs/CMakeLists.txt
19@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND)
20 elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html)
21 set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR})
22 endif()
23-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API)
24
25 install(FILES
26 README.md
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 3d4b09bedb..23dce30086 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 f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 1From 29c2a0c18b0c773128bf62c611b4c53fe4471105 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
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 b3d57cc870..732202c46f 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 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 1From f01d9c24bb86bc47ad2453483518dbb25953cac7 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
@@ -9,13 +9,12 @@ irrelevant noise to rootfs logs.
9 9
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
13--- 12---
14 lib/rpmscript.c | 8 ++++---- 13 lib/rpmscript.c | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-) 14 1 file changed, 4 insertions(+), 4 deletions(-)
16 15
17diff --git a/lib/rpmscript.c b/lib/rpmscript.c 16diff --git a/lib/rpmscript.c b/lib/rpmscript.c
18index 37ada014c..bab0c97a6 100644 17index 7b7e26606..1dcd23be5 100644
19--- a/lib/rpmscript.c 18--- a/lib/rpmscript.c
20+++ b/lib/rpmscript.c 19+++ b/lib/rpmscript.c
21@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) 20@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script)
diff --git a/meta/recipes-devtools/rpm/rpm_4.19.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb
index a495f7ced2..0802f26295 100644
--- a/meta/recipes-devtools/rpm/rpm_4.19.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb
@@ -37,14 +37,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.x;protoc
37 file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ 37 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 \ 38 file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \
39 file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ 39 file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \
40 file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \
41 file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ 40 file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \
42 file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \
43 file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \
44 " 41 "
45 42
46PE = "1" 43PE = "1"
47SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" 44SRCREV = "13b4521341781293c41ac898aa9c2d2f6bc1f21d"
48 45
49S = "${WORKDIR}/git" 46S = "${WORKDIR}/git"
50 47
@@ -135,6 +132,8 @@ do_install:append () {
135 sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ 132 sed -i -e 's:${HOSTTOOLS_DIR}/::g' \
136 -e 's:${STAGING_DIR_NATIVE}/::g' \ 133 -e 's:${STAGING_DIR_NATIVE}/::g' \
137 ${D}/${libdir}/rpm/macros 134 ${D}/${libdir}/rpm/macros
135 sed -i -e 's:${RECIPE_SYSROOT}/::g' \
136 ${D}/${libdir}/cmake/rpm/rpm-targets.cmake
138 137
139} 138}
140 139
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 01:09:07 +0000