From 2c6616ef051fabec1047e09146fe4e4de4523d4c Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Wed, 17 May 2023 07:08:46 +0200 Subject: [PATCH] iop: genconfig: Add hack for custom-devices Add hack to consume configs from custom-devices in a separate feed custom-devices, but only in that feed and not in other feeds. There is no value in implementing a generic solution, because the whole genconfig system will be replaced with something else. Signed-off-by: Andreas Gnau --- iop/scripts/genconfig.sh | 7 ++++++- iop/scripts/genconfig_min.sh | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh index b4de11bb7..2e1207c1e 100755 --- a/iop/scripts/genconfig.sh +++ b/iop/scripts/genconfig.sh @@ -368,7 +368,12 @@ function genconfig { cat $target_config_path/$BOARDTYPE/config >> .config echo "" >> .config fi - + # hack to support custom-devices until we have deprecated this genconfig-script... + if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then + cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config + echo "" >> .config + fi + # Special handling for targets which use TARGET_DEVICES case "$target" in airoha | mediatek | brcmbca | ipq95xx | ipq53xx) diff --git a/iop/scripts/genconfig_min.sh b/iop/scripts/genconfig_min.sh index fcf5cb7a9..805cf2cab 100644 --- a/iop/scripts/genconfig_min.sh +++ b/iop/scripts/genconfig_min.sh @@ -342,6 +342,11 @@ function genconfig_min { cat $target_config_path/$BOARDTYPE/config >> .config echo "" >> .config fi + # hack to support custom-devices until we have deprecated this genconfig-script... + if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then + cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config + echo "" >> .config + fi # Special handling for targets which use TARGET_DEVICES case "$target" in