imagebuilder: clean package_list
commit19ac879954
(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> (cherry picked from commit1b555e1d2b
)
This commit is contained in:
parent
7f3f2bc03b
commit
74eeb07817
|
@ -78,7 +78,7 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \
|
|||
)
|
||||
|
||||
.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
|
||||
mkdir -p tmp
|
||||
|
@ -122,21 +122,21 @@ endif
|
|||
$(MAKE) -s checksum
|
||||
|
||||
package_index: FORCE
|
||||
@echo
|
||||
@echo Building package index...
|
||||
@echo >&2
|
||||
@echo Building package index... >&2
|
||||
@mkdir -p $(TMP_DIR) $(TARGET_DIR)/tmp
|
||||
(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
|
||||
gzip -9nc Packages > Packages.gz \
|
||||
) >/dev/null 2>/dev/null
|
||||
$(OPKG) update || true
|
||||
$(OPKG) update >&2 || true
|
||||
|
||||
package_reload:
|
||||
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; \
|
||||
else \
|
||||
mkdir -p $(TARGET_DIR)/tmp; \
|
||||
$(OPKG) update || true; \
|
||||
$(OPKG) update >&2 || true; \
|
||||
fi
|
||||
|
||||
package_list: FORCE
|
||||
|
|
Loading…
Reference in New Issue