]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
build: propagate errors when generating apk indexes
authorMatt Merhar <mattmerhar@protonmail.com>
Wed, 11 Feb 2026 19:33:15 +0000 (14:33 -0500)
committerRobert Marko <robimarko@gmail.com>
Fri, 13 Feb 2026 20:18:30 +0000 (21:18 +0100)
The build would continue even if the some of the intermediate commands
failed, as long as the last command in the final iteration of the loop
was successful.

Add 'set -e' to the subshell so that we immediately exit. Previously,
only the exit status of the final make-index-json.py mattered.

Fixes: https://github.com/openwrt/openwrt/issues/21981
Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
Link: https://github.com/openwrt/openwrt/pull/21993
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit fcb07b00ec22b90fc0cd790701982018ee345366)

package/Makefile

index 097ee17151ba8455baacdbad3bf4aaf6af63f5b6..bcf0a21bb4a46c4165585f3e416531dd8b601e03 100644 (file)
@@ -129,6 +129,7 @@ $(curdir)/index: FORCE
        @echo Generating package index...
 ifneq ($(CONFIG_USE_APK),)
        @for d in $(PACKAGE_SUBDIRS); do \
+               set -e; \
                mkdir -p $$d; \
                cd $$d || continue; \
                ls *.apk >/dev/null 2>&1 || continue; \