From 7de9e6c34804fdec4fc17897968bbe1711770c43 Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Thu, 30 Mar 2023 11:17:32 +0200 Subject: [PATCH] iop: feeds_update: Move feed-devices generation earlier Move feed-devices generation earlier, before target installation to ensure that generated files are correct earlier. Fixes: 3472f88614f1 ("iop: feeds_update: Generate list of feed-devices dirs") Signed-off-by: Andreas Gnau --- iop/scripts/feeds_update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iop/scripts/feeds_update.sh b/iop/scripts/feeds_update.sh index 310738b95..ae6f02c9d 100755 --- a/iop/scripts/feeds_update.sh +++ b/iop/scripts/feeds_update.sh @@ -30,6 +30,12 @@ function feeds_update { ./scripts/feeds install -f -p openwrt_core -a fi + ( + echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update' + echo 'FEED_DEVICES_DIRS:=' + find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h' + ) > target/linux/feed-devices/feed-devices-list.mk + # targets need to be installed explicitly for target in $(ls ./feeds/targets); do rm -f target/linux/$target @@ -59,12 +65,6 @@ function feeds_update { # record when we last run this script touch tmp/.iop_bootstrap - ( - echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update' - echo 'FEED_DEVICES_DIRS:=' - find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h' - ) > target/linux/feed-devices/feed-devices-list.mk - # always return true exit 0 }