X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-devtools%2Frpm%2Ffiles%2F0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-devtools%2Frpm%2Ffiles%2F0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=82e7328757f5c0a67dd12aa307a984e57cdb5307;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta-starlingx/meta-stx-integ/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
deleted file mode 100644
index 82e7328..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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] 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]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- configure.ac | 2 +-
- macros.in    | 2 +-
- rpm.am       | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 09af7c4..9bd6903 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1055,7 +1055,7 @@ else
-     usrprefix=$prefix
- fi
- 
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libdir}/rpm`"
- AC_SUBST(RPMCONFIGDIR)
- 
- AC_SUBST(OBJDUMP)
-diff --git a/macros.in b/macros.in
-index a3aa7a9..62cee5c 100644
---- a/macros.in
-+++ b/macros.in
-@@ -970,7 +970,7 @@ package or when debugging this package.\
- %_sharedstatedir	%{_prefix}/com
- %_localstatedir		%{_prefix}/var
- %_lib			lib
--%_libdir		%{_exec_prefix}/%{_lib}
-+%_libdir		@libdir@
- %_includedir		%{_prefix}/include
- %_infodir		%{_datadir}/info
- %_mandir		%{_datadir}/man
-diff --git a/rpm.am b/rpm.am
-index 82c2d7c..6341b51 100644
---- a/rpm.am
-+++ b/rpm.am
-@@ -1,10 +1,10 @@
- # Internal binaries
- ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(libdir)/rpm
- 
- # Host independent config files
- ## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(libdir)/rpm
- 
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 9:0:1