[Buildroot] [PATCH 1/7] core/pkg-kconfig: don't enforce check for config file when not building

[Buildroot] [PATCH 1/7] core/pkg-kconfig: don't enforce check for config file when not building

[Yann E. MORIN]

Currently, this is triggering the error message:
    make randconfig
    make source

Only limit the check to enforce a config file being set to when we are
actually building, like is done in the various kconfig-using packages.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/pkg-kconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index c86c340..41c6fd5 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -90,7 +90,7 @@ $$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done
 ifeq ($$($$($(2)_KCONFIG_VAR)),y)
 
 # FOO_KCONFIG_FILE is required
-ifeq ($$($(2)_KCONFIG_FILE),)
+ifeq ($(BR_BUILDING)$$($(2)_KCONFIG_FILE),y)
 $$(error Internal error: no value specified for $(2)_KCONFIG_FILE)
 endif
 
-- 
1.9.1

[Buildroot] [PATCH 2/7] package/linux: don't enforce check for DTS when not building

[Yann E. MORIN]

Currently, this is triggering the error message:
    make randconfig
    make source

Limit the checks that enforce a DTS is set and at most one DTB is
appended to when we are actually building, like is done for the
configuration-file variables.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 linux/linux.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index eca1450..b2c9481 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -88,12 +88,12 @@ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
 KERNEL_DTS_NAME = $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
+ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),yy)
 $(error No kernel device tree source specified, check your \
 BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
+ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_APPENDED_DTB),yy)
 ifneq ($(words $(KERNEL_DTS_NAME)),1)
 $(error Kernel with appended device tree needs exactly one DTS source. \
 	Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
-- 
1.9.1

[Buildroot] [PATCH 0/7] core/kconfig: fix display of custom error messages (branch yem/misc)

[Yann E. MORIN]

Hello All!

This series fixes the display of our custom error messages when
defconfig/.config files do not exist, and also adds such messages to
busybox and uClibc.

Regards,
Yann E. MORIN.


The following changes since commit 22ed697d11e033914cab7631fba899ba436a5a5b:

  packages: do not use TAR_STRIP_COMPONENTS, but directly --strip-components (2015-07-12 13:51:59 +0200)

are available in the git repository at:

  git://git.busybox.net/~ymorin/git/buildroot yem/misc

for you to fetch changes up to 62fed5cb399404addb30c60c3dc128f46333c9ec:

  package/uclibc: check for config file before calling kconfig-package (2015-07-12 14:02:05 +0200)

----------------------------------------------------------------
Yann E. MORIN (7):
      core/pkg-kconfig: don't enforce check for config file when not building
      package/linux: don't enforce check for DTS when not building
      boot/at91boostrap3: check for config file before calling kconfig-package
      boot/barebox: check for config file before calling kconfig-package
      package/linux: check for config file before calling kconfig-package
      package/busybox: check for config file before calling kconfig-package
      package/uclibc: check for config file before calling kconfig-package

 boot/at91bootstrap3/at91bootstrap3.mk |  7 +++++--
 boot/barebox/barebox.mk               |  6 ++++--
 linux/linux.mk                        | 38 ++++++++++++++++++-----------------
 package/busybox/busybox.mk            |  6 ++++++
 package/pkg-kconfig.mk                |  2 +-
 package/uclibc/uclibc.mk              |  6 ++++++
 6 files changed, 42 insertions(+), 23 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/7] boot/at91boostrap3: check for config file before calling kconfig-package

[Yann E. MORIN]

If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 boot/at91bootstrap3/at91bootstrap3.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
index 1c68094..fa67ea6 100644
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -49,10 +49,11 @@ endif
 AT91BOOTSTRAP3_KCONFIG_FILE = $(AT91BOOTSTRAP3_SOURCE_CONFIG)
 AT91BOOTSTRAP3_KCONFIG_EDITORS = menuconfig xconfig gconfig
 AT91BOOTSTRAP3_KCONFIG_OPTS = $(AT91BOOTSTRAP3_MAKE_OPTS)
-$(eval $(kconfig-package))
 
 # Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
 ifeq ($(BR_BUILDING),y)
+
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y)
 ifeq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG)),)
 $(error No at91bootstrap3 defconfig name specified, check your BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG setting)
