mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01: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>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 874679725c443e5d73e3a33d1158ab25442c8a5f Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Tue, 10 Jan 2017 14:11:30 +0200
|
|
Subject: [PATCH] Do not read config files from $HOME
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
---
|
|
lib/rpmrc.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
|
|
index 5d778b8b7..dc8d42aeb 100644
|
|
--- a/lib/rpmrc.c
|
|
+++ b/lib/rpmrc.c
|
|
@@ -485,8 +485,7 @@ static void setDefaults(void)
|
|
if (!defrcfiles) {
|
|
defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
|
|
confdir, "/" RPM_VENDOR "/rpmrc", ":",
|
|
- SYSCONFDIR "/rpmrc", ":",
|
|
- userrc, NULL);
|
|
+ SYSCONFDIR "/rpmrc", NULL);
|
|
}
|
|
|
|
/* macrofiles may be pre-set from --macros */
|
|
@@ -498,8 +497,7 @@ static void setDefaults(void)
|
|
confdir, "/" RPM_VENDOR "/macros", ":",
|
|
SYSCONFDIR "/rpm/macros.*", ":",
|
|
SYSCONFDIR "/rpm/macros", ":",
|
|
- SYSCONFDIR "/rpm/%{_target}/macros", ":",
|
|
- usermacros, NULL);
|
|
+ SYSCONFDIR "/rpm/%{_target}/macros", NULL);
|
|
}
|
|
|
|
free(usermacros);
|