mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 03:32:12 +02:00
ea9c2cfb69
With this release, as expected, deprecated openpgp support has been fully removed and replaced with sequoia: https://github.com/rpm-software-management/rpm-sequoia/ Alas, it's written in rust, and has no recipe, so for now signing rpm packages has to be disabled. Remove package name parameter to %prep in source archiving, as it's been dropped in the new rpm, and wasn't needed to begin with. Drop 0001-perl-disable-auto-reqs.patch (files removed upstream). (From OE-Core rev: 8c15b4577d5e554cc2dd5adfb88b816894b05a9a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 651310691a8a41ab3a766545c53b69e6e0c4f88d 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>
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
macros.in | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index de0b578a6..9a3aba071 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -41,7 +41,7 @@ option(WITH_LIBELF "Build with libelf support" ON)
|
|
option(WITH_LIBLZMA "Build with liblzma support" ON)
|
|
option(WITH_DOXYGEN "Build API docs with doxygen" OFF)
|
|
|
|
-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
|
|
+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home")
|
|
set(RPM_MACROSDIR "${RPM_CONFIGDIR}/macros.d")
|
|
set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
|
|
|
|
diff --git a/macros.in b/macros.in
|
|
index 4d3e8afdc..66e31320f 100644
|
|
--- a/macros.in
|
|
+++ b/macros.in
|
|
@@ -964,7 +964,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
|
|
%_sharedstatedir %{_var}/lib
|
|
%_localstatedir %{_prefix}/var
|
|
%_lib lib
|
|
-%_libdir %{_exec_prefix}/%{_lib}
|
|
+%_libdir @libdir@
|
|
%_includedir %{_prefix}/include
|
|
%_infodir %{_datadir}/info
|
|
%_mandir %{_datadir}/man
|