Merge pull request #22130 from oskarirauta/dockerd

dockerd: busybox compatibility
2023-09-18 11:46:17 +02:00 · 2023-09-18 11:46:17 +02:00 · aca50a5af7
parent cfe941d578 9596937de3
commit aca50a5af7
2 changed files with 2 additions and 2 deletions
--- a/utils/dockerd/Makefile
+++ b/utils/dockerd/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dockerd
 PKG_VERSION:=24.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

--- a/utils/dockerd/git-short-commit.sh
+++ b/utils/dockerd/git-short-commit.sh
@ -26,7 +26,7 @@ if [ -z "${GIT_DIR}" ]; then
 fi

 clean_up() {
-	rm --force --recursive "${GIT_DIR}"
+	rm -rf "${GIT_DIR}"
 }
 trap clean_up EXIT