From 006473f540774848299041331b187337b27e630c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 18 Jun 2020 11:58:17 +0200 Subject: templates/turris.run: fix removal of packages The removal should be on source packages but feeds script lists packages provided by that source package. This means in the end that if package provides no package or package of different name that it is not removed. This instead uses name of directory which is more correct. --- templates/turris.run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/turris.run b/templates/turris.run index f6740bb..d63fc34 100755 --- a/templates/turris.run +++ b/templates/turris.run @@ -52,9 +52,9 @@ cd openwrt echo_stage "Get personal repository feed" echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf ./scripts/feeds update personal -./scripts/feeds list -r personal | awk '{print $1}' | xargs ./scripts/feeds uninstall # Remove any package provided by personal feed +find feeds/personal -type d -exec test -f '{}/Makefile' \; -prune -printf "%P\0" | \ + xargs -0 ./scripts/feeds ./scripts/feeds uninstall # Remove any package provided by personal feed ./scripts/feeds install -p personal -d y -f -a - echo_stage "Compile packages from personal feed" find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\0' | \ xargs --null $make -- cgit v1.2.3