exim: get rid of the convert the custom config file boolean knob
PATCH 1/1 exim: get rid of the convert the custom config file boolean knob
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/
--- package/exim/Config.in | 15 ++++----------- package/exim/exim.mk | 5 +---- 2 files changed, 5 insertions(+), 15 deletions(-)
package/exim/Config.in +4 -11
@@ -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).
package/exim/exim.mk +1 -4
@@ -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)
Signature · 1 line
1.9.1
PATCH 1/1 exim: get rid of the convert the custom config file boolean knob
Luca, All,
On 2014-07-16 18:11 +0200, Luca Ceresoli spake thusly:
Quoted 33 lines
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_FILEis empty, and this is a configuration error.Solve the problem by entirely reomving the
BR2_PACKAGE_EXIM_CUSTOM_CONFIGboolean knob. Activation of the custon configuration file is now detected by the fact thatBR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILEis non-empty.Fixes:
http://autobuild.buildroot.org/results/0db/0db54c555f6c7e635ebf99f86b3f91dc31e441f0/Signed-off-by Luca Ceresoli <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc bernd.kuhls at t-online.de--- package/exim/Config.in | 15 ++++----------- package/exim/exim.mk | 5 +---- 2 files changed, 5 insertions(+), 15 deletions(-)package/exim/Config.in +0
-5@@ -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.
package/exim/Config.in config BR2_PACKAGE_EXIM · line 17
Quoted 10 lines
package/exim/Config.in +1
-6- 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...
package/exim/Config.in config BR2_PACKAGE_EXIM · line 20
Quoted 3 lines
package/exim/Config.in +3
-0+ 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.
Quoted 25 lines
package/exim/Config.in +0
-0This file shall comply with the syntax defined in the exim documentation (http://www.exim.org/docs.html).package/exim/exim.mk +1
-4@@ -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)Signature · 6 lines
1.9.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 exim: get rid of the convert the custom config file boolean knob
Dear Yann E. MORIN,
Quoted 7 lines · Yann E. MORIN
package/exim/Config.in config BR2_PACKAGE_EXIM · line 20
Quoted 3 lines
package/exim/Config.in +3
-0+ 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 exim: get rid of the convert the custom config file boolean knob
Thomas, Luca, All,
On 2014-07-16 19:37 +0200, Thomas Petazzoni spake thusly:
Quoted 10 lines · Yann E. MORIN
Quoted 8 lines
package/exim/Config.in config BR2_PACKAGE_EXIM · line 20
Quoted 4 lines
package/exim/Config.in +3
-0+ 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?
Quoted 8 lines
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.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/1 exim: get rid of the convert the custom config file boolean knob
In reply to Luca CeresoliDear Luca Ceresoli,
Quoted 11 lines · Luca Ceresoli
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_FILEis empty, and this is a configuration error.Solve the problem by entirely reomving the
BR2_PACKAGE_EXIM_CUSTOM_CONFIGboolean knob. Activation of the custon configuration file is now detected by the fact thatBR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILEis non-empty.Fixes:
http://autobuild.buildroot.org/results/0db/0db54c555f6c7e635ebf99f86b3f91dc31e441f0/
Thanks, applied with minor fixes to the Config.in option description.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com