Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
BUSYBOX_VERSION = 1.27.2
|
||||
BUSYBOX_SITE = http://www.busybox.net/downloads
|
||||
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
|
||||
BUSYBOX_LICENSE = GPLv2
|
||||
BUSYBOX_LICENSE = GPL-2.0
|
||||
BUSYBOX_LICENSE_FILES = LICENSE
|
||||
|
||||
define BUSYBOX_HELP_CMDS
|
||||
@@ -52,7 +52,7 @@ BUSYBOX_MAKE_OPTS = \
|
||||
SKIP_STRIP=y
|
||||
|
||||
ifndef BUSYBOX_CONFIG_FILE
|
||||
BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
|
||||
BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
|
||||
endif
|
||||
|
||||
BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
|
||||
@@ -60,9 +60,32 @@ BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAG
|
||||
BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
|
||||
BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y)
|
||||
define BUSYBOX_PERMISSIONS
|
||||
# Set permissions on all applets with BB_SUID_REQUIRE and BB_SUID_MAYBE.
|
||||
# 12 Applets are pulled from applets.h using grep command :
|
||||
# grep -r -e "APPLET.*BB_SUID_REQUIRE\|APPLET.*BB_SUID_MAYBE" \
|
||||
# $(@D)/include/applets.h
|
||||
# These applets are added to the device table and the makedev file
|
||||
# ignores the files with type 'F' ( optional files).
|
||||
/usr/bin/wall F 4755 0 0 - - - - -
|
||||
/bin/ping F 4755 0 0 - - - - -
|
||||
/bin/ping6 F 4755 0 0 - - - - -
|
||||
/usr/bin/crontab F 4755 0 0 - - - - -
|
||||
/sbin/findfs F 4755 0 0 - - - - -
|
||||
/bin/login F 4755 0 0 - - - - -
|
||||
/bin/mount F 4755 0 0 - - - - -
|
||||
/usr/bin/passwd F 4755 0 0 - - - - -
|
||||
/bin/su F 4755 0 0 - - - - -
|
||||
/usr/bin/traceroute F 4755 0 0 - - - - -
|
||||
/usr/bin/traceroute6 F 4755 0 0 - - - - -
|
||||
/usr/bin/vlock F 4755 0 0 - - - - -
|
||||
endef
|
||||
else
|
||||
define BUSYBOX_PERMISSIONS
|
||||
/bin/busybox f 4755 0 0 - - - - -
|
||||
endef
|
||||
endif
|
||||
|
||||
# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
|
||||
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
|
||||
@@ -158,10 +181,22 @@ define BUSYBOX_INSTALL_UDHCPC_SCRIPT
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_INIT_BUSYBOX),y)
|
||||
|
||||
define BUSYBOX_SET_INIT
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
|
||||
define BUSYBOX_SET_GETTY
|
||||
$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SYSTEM_GETTY_PORT)::respawn:/sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) #~' \
|
||||
$(TARGET_DIR)/etc/inittab
|
||||
endef
|
||||
BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY
|
||||
endif # BR2_TARGET_GENERIC_GETTY
|
||||
|
||||
BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
|
||||
|
||||
endif # BR2_INIT_BUSYBOX
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y)
|
||||
BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol
|
||||
@@ -171,6 +206,17 @@ define BUSYBOX_SET_SELINUX
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y)
|
||||
define BUSYBOX_SET_INDIVIDUAL_BINARIES
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG))
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(BUSYBOX_BUILD_CONFIG))
|
||||
endef
|
||||
|
||||
define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES
|
||||
rm -f $(TARGET_DIR)/bin/busybox
|
||||
endef
|
||||
endif
|
||||
|
||||
define BUSYBOX_INSTALL_LOGGING_SCRIPT
|
||||
if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
|
||||
$(INSTALL) -m 0755 -D package/busybox/S01logging \
|
||||
@@ -202,6 +248,10 @@ define BUSYBOX_LINUX_PAM
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG))
|
||||
endef
|
||||
BUSYBOX_DEPENDENCIES += linux-pam
|
||||
else
|
||||
define BUSYBOX_LINUX_PAM
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG))
|
||||
endef
|
||||
endif
|
||||
|
||||
# Telnet support
|
||||
@@ -228,6 +278,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
|
||||
$(BUSYBOX_SET_INIT)
|
||||
$(BUSYBOX_SET_WATCHDOG)
|
||||
$(BUSYBOX_SET_SELINUX)
|
||||
$(BUSYBOX_SET_INDIVIDUAL_BINARIES)
|
||||
$(BUSYBOX_MUSL_TWEAKS)
|
||||
endef
|
||||
|
||||
@@ -251,6 +302,7 @@ define BUSYBOX_INSTALL_INIT_SYSV
|
||||
$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
|
||||
$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
|
||||
$(BUSYBOX_INSTALL_TELNET_SCRIPT)
|
||||
$(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES)
|
||||
endef
|
||||
|
||||
# Checks to give errors that the user can understand
|
||||
|
||||
Reference in New Issue
Block a user