aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Storchak <m.storchak@gmail.com>2020-12-24 00:58:01 +0200
committerPaul Spooren <mail@aparcar.org>2020-12-29 12:19:39 -1000
commitf17c30098356778f212f73b8ea0c2e238907b580 (patch)
treef30c3b55ce3713fdcd77c31bb6915bf0c6e41127
parent7e4585e59362b581cedcbd852036789f713ae236 (diff)
downloadupstream-f17c30098356778f212f73b8ea0c2e238907b580.tar.gz
upstream-f17c30098356778f212f73b8ea0c2e238907b580.tar.bz2
upstream-f17c30098356778f212f73b8ea0c2e238907b580.zip
busybox: define BUSYBOX_SYM before the first use
Since PKG_FILE_MODES relies on BUSYBOX_SYM, it should be defined early enough Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
-rw-r--r--package/utils/busybox/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 38ef4d33bd..e62cef0713 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:=7
+PKG_RELEASE:=8
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -28,6 +28,9 @@ PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
PKG_CPE_ID:=cpe:/a:busybox:busybox
+BUSYBOX_SYM=$(if $(CONFIG_BUSYBOX_CUSTOM),CONFIG,DEFAULT)
+BUSYBOX_IF_ENABLED=$(if $(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_$(1)),$(2))
+
ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SUID),)
PKG_FILE_MODES:=/bin/busybox:root:root:4755
endif
@@ -38,9 +41,6 @@ ifeq ($(DUMP),)
STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | mkhash md5)
endif
-BUSYBOX_SYM=$(if $(CONFIG_BUSYBOX_CUSTOM),CONFIG,DEFAULT)
-BUSYBOX_IF_ENABLED=$(if $(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_$(1)),$(2))
-
# All files provided by busybox will serve as fallback alternatives by opkg.
# There should be no need to enumerate ALTERNATIVES entries here
define Package/busybox/Default