summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-01 20:01:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commit4a6b872bd47d003009911f040724294561d45664 (patch)
treeb791da78124332cbfdbe3efc65a77f9beaa896bb /meta/recipes-devtools
parent9c6fc607ff73a4aa8f30bfa19edd3982230fd5a3 (diff)
downloadpoky-4a6b872bd47d003009911f040724294561d45664.tar.gz
rpm: update to 4.14.1
Drop two upstreamed patches. License-Update: grammar fixes (From OE-Core rev: c74bbe70988e7dd3ee1b7977de68a7ffe64fc8ef) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch16
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch43
-rw-r--r--meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch153
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.14.1.bb (renamed from meta/recipes-devtools/rpm/rpm_4.14.0.bb)9
4 files changed, 12 insertions, 209 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 d7b1145bc5..5604cb9037 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,7 +1,7 @@
1From 2b1a3f900f15034943fc41661eaab41bcc0d4d84 Mon Sep 17 00:00:00 2001 1From c82c19dc583843b1a975f2e3f2e151656a6f377c 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 06/15] Do not hardcode "lib/rpm" as the installation path for 4Subject: [PATCH 06/14] Do not hardcode "lib/rpm" as the installation path for
5 default configuration and macros. 5 default configuration and macros.
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]
@@ -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
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 373d69484..c04a2e8d1 100644 17index 7155d9f00..21b95ae5f 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1038,7 +1038,7 @@ else 20@@ -1047,7 +1047,7 @@ else
21 usrprefix=$prefix 21 usrprefix=$prefix
22 fi 22 fi
23 23
@@ -27,7 +27,7 @@ index 373d69484..c04a2e8d1 100644
27 27
28 AC_SUBST(OBJDUMP) 28 AC_SUBST(OBJDUMP)
29diff --git a/macros.in b/macros.in 29diff --git a/macros.in b/macros.in
30index 3f8dbba61..da4812540 100644 30index d08624856..68a972f1e 100644
31--- a/macros.in 31--- a/macros.in
32+++ b/macros.in 32+++ b/macros.in
33@@ -954,7 +954,7 @@ package or when debugging this package.\ 33@@ -954,7 +954,7 @@ package or when debugging this package.\
@@ -40,7 +40,7 @@ index 3f8dbba61..da4812540 100644
40 %_infodir %{_datadir}/info 40 %_infodir %{_datadir}/info
41 %_mandir %{_datadir}/man 41 %_mandir %{_datadir}/man
42diff --git a/rpm.am b/rpm.am 42diff --git a/rpm.am b/rpm.am
43index f0df0202f..37205a5eb 100644 43index 51225892d..e0c834d37 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,7 +55,7 @@ index f0df0202f..37205a5eb 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 = 8:0:0 58 rpm_version_info = 8:1:0
59-- 59--
602.14.2 602.15.1
61 61
diff --git a/meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch b/meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch
deleted file mode 100644
index 31024bd7e8..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/a3652af66fa2a1f272d771323fee019f23d350f5]
2
3From 68a7b60f89419e53a4bd3c412f816f0576ffd8c4 Mon Sep 17 00:00:00 2001
4From: Mike Crowe <mac@mcrowe.com>
5Date: Thu, 4 Jan 2018 14:39:51 +0000
6Subject: [PATCH] Make configure cope with multiple users/groups with ID 0
7
8If /etc/passwd contains multiple users with UID 0 then user_with_uid0 will
9contain a line feed which results in config.h containing:
10
11 #define UID_0_USER "root
12
13(i.e. without a closing quote.)
14
15The same problem occurs with /etc/group.
16
17Let's only emit the first match in each case so that there is only ever a
18single result.
19
20Signed-off-by: Mike Crowe <mac@mcrowe.com>
21
22---
23 configure.ac | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/configure.ac b/configure.ac
27index ab8ca4f54..5259ad243 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -996,8 +996,8 @@ if test "$with_dmalloc" = yes ; then
31 LIBS="$LIBS -ldmalloc"
32 fi
33
34-user_with_uid0=$(awk -F: '$3==0 {print $1}' /etc/passwd)
35-group_with_gid0=$(awk -F: '$3==0 {print $1}' /etc/group)
36+user_with_uid0=$(awk -F: '$3==0 {print $1;exit}' /etc/passwd)
37+group_with_gid0=$(awk -F: '$3==0 {print $1;exit}' /etc/group)
38 AC_DEFINE_UNQUOTED([UID_0_USER],["$user_with_uid0"],[Get the user name having userid 0])
39 AC_DEFINE_UNQUOTED([GID_0_GROUP],["$group_with_gid0"],[Get the group name having groupid 0])
40
41--
422.11.0
43
diff --git a/meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch b/meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch
deleted file mode 100644
index d84e8b54d8..0000000000
--- a/meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch
+++ /dev/null
@@ -1,153 +0,0 @@
1From ef9f8c17c3e5c35d3b55db9ca76b0fa0d6336421 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Mon, 15 May 2017 11:23:26 +0200
4Subject: [PATCH 10/15] Add a new option --alldeps to rpmdeps
5
6This will send the output from rpmfcPrint() to stdout. This is an
7alternative to using the --rpmfcdebug option, which will send the same
8output to stderr. The two options have totally different use cases
9though. While --alldeps is used when the output from rpmfcPrint() is
10what is wanted, --rpmfcdebug can be used together with the other
11output options, e.g., --requires, without affecting their output.
12
13Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/220]
14Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
15
16---
17 build/rpmfc.c | 27 ++++++++++++++-------------
18 build/rpmfc.h | 1 -
19 tools/rpmdeps.c | 44 +++++++++++++++++++++++++-------------------
20 3 files changed, 39 insertions(+), 33 deletions(-)
21
22diff --git a/build/rpmfc.c b/build/rpmfc.c
23index b8aea76d0..d04ffb297 100644
24--- a/build/rpmfc.c
25+++ b/build/rpmfc.c
26@@ -692,7 +692,6 @@ static rpm_color_t rpmfcColor(const char * fmstr)
27
28 void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
29 {
30- rpm_color_t fcolor;
31 int ndx;
32 int dx;
33 int fx;
34@@ -704,21 +703,23 @@ void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
35
36 if (fc)
37 for (fx = 0; fx < fc->nfiles; fx++) {
38- rpmsid cx = fc->fcdictx[fx] + 1; /* id's are one off */
39- fcolor = fc->fcolor[fx];
40- ARGV_t fattrs = fc->fattrs[fx];
41-
42 fprintf(fp, "%3d %s", fx, fc->fn[fx]);
43- if (fcolor != RPMFC_BLACK)
44+ if (_rpmfc_debug) {
45+ rpmsid cx = fc->fcdictx[fx] + 1; /* id's are one off */
46+ rpm_color_t fcolor = fc->fcolor[fx];
47+ ARGV_t fattrs = fc->fattrs[fx];
48+
49+ if (fcolor != RPMFC_BLACK)
50 fprintf(fp, "\t0x%x", fc->fcolor[fx]);
51- else
52+ else
53 fprintf(fp, "\t%s", rpmstrPoolStr(fc->cdict, cx));
54- if (fattrs) {
55- char *attrs = argvJoin(fattrs, ",");
56- fprintf(fp, " [%s]", attrs);
57- free(attrs);
58- } else {
59- fprintf(fp, " [none]");
60+ if (fattrs) {
61+ char *attrs = argvJoin(fattrs, ",");
62+ fprintf(fp, " [%s]", attrs);
63+ free(attrs);
64+ } else {
65+ fprintf(fp, " [none]");
66+ }
67 }
68 fprintf(fp, "\n");
69
70diff --git a/build/rpmfc.h b/build/rpmfc.h
71index dae8ea5b1..3d87b31cf 100644
72--- a/build/rpmfc.h
73+++ b/build/rpmfc.h
74@@ -45,7 +45,6 @@ typedef const struct rpmfcTokens_s * rpmfcToken;
75
76 /** \ingroup rpmfc
77 * Print results of file classification.
78- * @todo Remove debugging routine.
79 * @param msg message prefix (NULL for none)
80 * @param fc file classifier
81 * @param fp output file handle (NULL for stderr)
82diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c
83index 419befce1..f260a38c4 100644
84--- a/tools/rpmdeps.c
85+++ b/tools/rpmdeps.c
86@@ -23,6 +23,8 @@ static int print_conflicts;
87
88 static int print_obsoletes;
89
90+static int print_alldeps;
91+
92 static void rpmdsPrint(const char * msg, rpmds ds, FILE * fp)
93 {
94 if (fp == NULL) fp = stderr;
95@@ -57,6 +59,8 @@ static struct poptOption optionsTable[] = {
96 NULL, NULL },
97 { "obsoletes", '\0', POPT_ARG_VAL, &print_obsoletes, -1,
98 NULL, NULL },
99+ { "alldeps", '\0', POPT_ARG_VAL, &print_alldeps, -1,
100+ NULL, NULL },
101
102 POPT_AUTOALIAS
103 POPT_AUTOHELP
104@@ -100,25 +104,27 @@ main(int argc, char *argv[])
105 if (rpmfcClassify(fc, av, NULL) || rpmfcApply(fc))
106 goto exit;
107
108- if (_rpmfc_debug)
109- rpmfcPrint(NULL, fc, NULL);
110-
111- if (print_provides)
112- rpmdsPrint(NULL, rpmfcProvides(fc), stdout);
113- if (print_requires)
114- rpmdsPrint(NULL, rpmfcRequires(fc), stdout);
115- if (print_recommends)
116- rpmdsPrint(NULL, rpmfcRecommends(fc), stdout);
117- if (print_suggests)
118- rpmdsPrint(NULL, rpmfcSuggests(fc), stdout);
119- if (print_supplements)
120- rpmdsPrint(NULL, rpmfcSupplements(fc), stdout);
121- if (print_enhances)
122- rpmdsPrint(NULL, rpmfcEnhances(fc), stdout);
123- if (print_conflicts)
124- rpmdsPrint(NULL, rpmfcConflicts(fc), stdout);
125- if (print_obsoletes)
126- rpmdsPrint(NULL, rpmfcObsoletes(fc), stdout);
127+ if (print_alldeps || _rpmfc_debug)
128+ rpmfcPrint(NULL, fc, print_alldeps ? stdout : NULL);
129+
130+ if (!print_alldeps) {
131+ if (print_provides)
132+ rpmdsPrint(NULL, rpmfcProvides(fc), stdout);
133+ if (print_requires)
134+ rpmdsPrint(NULL, rpmfcRequires(fc), stdout);
135+ if (print_recommends)
136+ rpmdsPrint(NULL, rpmfcRecommends(fc), stdout);
137+ if (print_suggests)
138+ rpmdsPrint(NULL, rpmfcSuggests(fc), stdout);
139+ if (print_supplements)
140+ rpmdsPrint(NULL, rpmfcSupplements(fc), stdout);
141+ if (print_enhances)
142+ rpmdsPrint(NULL, rpmfcEnhances(fc), stdout);
143+ if (print_conflicts)
144+ rpmdsPrint(NULL, rpmfcConflicts(fc), stdout);
145+ if (print_obsoletes)
146+ rpmdsPrint(NULL, rpmfcObsoletes(fc), stdout);
147+ }
148
149 ec = 0;
150
151--
1522.14.2
153
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.0.bb b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index aa2579e3bf..d75902788e 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -22,7 +22,7 @@ HOMEPAGE = "http://www.rpm.org"
22 22
23# libraries are also LGPL - how to express this? 23# libraries are also LGPL - how to express this?
24LICENSE = "GPL-2.0" 24LICENSE = "GPL-2.0"
25LIC_FILES_CHKSUM = "file://COPYING;md5=f5259151d26ff18e78023450a5ac8d96" 25LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"
26 26
27SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ 27SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
28 file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ 28 file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
@@ -34,17 +34,15 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
34 file://0001-Fix-build-with-musl-C-library.patch \ 34 file://0001-Fix-build-with-musl-C-library.patch \
35 file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ 35 file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
36 file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ 36 file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \
37 file://0013-Add-a-new-option-alldeps-to-rpmdeps.patch \
38 file://0001-Split-binary-package-building-into-a-separate-functi.patch \ 37 file://0001-Split-binary-package-building-into-a-separate-functi.patch \
39 file://0002-Run-binary-package-creation-via-thread-pools.patch \ 38 file://0002-Run-binary-package-creation-via-thread-pools.patch \
40 file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \ 39 file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
41 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \ 40 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
42 file://0001-perl-disable-auto-reqs.patch \ 41 file://0001-perl-disable-auto-reqs.patch \
43 file://0001-Make-configure-cope-with-multiple-users-groups-with-.patch \
44 " 42 "
45 43
46PE = "1" 44PE = "1"
47SRCREV = "da3720f62e57648fb1dc2a632744d38866139971" 45SRCREV = "bfee1410af51c1cc9724791fb8d985260a62102b"
48 46
49S = "${WORKDIR}/git" 47S = "${WORKDIR}/git"
50 48
@@ -107,7 +105,8 @@ do_install_append () {
107 ${D}/${libdir}/rpm/macros 105 ${D}/${libdir}/rpm/macros
108 106
109 sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ 107 sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
110 ${D}${libdir}/rpm/pythondistdeps.py 108 ${D}${libdir}/rpm/pythondistdeps.py \
109 ${D}${libdir}/rpm/python-macro-helper
111} 110}
112 111
113FILES_${PN} += "${libdir}/rpm-plugins/*.so \ 112FILES_${PN} += "${libdir}/rpm-plugins/*.so \