blob: 6a18679da2f17e2dd06f0fdc5dc015cbe6b11416 [file] [log] [blame]
Patrick Williams73bd93f2024-02-20 08:07:48 -06001From 4f34994d9ad38d96976578a9d1a006f72e5aca50 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>
Patrick Williams73bd93f2024-02-20 08:07:48 -06008
Brad Bishop6e60e8b2018-02-01 10:27:11 -05009---
10 lib/rpmrc.c | 6 ++----
11 1 file changed, 2 insertions(+), 4 deletions(-)
12
Patrick Williams73bd93f2024-02-20 08:07:48 -060013diff --git a/lib/rpmrc.c b/lib/rpmrc.c
14index 269d490ac..f39dcfc11 100644
15--- a/lib/rpmrc.c
16+++ b/lib/rpmrc.c
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017@@ -458,8 +458,7 @@ static void setDefaults(void)
18 if (!defrcfiles) {
19 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
Patrick Williams73bd93f2024-02-20 08:07:48 -060020 confdir, "/" RPM_VENDOR "/rpmrc", ":",
Brad Bishop6e60e8b2018-02-01 10:27:11 -050021- SYSCONFDIR "/rpmrc", ":",
22- "~/.rpmrc", NULL);
Patrick Williams73bd93f2024-02-20 08:07:48 -060023+ SYSCONFDIR "/rpmrc", NULL);
Brad Bishop6e60e8b2018-02-01 10:27:11 -050024 }
25
26 #ifndef MACROFILES
27@@ -471,8 +470,7 @@ static void setDefaults(void)
Patrick Williams73bd93f2024-02-20 08:07:48 -060028 confdir, "/" RPM_VENDOR "/macros", ":",
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 SYSCONFDIR "/rpm/macros.*", ":",
30 SYSCONFDIR "/rpm/macros", ":",
31- SYSCONFDIR "/rpm/%{_target}/macros", ":",
32- "~/.rpmmacros", NULL);
Patrick Williams73bd93f2024-02-20 08:07:48 -060033+ SYSCONFDIR "/rpm/%{_target}/macros", NULL);
Brad Bishop6e60e8b2018-02-01 10:27:11 -050034 }
35 #else
36 macrofiles = MACROFILES;