From cdcd83f31ded1dbf6d13d16b4aafdf594b964d94 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 Jul 2015 12:13:21 +0200 Subject: [PATCH] package: fix fallout from checking kconfig config files Those checks should only be done when the package is actually enabled. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 2 +- package/uclibc/uclibc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d8c8bad318..6b2abcacbf 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -225,7 +225,7 @@ endef # Checks to give errors that the user can understand # Must be before we call to kconfig-package -ifeq ($(BR_BUILDING),y) +ifeq ($(BR2_PACKAGE_BUSYBOX)$(BR_BUILDING),yy) ifeq ($(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)),) $(error No BusyBox configuration file specified, check your BR2_PACKAGE_BUSYBOX_CONFIG setting) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 3aceae300c..9dfafad457 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -476,7 +476,7 @@ endef # Checks to give errors that the user can understand # Must be before we call to kconfig-package -ifeq ($(BR_BUILDING),y) +ifeq ($(BR2_PACKAGE_UCLIBC)$(BR_BUILDING),yy) ifeq ($(call qstrip,$(BR2_UCLIBC_CONFIG)),) $(error No uClibc configuration file specified, check your BR2_UCLIBC_CONFIG setting) endif -- 2.30.2