KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

imagebuilder: clean package_list

Browse source 
commit 19ac879954 (imagebuilder: add package_list function) introduced
a new function 'package_list' to the imagebuilder Makefile.
Unfortunately the package list was poluted by stdout noise of the
Makefile itself as well as opkg. Redirect those outputs to stderr to
make sure that the package_list returned doesn't contain progress
info output but really only packages.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2017-06-17 00:54:46 +02:00
parent 76b62e6022
commit 1b555e1d2b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/imagebuilder/files/Makefile
View file

@ -78,7 +78,7 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \
) )
.profiles.mk: .targetinfo .profiles.mk: .targetinfo
$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@ @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@
staging_dir/host/.prereq-build: include/prereq-build.mk staging_dir/host/.prereq-build: include/prereq-build.mk
mkdir -p tmp mkdir -p tmp
@ -121,21 +121,21 @@ endif
$(MAKE) -s checksum $(MAKE) -s checksum
package_index: FORCE package_index: FORCE
@echo @echo >&2
@echo Building package index... @echo Building package index... >&2
@mkdir -p $(TMP_DIR) $(TARGET_DIR)/tmp @mkdir -p $(TMP_DIR) $(TARGET_DIR)/tmp
(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
gzip -9nc Packages > Packages.gz \ gzip -9nc Packages > Packages.gz \
) >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null
$(OPKG) update || true $(OPKG) update >&2 || true
package_reload: package_reload:
if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \ if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \
echo "Package list missing or not up-to-date, generating it.";\ echo "Package list missing or not up-to-date, generating it." >&2 ;\
$(MAKE) package_index; \ $(MAKE) package_index; \
else \ else \
mkdir -p $(TARGET_DIR)/tmp; \ mkdir -p $(TARGET_DIR)/tmp; \
$(OPKG) update || true; \ $(OPKG) update >&2 || true; \
fi fi
package_list: FORCE package_list: FORCE