summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-23 22:59:57 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-23 22:59:57 +0000
commite593f00fc1336aa9e68e7758a48062ae186eaa01 (patch)
tree2f5378ad21b1108b70673bc63ee81cb61faa9229
parentc5cbe120d8fd042b3c10e74be8243ebd4b7bc2da (diff)
[PATCH 2/2] Send ipkg-make-index.sh output to stdout
The "Generating index for package" created by ipkg-make-index only clutter stderr and serve to push previous warnings/errors off-screen. Instead, send to stdout. Note: This would send incorrect invocation messages to stdout as well. If this is a concern, perhaps we could send them to FD 3, then send 3 to 2... Signed-off-by: Kevin Locke <klocke@digitalenginesoftware.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25678 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Makefile2
-rw-r--r--target/imagebuilder/files/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/Makefile b/package/Makefile
index 8e8c6c9a6..2180df3b3 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -89,7 +89,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
$(call mklibs)
$(curdir)/index: FORCE
- @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+ @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
gzip -9c Packages > Packages.gz \
)
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 1fa074b35..002274aca 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -112,7 +112,7 @@ package_index: FORCE
@echo
@echo Building package index...
@mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp
- (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+ (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
gzip -9c Packages > Packages.gz \
) >/dev/null 2>/dev/null
$(OPKG) update