diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-08-21 18:09:36 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-01 12:27:02 +0200 |
commit | 723f01dafa2fe577e823711ebaa4656224a4fffa (patch) | |
tree | 54fa2541cc5077dfa87b2e4b2616516cbbd6648c /package/config/patches | |
parent | 8b6585a9d3adf35179c988a10edd16ffc2c15346 (diff) |
Remove unnecessary ugly hacks in package/config
Those hacks should not be needed and they even make "mconf" fail to
save the configuration file in $(CONFIG_DIR).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/config/patches')
-rw-r--r-- | package/config/patches/13-use-conf-write-autoconf.patch | 53 | ||||
-rw-r--r-- | package/config/patches/series | 1 |
2 files changed, 0 insertions, 54 deletions
diff --git a/package/config/patches/13-use-conf-write-autoconf.patch b/package/config/patches/13-use-conf-write-autoconf.patch deleted file mode 100644 index 8297dd952..000000000 --- a/package/config/patches/13-use-conf-write-autoconf.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- - conf.c | 4 ++++ - mconf.c | 2 +- - qconf.cc | 2 ++ - 3 files changed, 7 insertions(+), 1 deletion(-) - -Index: config.new/conf.c -=================================================================== ---- config.new.orig/conf.c -+++ config.new/conf.c -@@ -641,6 +641,10 @@ - fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n")); - exit(1); - } -+ if (conf_write_autoconf()) { -+ fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n")); -+ return 1; -+ } - } - return 0; - } -Index: config.new/mconf.c -=================================================================== ---- config.new.orig/mconf.c -+++ config.new/mconf.c -@@ -862,6 +862,6 @@ - "\n\n")); - } - -- return 0; -+ return conf_write_autoconf(); - } - -Index: config.new/qconf.cc -=================================================================== ---- config.new.orig/qconf.cc -+++ config.new/qconf.cc -@@ -1612,6 +1612,7 @@ - { - if (!conf_get_changed()) { - e->accept(); -+ conf_write_autoconf(); - return; - } - QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning, -@@ -1622,6 +1623,7 @@ - switch (mb.exec()) { - case QMessageBox::Yes: - conf_write(NULL); -+ conf_write_autoconf(); - case QMessageBox::No: - e->accept(); - break; diff --git a/package/config/patches/series b/package/config/patches/series index 997befd35..defdf5899 100644 --- a/package/config/patches/series +++ b/package/config/patches/series @@ -8,5 +8,4 @@ 10-br-build-system.patch 11-use-mktemp-for-lxdialog.patch 12-fix-glade-file-path.patch -13-use-conf-write-autoconf.patch 14-support-out-of-tree-config.patch |