From 9596937de38e747914663bad2a0ad0ca9b15b724 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 17 Sep 2023 16:36:27 +0300 Subject: [PATCH] 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 --- utils/dockerd/Makefile | 2 +- utils/dockerd/git-short-commit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index fb0929903..d5b455c79 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 ea8611ba5..650ab8c82 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