diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 14:42:16 +0000 |
commit | 27d56eeebd8197e359aae0a7ccac74cb55ff794d (patch) | |
tree | b3cade20da193ee39424a6e410ddfcdd62bc38c8 /meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch | |
parent | 381c8e634c22321f9c27fae5b6f35e4204840719 (diff) | |
download | poky-27d56eeebd8197e359aae0a7ccac74cb55ff794d.tar.gz |
rpm: add a 4.x recipe
The dnf stack is written and tested against rpm 4.x. So if we want to use dnf for packaging,
we should also use rpm 4 - there's simply too much work involved in making rpm 5 work with it due
to significant API differences, and supporting that going forward.
(From OE-Core rev: 2358e786ec8d1199d90e181eb5d8d00816f669b4)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch new file mode 100644 index 0000000000..96eb418952 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 | ||
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> | ||
8 | --- | ||
9 | lib/rpmrc.c | 6 ++---- | ||
10 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
11 | |||
12 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | ||
13 | index 4ed991321..19fe80f98 100644 | ||
14 | --- a/lib/rpmrc.c | ||
15 | +++ b/lib/rpmrc.c | ||
16 | @@ -458,8 +458,7 @@ static void setDefaults(void) | ||
17 | if (!defrcfiles) { | ||
18 | defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", | ||
19 | confdir, "/" RPMCANONVENDOR "/rpmrc", ":", | ||
20 | - SYSCONFDIR "/rpmrc", ":", | ||
21 | - "~/.rpmrc", NULL); | ||
22 | + SYSCONFDIR "/rpmrc", ":"); | ||
23 | } | ||
24 | |||
25 | #ifndef MACROFILES | ||
26 | @@ -471,8 +470,7 @@ static void setDefaults(void) | ||
27 | confdir, "/" RPMCANONVENDOR "/macros", ":", | ||
28 | SYSCONFDIR "/rpm/macros.*", ":", | ||
29 | SYSCONFDIR "/rpm/macros", ":", | ||
30 | - SYSCONFDIR "/rpm/%{_target}/macros", ":", | ||
31 | - "~/.rpmmacros", NULL); | ||
32 | + SYSCONFDIR "/rpm/%{_target}/macros", ":"); | ||
33 | } | ||
34 | #else | ||
35 | macrofiles = MACROFILES; | ||
36 | -- | ||
37 | 2.11.0 | ||
38 | |||