blob: 796088df539ca6345cbc283c8239cbfce8ab6505 [file] [log] [blame]
Patrick Williams44b3caf2024-04-12 16:51:14 -05001From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Jan 2017 14:11:30 +0200
4Subject: [PATCH] Do not read config files from $HOME
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 lib/rpmrc.c | 6 ++----
10 1 file changed, 2 insertions(+), 4 deletions(-)
11
Patrick Williams73bd93f2024-02-20 08:07:48 -060012diff --git a/lib/rpmrc.c b/lib/rpmrc.c
Patrick Williams44b3caf2024-04-12 16:51:14 -050013index 9437a0ff1..483585ae4 100644
Patrick Williams73bd93f2024-02-20 08:07:48 -060014--- a/lib/rpmrc.c
15+++ b/lib/rpmrc.c
Patrick Williams44b3caf2024-04-12 16:51:14 -050016@@ -459,8 +459,7 @@ static void setDefaults(void)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017 if (!defrcfiles) {
18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
Patrick Williams73bd93f2024-02-20 08:07:48 -060019 confdir, "/" RPM_VENDOR "/rpmrc", ":",
Brad Bishop6e60e8b2018-02-01 10:27:11 -050020- SYSCONFDIR "/rpmrc", ":",
21- "~/.rpmrc", NULL);
Patrick Williams73bd93f2024-02-20 08:07:48 -060022+ SYSCONFDIR "/rpmrc", NULL);
Brad Bishop6e60e8b2018-02-01 10:27:11 -050023 }
24
25 #ifndef MACROFILES
Patrick Williams44b3caf2024-04-12 16:51:14 -050026@@ -472,8 +471,7 @@ static void setDefaults(void)
Patrick Williams73bd93f2024-02-20 08:07:48 -060027 confdir, "/" RPM_VENDOR "/macros", ":",
Brad Bishop6e60e8b2018-02-01 10:27:11 -050028 SYSCONFDIR "/rpm/macros.*", ":",
29 SYSCONFDIR "/rpm/macros", ":",
30- SYSCONFDIR "/rpm/%{_target}/macros", ":",
31- "~/.rpmmacros", NULL);
Patrick Williams73bd93f2024-02-20 08:07:48 -060032+ SYSCONFDIR "/rpm/%{_target}/macros", NULL);
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033 }
34 #else
35 macrofiles = MACROFILES;