mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

iop: feeds_update: Move feed-devices generation earlier

Browse source 
Move feed-devices generation earlier, before target installation to
ensure that generated files are correct earlier.

Fixes: 3472f88614 ("iop: feeds_update: Generate list of feed-devices dirs")
Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
This commit is contained in:
Andreas Gnau 2023-03-30 11:17:32 +02:00
parent 3472f88614
commit 7de9e6c348
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
iop/scripts/feeds_update.sh
View file

@ -30,6 +30,12 @@ function feeds_update {
./scripts/feeds install -f -p openwrt_core -a ./scripts/feeds install -f -p openwrt_core -a
fi 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 # targets need to be installed explicitly
for target in $(ls ./feeds/targets); do for target in $(ls ./feeds/targets); do
rm -f target/linux/$target rm -f target/linux/$target
@ -59,12 +65,6 @@ function feeds_update {
# record when we last run this script # record when we last run this script
touch tmp/.iop_bootstrap 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 # always return true
exit 0 exit 0
} }