Commit 723f01da authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8b6585a9

package/config/conf.c

+0 −4
Original line number Diff line number Diff line
@@ -640,10 +640,6 @@ int main(int ac, char **av) 
			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;

}

package/config/mconf.c

+1 −1
Original line number Diff line number Diff line
@@ -862,6 +862,6 @@ int main(int ac, char **av) 
			"\n\n"));

	}



	return conf_write_autoconf();

	return 0;

}

package/config/patches/13-use-conf-write-autoconf.patch

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
---

 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;

package/config/patches/series

+0 −1
Original line number Diff line number Diff line
@@ -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

package/config/qconf.cc

+0 −2
Original line number Diff line number Diff line
@@ -1612,7 +1612,6 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) 
{

	if (!conf_get_changed()) {

		e->accept();

		conf_write_autoconf();

		return;

	}

	QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning,
@@ -1623,7 +1622,6 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) 
	switch (mb.exec()) {

	case QMessageBox::Yes:

		conf_write(NULL);

		conf_write_autoconf();

	case QMessageBox::No:

		e->accept();

		break;