@@ -74,4 +75,6 @@ $(error No custom at91bootstrap3 repository version specified. Check your BR2_TA
 endif
 endif
 
-endif
+endif # BR_BUILDING
+
+$(eval $(kconfig-package))
-- 
1.9.1

[Buildroot] [PATCH 4/7] boot/barebox: check for config file before calling kconfig-package

[Yann E. MORIN]

If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 boot/barebox/barebox.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7e53037..e45976d 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -109,10 +109,12 @@ define BAREBOX_INSTALL_TARGET_CMDS
 endef
 endif
 
-$(eval $(kconfig-package))
-
+# Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
 ifeq ($(BR2_TARGET_BAREBOX)$(BR_BUILDING),yy)
 ifeq ($(BAREBOX_SOURCE_CONFIG),)
 $(error No Barebox config file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)
 endif
 endif
+
+$(eval $(kconfig-package))
-- 
1.9.1

[Buildroot] [PATCH 5/7] package/linux: check for config file before calling kconfig-package

[Yann E. MORIN]

If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 linux/linux.mk | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index b2c9481..e9866b8 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -342,6 +342,24 @@ LINUX_PRE_PATCH_HOOKS += $(foreach ext,$(LINUX_EXTENSIONS),\
 	$(if $(BR2_LINUX_KERNEL_EXT_$(call UPPERCASE,$(ext))),\
 		$(call UPPERCASE,$(ext))_PREPARE_KERNEL))
 
+# Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
+ifeq ($(BR_BUILDING),y)
+
+ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
+ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)
+$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)
+endif
+endif
+
+ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)
+$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)
+endif
+endif
+
+endif # BR_BUILDIING
+
 $(eval $(kconfig-package))
 
 # Support for rebuilding the kernel after the cpio archive has
@@ -360,19 +378,3 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
 # The initramfs building code must make sure this target gets called
 # after it generated the initramfs list of files.
 linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
-
-# Checks to give errors that the user can understand
-ifeq ($(BR_BUILDING),y)
-ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
-ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)
-$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)
-endif
-endif
-
-ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
-ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)
-$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)
-endif
-endif
-
-endif
-- 
1.9.1

[Buildroot] [PATCH 6/7] package/busybox: check for config file before calling kconfig-package

[Yann E. MORIN]

If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 92874cd..6b57fd7 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -207,4 +207,10 @@ define BUSYBOX_INSTALL_INIT_SYSV
 	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef
 
+# Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
+ifeq ($(BR_BUILDING)$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)),y)
+$(error No BusyBox configuration file specified, check your BR2_PACKAGE_BUSYBOX_CONFIG setting)
+endif
+
 $(eval $(kconfig-package))
-- 
1.9.1

[Buildroot] [PATCH 7/7] package/uclibc: check for config file before calling kconfig-package

[Yann E. MORIN]

If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/uclibc/uclibc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index ecbfa11..7dee6b3 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -474,4 +474,10 @@ define UCLIBC_INSTALL_STAGING_CMDS
 	$(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
+# Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
+ifeq ($(BR_BUILDING)$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)),y)
+$(error No uClibc configuration file specified, check your BR2_UCLIBC_CONFIG setting)
+endif
+
 $(eval $(kconfig-package))
-- 
1.9.1

[Buildroot] [PATCH 2/7] package/linux: don't enforce check for DTS when not building

[Baruch Siach]

Hi Yann,

On Sun, Jul 12, 2015 at 02:11:24PM +0200, Yann E. MORIN wrote:
> Currently, this is triggering the error message:
>     make randconfig
>     make source
> 
> Limit the checks that enforce a DTS is set and at most one DTB is
> appended to when we are actually building, like is done for the
> configuration-file variables.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

[snip]

> -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
> +ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),yy)

yy means that exactly two of these must be 'y'. Is that intended?

baruch


-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 7/7] package/uclibc: check for config file before calling kconfig-package

[Baruch Siach]

Hi Yann,

On Sun, Jul 12, 2015 at 02:11:29PM +0200, Yann E. MORIN wrote:
> If we check that the user provides a config file after we call to the
> kconfig-package infra, the error message we get is the one for the
> kconfig-package infra, not the custom error message we want to show to
> the user.
> 
> So, only call kconfig-package after we do the check.

The commit log doesn't match the patch. There was no error message before this 
patch, AFAICS.

baruch

> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  package/uclibc/uclibc.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
> index ecbfa11..7dee6b3 100644
> --- a/package/uclibc/uclibc.mk
> +++ b/package/uclibc/uclibc.mk
> @@ -474,4 +474,10 @@ define UCLIBC_INSTALL_STAGING_CMDS
>  	$(UCLIBC_INSTALL_UTILS_STAGING)
>  endef
>  
> +# Checks to give errors that the user can understand
> +# Must be before we call to kconfig-package
> +ifeq ($(BR_BUILDING)$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)),y)
> +$(error No uClibc configuration file specified, check your BR2_UCLIBC_CONFIG setting)
> +endif
> +
>  $(eval $(kconfig-package))

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 2/7] package/linux: don't enforce check for DTS when not building

[Arnout Vandecappelle]

On 07/12/15 22:03, Baruch Siach wrote:
> Hi Yann,
> 
> On Sun, Jul 12, 2015 at 02:11:24PM +0200, Yann E. MORIN wrote:
>> Currently, this is triggering the error message:
>>     make randconfig
>>     make source
>>
>> Limit the checks that enforce a DTS is set and at most one DTB is
>> appended to when we are actually building, like is done for the
>> configuration-file variables.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> [snip]
> 
>> -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
>> +ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),yy)
> 
> yy means that exactly two of these must be 'y'. Is that intended?

 Yes it is, because KERNEL_DTS_NAME is a string, not a boolean, so it
essentially checks that it is empty and DTS_SUPPORT is selected. But admittedly
it's not very transparent, it would make sense to add delimiters in-between at
least.

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 2/7] package/linux: don't enforce check for DTS when not building

[Baruch Siach]

Hi Arnout,

On Mon, Jul 13, 2015 at 01:44:31AM +0200, Arnout Vandecappelle wrote:
> On 07/12/15 22:03, Baruch Siach wrote:
> > On Sun, Jul 12, 2015 at 02:11:24PM +0200, Yann E. MORIN wrote:
> >> Currently, this is triggering the error message:
> >>     make randconfig
> >>     make source
> >>
> >> Limit the checks that enforce a DTS is set and at most one DTB is
> >> appended to when we are actually building, like is done for the
> >> configuration-file variables.
> >>
> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > 
> > [snip]
> > 
> >> -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
> >> +ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),yy)
> > 
> > yy means that exactly two of these must be 'y'. Is that intended?
> 
>  Yes it is, because KERNEL_DTS_NAME is a string, not a boolean, so it
> essentially checks that it is empty and DTS_SUPPORT is selected. But admittedly
> it's not very transparent, it would make sense to add delimiters in-between at
> least.

Thanks for the explanation. A comment would be helpful here, I guess.

Shouldn't we protect the code against someone naming a DTS just 'y'?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 2/7] package/linux: don't enforce check for DTS when not building

[Yann E. MORIN]

Baruch, All,

On 2015-07-13 06:37 +0300, Baruch Siach spake thusly:
> On Mon, Jul 13, 2015 at 01:44:31AM +0200, Arnout Vandecappelle wrote:
> > On 07/12/15 22:03, Baruch Siach wrote:
> > > On Sun, Jul 12, 2015 at 02:11:24PM +0200, Yann E. MORIN wrote:
> > >> Currently, this is triggering the error message:
> > >>     make randconfig
> > >>     make source
> > >>
> > >> Limit the checks that enforce a DTS is set and at most one DTB is
> > >> appended to when we are actually building, like is done for the
> > >> configuration-file variables.
> > >>
> > >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > > 
> > > [snip]
> > > 
> > >> -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
> > >> +ifeq ($(BR_BUILDING)$(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),yy)
> > > 
> > > yy means that exactly two of these must be 'y'. Is that intended?
> > 
> >  Yes it is, because KERNEL_DTS_NAME is a string, not a boolean, so it
> > essentially checks that it is empty and DTS_SUPPORT is selected. But admittedly
> > it's not very transparent, it would make sense to add delimiters in-between at
> > least.
> 
> Thanks for the explanation. A comment would be helpful here, I guess.
> 
> Shouldn't we protect the code against someone naming a DTS just 'y'?

Yeah, we already discussed that with Thomas (live, we're in the same
place for a few days), and we've come to the conclusion that this
construct is indeed too tricky, and that we need a simpler code.

Your comments are now confirming this. ;-)

I'll rework the series shortly.

Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'