diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:15 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-06 23:43:34 +0100 |
| commit | 4e4fc46589762914f10ae2fa41b614bcb32f9bb9 (patch) | |
| tree | 8b4b335ff1629126e1d70427b8471934d32a0c2d /meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |
| parent | dff0e6de970bb4c858c22874ea19328c670a4ad6 (diff) | |
| download | openembedded-core-4e4fc46589762914f10ae2fa41b614bcb32f9bb9.tar.gz | |
rpm: update to 4.14.2
Drop --disable-dbus option and patch: --disable-plugins is sufficient.
Drop upstreamed patches.
Drop a chunk of 0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch, as upstream fixed the issue.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 19 |
1 files changed, 8 insertions, 11 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 5604cb9037..82e7328757 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 @@ -From c82c19dc583843b1a975f2e3f2e151656a6f377c Mon Sep 17 00:00:00 2001 +From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 27 Feb 2017 09:43:30 +0200 -Subject: [PATCH 06/14] Do not hardcode "lib/rpm" as the installation path for +Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for default configuration and macros. Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 7155d9f00..21b95ae5f 100644 +index 09af7c4..9bd6903 100644 --- a/configure.ac +++ b/configure.ac -@@ -1047,7 +1047,7 @@ else +@@ -1055,7 +1055,7 @@ else usrprefix=$prefix fi @@ -27,10 +27,10 @@ index 7155d9f00..21b95ae5f 100644 AC_SUBST(OBJDUMP) diff --git a/macros.in b/macros.in -index d08624856..68a972f1e 100644 +index a3aa7a9..62cee5c 100644 --- a/macros.in +++ b/macros.in -@@ -954,7 +954,7 @@ package or when debugging this package.\ +@@ -970,7 +970,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib @@ -40,7 +40,7 @@ index d08624856..68a972f1e 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index 51225892d..e0c834d37 100644 +index 82c2d7c..6341b51 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@ @@ -55,7 +55,4 @@ index 51225892d..e0c834d37 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 8:1:0 --- -2.15.1 - + rpm_version_info = 9:0:1 |