diff options
-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 |