2
0
Эх сурвалжийг харах

build: propagate errors when generating apk indexes

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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21993
Signed-off-by: Robert Marko <[email protected]>
Matt Merhar 2 өдөр өмнө
parent
commit
fcb07b00ec

+ 1 - 0
package/Makefile

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