aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-08-07 11:13:01 -1000
committerDaniel Golle <daniel@makrotopia.org>2020-08-31 11:15:17 +0100
commit7d26f294cd0b2bd4ea3475e55e6c68cf0ede46ac (patch)
tree5124b05cc58474ff5345295cff51112748d4dc60
parent353ce2e521f57318c502c862457dc859d8d181a6 (diff)
downloadupstream-7d26f294cd0b2bd4ea3475e55e6c68cf0ede46ac.tar.gz
upstream-7d26f294cd0b2bd4ea3475e55e6c68cf0ede46ac.tar.bz2
upstream-7d26f294cd0b2bd4ea3475e55e6c68cf0ede46ac.zip
busybox: Use PKG_FILE_MODES for SUID
Instead of using INSTALL_SUID use the more flexible PKG_FILE_MODES variable withn the Makefile to set the SUID bit. Signed-off-by: Paul Spooren <mail@aparcar.org>
-rw-r--r--package/utils/busybox/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 0b56e0b9fd..b2de0a852b 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.31.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -28,6 +28,10 @@ PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
PKG_CPE_ID:=cpe:/a:busybox:busybox
+ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SUID),)
+ PKG_FILE_MODES:=/bin/busybox:root:root:4755
+endif
+
include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)
@@ -141,9 +145,6 @@ ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),)
$(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
$(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
endif
-ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SUID),)
- $(INSTALL_SUID) $(PKG_INSTALL_DIR)/bin/busybox $(1)/bin/busybox
-endif
-rm -rf $(1)/lib64
endef