diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-09-07 23:50:36 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2022-12-04 17:18:37 +0100 |
| commit | 12b1d2f700188e7f6fbb9761510c83e36079ddc6 (patch) | |
| tree | 9e45a82a1765fea93dd3c0f90beb202c992dbb26 | |
| parent | 006e52545d1421affba9c993c70996e0f9f6e596 (diff) | |
| download | openwrt-12b1d2f700188e7f6fbb9761510c83e36079ddc6.tar.gz openwrt-12b1d2f700188e7f6fbb9761510c83e36079ddc6.tar.bz2 openwrt-12b1d2f700188e7f6fbb9761510c83e36079ddc6.zip | |
build: handle directory with whitespace in AUTOREMOVE clean
Package with whitespace in their build directory are not correctly
removed when CONFIG_AUTOREMOVE is enabled. This is caused by xargs that
use whitespace as delimiters. To handle this use \0 as the delimiter and
set find to use \0 as the delimiter.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit dccee21792b89031bcd801030de403f195d80278)
| -rw-r--r-- | include/host-build.mk | 4 | ||||
| -rw-r--r-- | include/package.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 36b3fed1f3..c3e0c26e6a 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -197,8 +197,8 @@ ifndef DUMP ifneq ($(CONFIG_AUTOREMOVE),) host-compile: - $(FIND) $(HOST_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' | \ - $(XARGS) rm -rf + $(FIND) $(HOST_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -print0 | \ + $(XARGS) -0 rm -rf endif endef endif diff --git a/include/package.mk b/include/package.mk index 389ba4243b..225fdfc771 100644 --- a/include/package.mk +++ b/include/package.mk @@ -258,8 +258,8 @@ define Build/CoreTargets ifneq ($(CONFIG_AUTOREMOVE),) compile: -touch -r $(PKG_BUILD_DIR)/.built $(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null - $(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' | \ - $(XARGS) rm -rf + $(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' -print0 | \ + $(XARGS) -0 rm -rf endif endef |