Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 1 | From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 10 Jan 2017 14:11:30 +0200 |
| 4 | Subject: [PATCH] Do not read config files from $HOME |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe-core specific] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 8 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 9 | --- |
| 10 | lib/rpmrc.c | 6 ++---- |
| 11 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 12 | |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 13 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c |
| 14 | index 269d490ac..f39dcfc11 100644 |
| 15 | --- a/lib/rpmrc.c |
| 16 | +++ b/lib/rpmrc.c |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 17 | @@ -458,8 +458,7 @@ static void setDefaults(void) |
| 18 | if (!defrcfiles) { |
| 19 | defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 20 | confdir, "/" RPM_VENDOR "/rpmrc", ":", |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | - SYSCONFDIR "/rpmrc", ":", |
| 22 | - "~/.rpmrc", NULL); |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 23 | + SYSCONFDIR "/rpmrc", NULL); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 24 | } |
| 25 | |
| 26 | #ifndef MACROFILES |
| 27 | @@ -471,8 +470,7 @@ static void setDefaults(void) |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 28 | confdir, "/" RPM_VENDOR "/macros", ":", |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 29 | SYSCONFDIR "/rpm/macros.*", ":", |
| 30 | SYSCONFDIR "/rpm/macros", ":", |
| 31 | - SYSCONFDIR "/rpm/%{_target}/macros", ":", |
| 32 | - "~/.rpmmacros", NULL); |
Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 33 | + SYSCONFDIR "/rpm/%{_target}/macros", NULL); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 34 | } |
| 35 | #else |
| 36 | macrofiles = MACROFILES; |