From 028a3e5509092266053aae74722584105e599640 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 7 Aug 2011 18:45:25 +0000 Subject: [PATCH] perf: do not look at ./config for configuration (Closes: #632923) svn path=/dists/trunk/linux-2.6/; revision=17890 --- debian/changelog | 3 ++ ...t-look-at-.-config-for-configuration.patch | 51 +++++++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 55 insertions(+) create mode 100644 debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch diff --git a/debian/changelog b/debian/changelog index 632283f91..0afd7db55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low * Add stable 3.0.1 including: - [SCSI] fix crash in scsi_dispatch_cmd() + [ Jonathan Nieder ] + * perf: do not look at ./config for configuration (Closes: #632923) + -- Ben Hutchings Wed, 27 Jul 2011 23:58:10 +0200 linux-2.6 (3.0.0-1) unstable; urgency=low diff --git a/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch b/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch new file mode 100644 index 000000000..1502f2480 --- /dev/null +++ b/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch @@ -0,0 +1,51 @@ +Date: Fri, 5 Aug 2011 18:58:38 +0200 +From: Jonathan Nieder +Subject: [PATCH] perf: do not look at ./config for configuration + +In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for +configuration in the file ./config, imitating git which looks at +$GIT_DIR/config. If ./config is not a perf configuration file, it +fails, or worse, treats it as a configuration file and changes +behavior in some unexpected way. + +"config" is not an unusual name for a file to be lying around and perf +does not have a private directory dedicated for its own use, so let's +just stop looking for configuration in the cwd. Callers needing +context-sensitive configuration can use the PERF_CONFIG environment +variable. + +Requested-by: Christian Ohm +Signed-off-by: Jonathan Nieder +--- + tools/perf/util/config.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c +index e02d78ca..6c86eca8 100644 +--- a/tools/perf/util/config.c ++++ b/tools/perf/util/config.c +@@ -399,7 +399,6 @@ static int perf_config_global(void) + int perf_config(config_fn_t fn, void *data) + { + int ret = 0, found = 0; +- char *repo_config = NULL; + const char *home = NULL; + + /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */ +@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data) + free(user_config); + } + +- repo_config = perf_pathdup("config"); +- if (!access(repo_config, R_OK)) { +- ret += perf_config_from_file(fn, repo_config, data); +- found += 1; +- } +- free(repo_config); + if (found == 0) + return -1; + return ret; +-- +1.7.6 + + diff --git a/debian/patches/series/2 b/debian/patches/series/2 index 1d9e95871..5c461f4bc 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1,2 +1,3 @@ - features/all/rt2x00-Add-device-ID-for-RT539F-device.patch + bugfix/all/stable/3.0.1.patch ++ bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch