diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 14 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch | 68 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch | 59 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.17.0.bb (renamed from meta/recipes-devtools/rpm/rpm_4.16.1.3.bb) | 21 |
7 files changed, 49 insertions, 194 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 d8fcc16729..6d236ac400 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 @@ | |||
1 | From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001 | 1 | From 8d013fe154a162305f76141151baf767dd04b598 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | 4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index fe35a90fa..b2faec6f3 100644 | 17 | index eb7d6941b..10a889b5d 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -966,7 +966,7 @@ else | 20 | @@ -871,7 +871,7 @@ else |
21 | usrprefix=$prefix | 21 | usrprefix=$prefix |
22 | fi | 22 | fi |
23 | 23 | ||
@@ -27,10 +27,10 @@ index fe35a90fa..b2faec6f3 100644 | |||
27 | 27 | ||
28 | AC_SUBST(OBJDUMP) | 28 | AC_SUBST(OBJDUMP) |
29 | diff --git a/macros.in b/macros.in | 29 | diff --git a/macros.in b/macros.in |
30 | index 35c8cf9df..9d8b2825c 100644 | 30 | index a1f795e5f..689e784ef 100644 |
31 | --- a/macros.in | 31 | --- a/macros.in |
32 | +++ b/macros.in | 32 | +++ b/macros.in |
33 | @@ -996,7 +996,7 @@ package or when debugging this package.\ | 33 | @@ -933,7 +933,7 @@ package or when debugging this package.\ |
34 | %_sharedstatedir %{_prefix}/com | 34 | %_sharedstatedir %{_prefix}/com |
35 | %_localstatedir %{_prefix}/var | 35 | %_localstatedir %{_prefix}/var |
36 | %_lib lib | 36 | %_lib lib |
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 | |||
40 | %_infodir %{_datadir}/info | 40 | %_infodir %{_datadir}/info |
41 | %_mandir %{_datadir}/man | 41 | %_mandir %{_datadir}/man |
42 | diff --git a/rpm.am b/rpm.am | 42 | diff --git a/rpm.am b/rpm.am |
43 | index 8e1dc2184..3d889ec86 100644 | 43 | index 7b57f433b..9bbb9ee96 100644 |
44 | --- a/rpm.am | 44 | --- a/rpm.am |
45 | +++ b/rpm.am | 45 | +++ b/rpm.am |
46 | @@ -1,10 +1,10 @@ | 46 | @@ -1,10 +1,10 @@ |
@@ -55,4 +55,4 @@ index 8e1dc2184..3d889ec86 100644 | |||
55 | +rpmconfigdir = $(libdir)/rpm | 55 | +rpmconfigdir = $(libdir)/rpm |
56 | 56 | ||
57 | # Libtool version (current-revision-age) for all our libraries | 57 | # Libtool version (current-revision-age) for all our libraries |
58 | rpm_version_info = 10:3:1 | 58 | rpm_version_info = 11:0:2 |
diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch b/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch deleted file mode 100644 index b960da6c31..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | From d076de030deb9cafd9b2e82be5d506cebdefad0b Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 27 Feb 2017 14:43:21 +0200 | ||
4 | Subject: [PATCH 1/9] Fix build with musl C library. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | configure.ac | 3 ++- | ||
11 | rpmio/digest_nss.c | 1 + | ||
12 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
13 | |||
14 | --- a/rpmio/digest_nss.c | ||
15 | +++ b/rpmio/digest_nss.c | ||
16 | @@ -1,5 +1,6 @@ | ||
17 | #include "system.h" | ||
18 | |||
19 | +#include <signal.h> | ||
20 | #include <pthread.h> | ||
21 | #include <nss.h> | ||
22 | #include <sechash.h> | ||
diff --git a/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch b/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch new file mode 100644 index 0000000000..ced52d1007 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 9bf1693092385eba9841614613313010221ca01f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 29 Jun 2021 20:11:26 +0200 | ||
4 | Subject: [PATCH] docs: do not build manpages (requires pandoc) | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | docs/Makefile.am | 2 -- | ||
10 | 1 file changed, 2 deletions(-) | ||
11 | |||
12 | diff --git a/docs/Makefile.am b/docs/Makefile.am | ||
13 | index 5a6bd203a..6257767fd 100644 | ||
14 | --- a/docs/Makefile.am | ||
15 | +++ b/docs/Makefile.am | ||
16 | @@ -1,7 +1,5 @@ | ||
17 | ## Process this file with automake to produce Makefile.in | ||
18 | |||
19 | -SUBDIRS = man | ||
20 | - | ||
21 | EXTRA_DIST = | ||
22 | |||
23 | EXTRA_DIST += \ | ||
24 | -- | ||
25 | 2.32.0 | ||
26 | |||
diff --git a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch deleted file mode 100644 index dc3f74fecd..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 0066b862bb3a09f39295abd5d972a53ac8dc1555 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Bergin <peter@berginkonsult.se> | ||
3 | Date: Wed, 19 Sep 2018 15:12:31 +0200 | ||
4 | Subject: [PATCH] rpm/rpmio.c: restrict virtual memory usage if limit set | ||
5 | |||
6 | A solution to avoid OOM situation when the virtual memory is restricted | ||
7 | for a user (ulimit -v). As the lzopen_internal function is run in parallel | ||
8 | one instance per CPU thread the available virtual memory is limited per | ||
9 | CPU thread. | ||
10 | |||
11 | Upstream-Status: Pending [merge of multithreading patches to upstream] | ||
12 | |||
13 | Signed-off-by: Peter Bergin <peter@berginkonsult.se> | ||
14 | Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com> | ||
15 | --- | ||
16 | rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++ | ||
17 | 1 file changed, 36 insertions(+) | ||
18 | |||
19 | diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c | ||
20 | index e051c98..b3c56b6 100644 | ||
21 | --- a/rpmio/rpmio.c | ||
22 | +++ b/rpmio/rpmio.c | ||
23 | @@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz) | ||
24 | } | ||
25 | #endif | ||
26 | |||
27 | + struct rlimit virtual_memory = {RLIM_INFINITY , RLIM_INFINITY}; | ||
28 | + int status = getrlimit(RLIMIT_AS, &virtual_memory); | ||
29 | + if ((status != -1) && (virtual_memory.rlim_cur != RLIM_INFINITY)) { | ||
30 | + const uint64_t virtual_memlimit = virtual_memory.rlim_cur; | ||
31 | + uint32_t threads_max = lzma_cputhreads(); | ||
32 | + const uint64_t virtual_memlimit_per_cpu_thread = | ||
33 | + virtual_memlimit / ((threads_max == 0) ? 1 : threads_max); | ||
34 | + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and " | ||
35 | + "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread); | ||
36 | + uint64_t memory_usage_virt; | ||
37 | + /* keep reducing the number of compression threads until memory | ||
38 | + usage falls below the limit per CPU thread*/ | ||
39 | + while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) > | ||
40 | + virtual_memlimit_per_cpu_thread) { | ||
41 | + /* If number of threads goes down to zero or in case of any other error | ||
42 | + * lzma_stream_encoder_mt_memusage will return UINT64_MAX. We must check | ||
43 | + * for both the cases here to avoid an infinite loop. | ||
44 | + * If we get into situation that one thread requires more virtual memory | ||
45 | + * than available we set one thread, print error message and try anyway. */ | ||
46 | + if ((--mt_options.threads == 0) || (memory_usage_virt == UINT64_MAX)) { | ||
47 | + mt_options.threads = 1; | ||
48 | + rpmlog(RPMLOG_WARNING, | ||
49 | + "XZ: Could not adjust number of threads to get below " | ||
50 | + "virtual memory limit %lu. usage %lu\n", | ||
51 | + virtual_memlimit_per_cpu_thread, memory_usage_virt); | ||
52 | + break; | ||
53 | + } | ||
54 | + } | ||
55 | + if (threads != (int)mt_options.threads) | ||
56 | + rpmlog(RPMLOG_NOTICE, | ||
57 | + "XZ: Adjusted the number of threads from %d to %d to not " | ||
58 | + "exceed the memory usage limit of %lu bytes\n", | ||
59 | + threads, mt_options.threads, virtual_memlimit); | ||
60 | + | ||
61 | + } | ||
62 | + | ||
63 | ret = lzma_stream_encoder_mt(&lzfile->strm, &mt_options); | ||
64 | } | ||
65 | #endif | ||
66 | -- | ||
67 | 2.7.4 | ||
68 | |||
diff --git a/meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch b/meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch index e78514b814..9783396639 100644 --- a/meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch +++ b/meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b3952bd5e28f2a4d86c7377de239db8fa7237e14 Mon Sep 17 00:00:00 2001 | 1 | From 9b9d717f484ec913cdd3804e43489b3dc18bd77c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 31 Oct 2020 22:14:05 -0700 | 3 | Date: Sat, 31 Oct 2020 22:14:05 -0700 |
4 | Subject: [PATCH] tools: Add error.h for non-glibc case | 4 | Subject: [PATCH] tools: Add error.h for non-glibc case |
@@ -9,40 +9,15 @@ upstream given that elfutils has been closely tied to glibc | |||
9 | Upstream-Status: Inappropriate [workaround for musl] | 9 | Upstream-Status: Inappropriate [workaround for musl] |
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | tools/debugedit.c | 6 +++++- | 14 | tools/elfdeps.c | 6 +++++- |
14 | tools/elfdeps.c | 6 +++++- | 15 | tools/error.h | 27 +++++++++++++++++++++++++++ |
15 | tools/error.h | 27 +++++++++++++++++++++++++++ | 16 | 2 files changed, 32 insertions(+), 1 deletion(-) |
16 | tools/sepdebugcrcfix.c | 6 +++++- | ||
17 | 4 files changed, 42 insertions(+), 3 deletions(-) | ||
18 | create mode 100644 tools/error.h | 17 | create mode 100644 tools/error.h |
19 | 18 | ||
20 | diff --git a/tools/debugedit.c b/tools/debugedit.c | ||
21 | index 9f8dcd0fb..852f46073 100644 | ||
22 | --- a/tools/debugedit.c | ||
23 | +++ b/tools/debugedit.c | ||
24 | @@ -26,7 +26,6 @@ | ||
25 | #include <byteswap.h> | ||
26 | #include <endian.h> | ||
27 | #include <errno.h> | ||
28 | -#include <error.h> | ||
29 | #include <limits.h> | ||
30 | #include <string.h> | ||
31 | #include <stdlib.h> | ||
32 | @@ -40,6 +39,11 @@ | ||
33 | |||
34 | #include <gelf.h> | ||
35 | #include <dwarf.h> | ||
36 | +#ifdef __GLIBC__ | ||
37 | +#include <error.h> | ||
38 | +#else | ||
39 | +#include "error.h" | ||
40 | +#endif | ||
41 | |||
42 | |||
43 | /* Unfortunately strtab manipulation functions were only officially added | ||
44 | diff --git a/tools/elfdeps.c b/tools/elfdeps.c | 19 | diff --git a/tools/elfdeps.c b/tools/elfdeps.c |
45 | index 6d9094874..f69e60997 100644 | 20 | index d205935bb..3a8945b33 100644 |
46 | --- a/tools/elfdeps.c | 21 | --- a/tools/elfdeps.c |
47 | +++ b/tools/elfdeps.c | 22 | +++ b/tools/elfdeps.c |
48 | @@ -5,10 +5,14 @@ | 23 | @@ -5,10 +5,14 @@ |
@@ -94,25 +69,3 @@ index 000000000..ef06827a0 | |||
94 | +} | 69 | +} |
95 | + | 70 | + |
96 | +#endif /* _ERROR_H_ */ | 71 | +#endif /* _ERROR_H_ */ |
97 | diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c | ||
98 | index fba460014..2be9c1fd8 100644 | ||
99 | --- a/tools/sepdebugcrcfix.c | ||
100 | +++ b/tools/sepdebugcrcfix.c | ||
101 | @@ -29,9 +29,13 @@ | ||
102 | #include <endian.h> | ||
103 | #include <stdio.h> | ||
104 | #include <stdlib.h> | ||
105 | -#include <error.h> | ||
106 | #include <libelf.h> | ||
107 | #include <gelf.h> | ||
108 | +#ifdef __GLIBC__ | ||
109 | +#include <error.h> | ||
110 | +#else | ||
111 | +#include "error.h" | ||
112 | +#endif | ||
113 | |||
114 | #ifndef _ | ||
115 | #define _(x) x | ||
116 | -- | ||
117 | 2.29.2 | ||
118 | |||
diff --git a/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch b/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch deleted file mode 100644 index 4ac5c38f06..0000000000 --- a/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 5141d50d7b3d3c209a22c53deedb4ceef014401d Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Mon, 15 May 2017 10:21:08 +0200 | ||
4 | Subject: [PATCH 09/15] Do not require that ELF binaries are executable to be | ||
5 | identifiable | ||
6 | |||
7 | There is nothing that requires, e.g., a DSO to be executable, but it | ||
8 | is still an ELF binary and should be identified as such. | ||
9 | |||
10 | Upstream probably expects all ELF binaries to be marked as executable, | ||
11 | but rather than imposing such a limitation for OE, allow any file to | ||
12 | be identified as an ELF binary regardless of whether it is executable | ||
13 | or not. | ||
14 | |||
15 | Upstream-Status: Inappropriate | ||
16 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
17 | |||
18 | --- | ||
19 | fileattrs/elf.attr | 1 - | ||
20 | 1 file changed, 1 deletion(-) | ||
21 | |||
22 | diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr | ||
23 | index 5805dd0ee..3516f309d 100644 | ||
24 | --- a/fileattrs/elf.attr | ||
25 | +++ b/fileattrs/elf.attr | ||
26 | @@ -1,4 +1,3 @@ | ||
27 | %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} | ||
28 | %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} | ||
29 | %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$ | ||
30 | -%__elf_flags exeonly | ||
31 | -- | ||
32 | 2.14.2 | ||
33 | |||
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/meta/recipes-devtools/rpm/rpm_4.17.0.bb index aa6b5ee8aa..00e480b170 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +++ b/meta/recipes-devtools/rpm/rpm_4.17.0.bb | |||
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" | |||
24 | LICENSE = "GPL-2.0" | 24 | LICENSE = "GPL-2.0" |
25 | LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" | 25 | LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" |
26 | 26 | ||
27 | SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ | 27 | SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.17.x \ |
28 | file://environment.d-rpm.sh \ | 28 | file://environment.d-rpm.sh \ |
29 | file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ | 29 | file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ |
30 | file://0001-Do-not-read-config-files-from-HOME.patch \ | 30 | file://0001-Do-not-read-config-files-from-HOME.patch \ |
@@ -32,23 +32,21 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ | |||
32 | file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \ | 32 | file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \ |
33 | file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ | 33 | file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ |
34 | file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ | 34 | file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ |
35 | file://0001-Fix-build-with-musl-C-library.patch \ | ||
36 | file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ | 35 | file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ |
37 | file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ | ||
38 | file://0001-perl-disable-auto-reqs.patch \ | 36 | file://0001-perl-disable-auto-reqs.patch \ |
39 | file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ | ||
40 | file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ | 37 | file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ |
41 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ | 38 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ |
42 | file://0001-tools-Add-error.h-for-non-glibc-case.patch \ | 39 | file://0001-tools-Add-error.h-for-non-glibc-case.patch \ |
40 | file://0001-docs-do-not-build-manpages-requires-pandoc.patch \ | ||
43 | file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ | 41 | file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ |
44 | " | 42 | " |
45 | 43 | ||
46 | PE = "1" | 44 | PE = "1" |
47 | SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd" | 45 | SRCREV = "3e74e8ba2dd5e76a5353d238dc7fc38651ce27b3" |
48 | 46 | ||
49 | S = "${WORKDIR}/git" | 47 | S = "${WORKDIR}/git" |
50 | 48 | ||
51 | DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" | 49 | DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" |
52 | DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" | 50 | DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" |
53 | 51 | ||
54 | inherit autotools gettext pkgconfig python3native | 52 | inherit autotools gettext pkgconfig python3native |
@@ -60,7 +58,7 @@ AUTOTOOLS_AUXDIR = "${S}/build-aux" | |||
60 | EXTRA_AUTORECONF:append = " --exclude=gnu-configize" | 58 | EXTRA_AUTORECONF:append = " --exclude=gnu-configize" |
61 | 59 | ||
62 | # Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages | 60 | # Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages |
63 | EXTRA_OECONF:append = " --without-lua --enable-python --with-crypto=libgcrypt --with-vendor=pc" | 61 | EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" |
64 | EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" | 62 | EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" |
65 | 63 | ||
66 | # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs | 64 | # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs |
@@ -72,15 +70,18 @@ EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" | |||
72 | 70 | ||
73 | BBCLASSEXTEND = "native nativesdk" | 71 | BBCLASSEXTEND = "native nativesdk" |
74 | 72 | ||
75 | PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" | 73 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" |
76 | # The inhibit plugin serves no purpose outside of the target | 74 | # The inhibit plugin serves no purpose outside of the target |
77 | PACKAGECONFIG:remove:class-native = "inhibit" | 75 | PACKAGECONFIG:remove:class-native = "inhibit" |
78 | PACKAGECONFIG:remove:class-nativesdk = "inhibit" | 76 | PACKAGECONFIG:remove:class-nativesdk = "inhibit" |
79 | 77 | ||
80 | PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" | ||
81 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" | 78 | PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" |
82 | PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" | 79 | PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" |
83 | PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" | 80 | PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" |
81 | PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" | ||
82 | PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" | ||
83 | PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" | ||
84 | PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" | ||
84 | 85 | ||
85 | ASNEEDED = "" | 86 | ASNEEDED = "" |
86 | 87 | ||
@@ -138,8 +139,6 @@ do_install:append () { | |||
138 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ | 139 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ |
139 | ${D}/${libdir}/rpm/macros | 140 | ${D}/${libdir}/rpm/macros |
140 | 141 | ||
141 | sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ | ||
142 | ${D}${libdir}/rpm/pythondistdeps.py | ||
143 | } | 142 | } |
144 | 143 | ||
145 | FILES:${PN} += "${libdir}/rpm-plugins/*.so \ | 144 | FILES:${PN} += "${libdir}/rpm-plugins/*.so \ |