From: Oskari Rauta <oskari.rauta@gmail.com>
Date: Sun, 17 Sep 2023 13:36:27 +0000 (+0300)
Subject: dockerd: busybox compatibility
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F22130%2Fhead;p=feed%2Fpackages.git

dockerd: busybox compatibility

build hosts with busybox fail with long options on rm
command. Short versions are supported by all, so this
makes it script compatible with busybox hosts as well.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
---

diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile
index fb09299036..d5b455c794 100644
--- 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
 
diff --git a/utils/dockerd/git-short-commit.sh b/utils/dockerd/git-short-commit.sh
index ea8611ba57..650ab8c82d 100755
--- 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