| Message ID | 1405527115-16260-1-git-send-email-luca@lucaceresoli.net |
|---|---|
| State | Accepted |
| Headers | show |
Luca, All, On 2014-07-16 18:11 +0200, Luca Ceresoli spake thusly: > The current implementation causes troubles with the autobuilders when they > set BR2_PACKAGE_EXIM_CUSTOM_CONFIG=y, because in these cases > BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is empty, and this is a configuration > error. > > Solve the problem by entirely reomving the BR2_PACKAGE_EXIM_CUSTOM_CONFIG > boolean knob. Activation of the custon configuration file is now detected by > the fact that BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is non-empty. > > Fixes: > http://autobuild.buildroot.org/results/0db/0db54c555f6c7e635ebf99f86b3f91dc31e441f0/ > > Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: bernd.kuhls@t-online.de > --- > package/exim/Config.in | 15 ++++----------- > package/exim/exim.mk | 5 +---- > 2 files changed, 5 insertions(+), 15 deletions(-) > > diff --git a/package/exim/Config.in b/package/exim/Config.in > index af54acb..9f2799d 100644 > --- a/package/exim/Config.in > +++ b/package/exim/Config.in > @@ -11,20 +11,13 @@ config BR2_PACKAGE_EXIM > > if BR2_PACKAGE_EXIM > > -config BR2_PACKAGE_EXIM_CUSTOM_CONFIG > - bool "Use a custom configuration file" > - help > - By default Buildroot generates configuration file for exim with > - reasonable settings. > - Enable this option if you want to override the configuration file > - generated by Buildroot with a customized file. Then set the path > - to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. > - > config BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE > string "Custom configuration file" > - depends on BR2_PACKAGE_EXIM_CUSTOM_CONFIG > help > - Specify a file to use as the exim configuration file. > + By default Buildroot generates configuration file for exim with ...generates _a_ configuration file... > + reasonable settings. If you want to override the configuration file > + generated by Buildroot with a customized file, set here the path > + to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. But what if the user has .include directives in his config file? Can't we just accept more than one file here, and accept wildcards, maybe? Regards, Yann E. MORIN. > This file shall comply with the syntax defined in the exim > documentation (http://www.exim.org/docs.html). > diff --git a/package/exim/exim.mk b/package/exim/exim.mk > index 2e51a0d..8be8e75 100644 > --- a/package/exim/exim.mk > +++ b/package/exim/exim.mk > @@ -57,10 +57,7 @@ define EXIM_CONFIGURE_TOOLCHAIN > $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) > endef > > -ifeq ($(BR2_PACKAGE_EXIM_CUSTOM_CONFIG),y) > -ifeq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),) > -$(error No exim configuration file specified, check your BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE setting) > -endif > +ifneq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),) > define EXIM_CONFIGURE_CMDS > $(EXIM_USE_CUSTOM_CONFIG_FILE) > $(EXIM_CONFIGURE_TOOLCHAIN) > -- > 1.9.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Dear Yann E. MORIN, On Wed, 16 Jul 2014 19:28:36 +0200, Yann E. MORIN wrote: > > + reasonable settings. If you want to override the configuration file > > + generated by Buildroot with a customized file, set here the path > > + to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. > > But what if the user has .include directives in his config file? > Can't we just accept more than one file here, and accept wildcards, > maybe? I believe you're confusing two things here: * The exim runtime configuration file, which can have .include directives and so on. * The exim compile-time configuration file, which is what this patch is about. It just contains a series of "variable = value" pairs, and is completely distinct from the exim runtime configuration file. Best regards, Thomas
Dear Luca Ceresoli, On Wed, 16 Jul 2014 18:11:55 +0200, Luca Ceresoli wrote: > The current implementation causes troubles with the autobuilders when they > set BR2_PACKAGE_EXIM_CUSTOM_CONFIG=y, because in these cases > BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is empty, and this is a configuration > error. > > Solve the problem by entirely reomving the BR2_PACKAGE_EXIM_CUSTOM_CONFIG > boolean knob. Activation of the custon configuration file is now detected by > the fact that BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is non-empty. > > Fixes: > http://autobuild.buildroot.org/results/0db/0db54c555f6c7e635ebf99f86b3f91dc31e441f0/ Thanks, applied with minor fixes to the Config.in option description. Thomas
Thomas, Luca, All, On 2014-07-16 19:37 +0200, Thomas Petazzoni spake thusly: > On Wed, 16 Jul 2014 19:28:36 +0200, Yann E. MORIN wrote: > > > > + reasonable settings. If you want to override the configuration file > > > + generated by Buildroot with a customized file, set here the path > > > + to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. > > > > But what if the user has .include directives in his config file? > > Can't we just accept more than one file here, and accept wildcards, > > maybe? > > I believe you're confusing two things here: > > * The exim runtime configuration file, which can have .include > directives and so on. > > * The exim compile-time configuration file, which is what this patch > is about. It just contains a series of "variable = value" pairs, and > is completely distinct from the exim runtime configuration file. Doh, of course. OK! Regards, Yann E. MORIN.
diff --git a/package/exim/Config.in b/package/exim/Config.in index af54acb..9f2799d 100644 --- a/package/exim/Config.in +++ b/package/exim/Config.in @@ -11,20 +11,13 @@ config BR2_PACKAGE_EXIM if BR2_PACKAGE_EXIM -config BR2_PACKAGE_EXIM_CUSTOM_CONFIG - bool "Use a custom configuration file" - help - By default Buildroot generates configuration file for exim with - reasonable settings. - Enable this option if you want to override the configuration file - generated by Buildroot with a customized file. Then set the path - to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. - config BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE string "Custom configuration file" - depends on BR2_PACKAGE_EXIM_CUSTOM_CONFIG help - Specify a file to use as the exim configuration file. + By default Buildroot generates configuration file for exim with + reasonable settings. If you want to override the configuration file + generated by Buildroot with a customized file, set here the path + to your configuration file in BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE. This file shall comply with the syntax defined in the exim documentation (http://www.exim.org/docs.html). diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 2e51a0d..8be8e75 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -57,10 +57,7 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) endef -ifeq ($(BR2_PACKAGE_EXIM_CUSTOM_CONFIG),y) -ifeq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),) -$(error No exim configuration file specified, check your BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE setting) -endif +ifneq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),) define EXIM_CONFIGURE_CMDS $(EXIM_USE_CUSTOM_CONFIG_FILE) $(EXIM_CONFIGURE_TOOLCHAIN)
The current implementation causes troubles with the autobuilders when they set BR2_PACKAGE_EXIM_CUSTOM_CONFIG=y, because in these cases BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is empty, and this is a configuration error. Solve the problem by entirely reomving the BR2_PACKAGE_EXIM_CUSTOM_CONFIG boolean knob. Activation of the custon configuration file is now detected by the fact that BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE is non-empty. Fixes: http://autobuild.buildroot.org/results/0db/0db54c555f6c7e635ebf99f86b3f91dc31e441f0/ Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: bernd.kuhls@t-online.de --- package/exim/Config.in | 15 ++++----------- package/exim/exim.mk | 5 +---- 2 files changed, 5 insertions(+), 15 deletions(-)