From 5d8e01e1e428a5aca3b5badf28ee48b206974247 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Thu, 5 Mar 2020 09:54:40 +0100 Subject: [PATCH] partially revert "add FLAG "GLUON_FOREIGN" ot make the frmework usablefor other types of firmwares" reenable setting of * CONFIG_TARGET_DEVICE_%s_DEVICE_%s * CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s * CONFIG_TARGET_PER_DEVICE_ROOTFS=y to fix building of initramfs. This way we also honor the devices-packages, and e.g. remove the ath9k-ct drivers in favor of ath9k. Else it causes double inclusion of drivers and results in file-conflicts. --- scripts/target_config_lib.lua | 10 ++++------ targets/generic_ffberlin | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua index 9118614e..e62f3210 100644 --- a/scripts/target_config_lib.lua +++ b/scripts/target_config_lib.lua @@ -99,12 +99,10 @@ io.stderr:write(string.format("debug: %s\n", device_pkgs)) handle_pkg(pkg) end - if env.FOREIGN_BUILD == '' then - funcs.config_message(lib.config, string.format("unable to enable device '%s'", profile), - 'CONFIG_TARGET_DEVICE_%s_DEVICE_%s=y', openwrt_config_target, profile) - lib.config('CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s="%s"', - openwrt_config_target, profile, device_pkgs) - end + funcs.config_message(lib.config, string.format("unable to enable device '%s'", profile), + 'CONFIG_TARGET_DEVICE_%s_DEVICE_%s=y', openwrt_config_target, profile) + lib.config('CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s="%s"', + openwrt_config_target, profile, device_pkgs) end diff --git a/targets/generic_ffberlin b/targets/generic_ffberlin index 0bc48a5f..c609ebf9 100644 --- a/targets/generic_ffberlin +++ b/targets/generic_ffberlin @@ -1,6 +1,7 @@ try_config 'CONFIG_TARGET_MULTI_PROFILE=y' try_config 'CONFIG_TARGET_ALL_PROFILES=y' +try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y' config 'CONFIG_DEVEL=y' config 'CONFIG_TOOLCHAINOPTS=y'