Skip to content

Commit

Permalink
buildbot: use the new falter build script
Browse files Browse the repository at this point in the history
  • Loading branch information
pktpls committed Jun 10, 2024
1 parent 75f722f commit ecf5946
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions roles/buildbot/files/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ def targetsFactory(f, wwwPrefix):
# TODO: doesn't fail if targets-*.txt doesn't exist
"""\
targets=$(\
cat .buildconf/targets-%(prop:falterBranch)s.txt \
cat build/targets-%(prop:falterBranch)s.txt \
| grep -v "#" | grep . \
| cut -d" " -f2- \
| xargs -n1 echo | sort \
) ; \
for t in $targets; do \
if ! cat .buildconf/broken-%(prop:falterBranch)s.txt | grep -F "$t" >/dev/null ; \
if ! cat build/broken-%(prop:falterBranch)s.txt | grep -F "$t" >/dev/null ; \
then \
echo "$t" ; \
fi ; \
Expand Down Expand Up @@ -353,9 +353,11 @@ def targetsTargetFactory(f, wwwPrefix, wwwURL, alpineVersion):
&& git checkout %(prop:got_revision)s \
&& git submodule init \
&& git submodule update \
&& ./build_falter -p all -v %(prop:falterVersion)s -t %(prop:target)s \
&& env FALTER_VARIANT=tunneldigger build/build.sh %(prop:falterVersion)s %(prop:target)s \
&& env FALTER_VARIANT=notunnel build/build.sh %(prop:falterVersion)s %(prop:target)s \
&& env FALTER_VARIANT=backbone build/build.sh %(prop:falterVersion)s %(prop:target)s \
) >&2 \
&& cd /root/falter-builter/firmwares \
&& cd /root/falter-builter/out/%(prop:falterVersion)s \
&& tar -c *' > out.tar \
""",
alpineVersion=alpineVersion,
Expand Down

0 comments on commit ecf5946

Please sign in to comment.