summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-06-13 14:55:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:28 +0100
commit0dbe1c78809208b2d6cb2e1901c03733c98f6c36 (patch)
treefea02f11ebd7c3d1376a410e83135ec6e99d3995 /meta/recipes-devtools
parent2d224392dab399c40f170efdfe07db3a5d081c53 (diff)
downloadpoky-0dbe1c78809208b2d6cb2e1901c03733c98f6c36.tar.gz
mtools-native: disable reading host configs
Removed code that reads /etc/mtools.conf, /etc/default/mtools.conf, /etc/mtools and /etc/default/mtools to ensure that mtools output doesn't depend on the global host configs. It's still possible to use ~/.mtoolsrc config or point MTOOLSRC environment variable to any configuration file if user want to configure mtools. (From OE-Core rev: 868cb638c92f650a2f0bea9669b68c1e8aebabab) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch23
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.18.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
new file mode 100644
index 0000000000..0688d6e4f1
--- /dev/null
+++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
@@ -0,0 +1,23 @@
1Disabled reading host configs.
2
3Upstream-Status: Pending
4
5Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
6
7--- mtools-4.0.18/config.c.orig 2017-06-13 12:27:38.644000000 +0300
8+++ mtools-4.0.18/config.c 2017-06-13 12:28:47.576000000 +0300
9@@ -701,14 +701,6 @@
10 memcpy(devices, const_devices,
11 nr_const_devices*sizeof(struct device));
12
13- (void) ((parse(CONF_FILE,1) |
14- parse(LOCAL_CONF_FILE,1) |
15- parse(SYS_CONF_FILE,1)) ||
16- (parse(OLD_CONF_FILE,1) |
17- parse(OLD_LOCAL_CONF_FILE,1)));
18- /* the old-name configuration files only get executed if none of the
19- * new-name config files were used */
20-
21 homedir = get_homedir();
22 if ( homedir ){
23 strncpy(conf_file, homedir, MAXPATHLEN );
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index b0efc9ecfe..5d84001a52 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
@@ -33,6 +33,7 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
33 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ 33 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
34 " 34 "
35 35
36SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch"
36 37
37inherit autotools texinfo 38inherit autotools texinfo
38 39