From: Yann E. MORIN Date: Sat, 14 Mar 2015 14:25:19 +0000 (+0100) Subject: linux: fix extensions X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53785a2c77e723c394197df68efb71d6938e1884;p=buildroot.git linux: fix extensions Since the move to the kconfig-package infra, linux extensions are broken. In our linux package, extensions are applied as pre-patch hooks. Before the kconfig-package infra, we had custom rules for the linux-*config targets, which were of the form: linux-menuconfig: linux-configure $(MAKE) -C $(LINUX_DIR) menuconfig This caused the linux tree to be fully configured before running the configurators, and thus linux dependencies were entirely fullfilled, and extensions were properly applied. Since we migrated (in dff25ea), the kconfig-package infra introduces a (hidden, internal) intermediate step 'kconfig-fixup' and decorelates the kconfig-part of the configuration from the actual package-part of the configuration: linux-configure -------> kconfig-fixup --> .config --> $(LINUX_CONFIG_FILE) / linux-menuconfig --' As thus, this (very useful!) use-case breaks (starting from a clean Buildroot tree): make menuconfig -> enable a kernel and at least one extension -> save and exit make linux-menuconfig -> extensions are not available Fix that by using the newly-introduced patch-dependencies, so that extensions are available before we try to patch the linux kernel. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- diff --git a/linux/linux-ext-fbtft.mk b/linux/linux-ext-fbtft.mk index 36f4fd22dd..6892c89a4e 100644 --- a/linux/linux-ext-fbtft.mk +++ b/linux/linux-ext-fbtft.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_LINUX_KERNEL_EXT_FBTFT),y) # Add dependency to fbtft package (download helper for the fbtft source) -LINUX_DEPENDENCIES += fbtft +LINUX_PATCH_DEPENDENCIES += fbtft # for linux >= 3.15 install to drivers/video/fbdev/fbtft # for linux < 3.15 install to drivers/video/fbtft diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk index bf998d5fdd..942b430382 100644 --- a/linux/linux-ext-rtai.mk +++ b/linux/linux-ext-rtai.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_LINUX_KERNEL_EXT_RTAI),y) # Add dependency to RTAI (user-space) which provide kernel patches -LINUX_DEPENDENCIES += rtai-patch +LINUX_PATCH_DEPENDENCIES += rtai RTAI_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_RTAI_PATCH)) diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk index 84d2c17f69..f6a5ffd47c 100644 --- a/linux/linux-ext-xenomai.mk +++ b/linux/linux-ext-xenomai.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_LINUX_KERNEL_EXT_XENOMAI),y) # Add dependency to xenomai (user-space) which provide ksrc part -LINUX_DEPENDENCIES += xenomai +LINUX_PATCH_DEPENDENCIES += xenomai # Adeos patch version XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))