diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-05-29 10:31:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-05-29 10:31:45 +0000 |
| commit | 08f8c7edafc9a5357173e45803e5013f41492eca (patch) | |
| tree | 69bd903da5b0c2a82dd54e4ba4e36b686cb33cf6 | |
| parent | b8b35e19baf20e7859c8a2b165d8b8cffdd2f14e (diff) | |
| download | upstream-08f8c7edafc9a5357173e45803e5013f41492eca.tar.gz upstream-08f8c7edafc9a5357173e45803e5013f41492eca.tar.bz2 upstream-08f8c7edafc9a5357173e45803e5013f41492eca.zip | |
build: clean up stale files from a previous build when installing a package build to the staging dir
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36755 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 5 | ||||
| -rwxr-xr-x | scripts/clean-package.sh | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/include/package.mk b/include/package.mk index 99d2dd270e..a4f353be95 100644 --- a/include/package.mk +++ b/include/package.mk @@ -171,6 +171,11 @@ define Build/DefaultTargets $(foreach hook,$(Hooks/InstallDev/Post),\ $(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\ ) + if [ -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) ]; then \ + $(SCRIPT_DIR)/clean-package.sh \ + "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)" \ + "$(STAGING_DIR)"; \ + fi if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \ (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_NAME).files); \ $(call locked, \ diff --git a/scripts/clean-package.sh b/scripts/clean-package.sh new file mode 100755 index 0000000000..d1a257889d --- /dev/null +++ b/scripts/clean-package.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +[ -n "$1" -a -n "$2" ] || { + echo "Usage: $0 <file> <directory>" + exit 1 +} +[ -f "$1" -a -d "$2" ] || { + echo "File/directory not found" + exit 1 +} +cat "$1" | ( + cd "$2" + while read entry; do + [ -n "$entry" ] || break + [ -f "$entry" ] && rm -f $entry + done +) +cat "$1" | ( + cd "$2" + while read entry; do + [ -n "$entry" ] || break + [ -d "$entry" ] && rmdir "$entry" > /dev/null 2>&1 + done +) +true |