Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -4,13 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.33
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.35
|
||||
UTIL_LINUX_VERSION_MINOR = 1
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR)
|
||||
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
|
||||
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
|
||||
|
||||
# README.licensing claims that some files are GPL-2.0 only, but this is not true.
|
||||
# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license.
|
||||
# README.licensing claims that some files are GPL-2.0 only, but this is not
|
||||
# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
|
||||
# (but we disable that option). rfkill uses an ISC-style license.
|
||||
UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill)
|
||||
UTIL_LINUX_LICENSE_FILES = README.licensing \
|
||||
Documentation/licenses/COPYING.BSD-3-Clause \
|
||||
@@ -18,11 +20,13 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \
|
||||
Documentation/licenses/COPYING.GPL-2.0-or-later \
|
||||
Documentation/licenses/COPYING.ISC \
|
||||
Documentation/licenses/COPYING.LGPL-2.1-or-later
|
||||
|
||||
UTIL_LINUX_INSTALL_STAGING = YES
|
||||
UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
UTIL_LINUX_CONF_OPTS += \
|
||||
--disable-rpath \
|
||||
--disable-makeinstall-chown
|
||||
|
||||
UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS)
|
||||
|
||||
# system depends on util-linux so we enable systemd support
|
||||
@@ -34,7 +38,10 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# We also don't want the host-python dependency
|
||||
HOST_UTIL_LINUX_CONF_OPTS = --without-python
|
||||
HOST_UTIL_LINUX_CONF_OPTS = \
|
||||
--without-systemd \
|
||||
--with-systemdsystemunitdir=no \
|
||||
--without-python
|
||||
|
||||
# Prevent the installation from attempting to move shared libraries from
|
||||
# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
|
||||
@@ -75,14 +82,14 @@ UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)"
|
||||
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
|
||||
UTIL_LINUX_DEPENDENCIES += libselinux
|
||||
UTIL_LINUX_CONF_OPTS += --with-selinux
|
||||
else
|
||||
UTIL_LINUX_CONF_OPTS += --without-selinux
|
||||
define UTIL_LINUX_SELINUX_PAMFILES_TWEAK
|
||||
$(foreach f,su su-l,
|
||||
$(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \
|
||||
$(SED) '/^.*pam_selinux.so.*$$/d' \
|
||||
$(TARGET_DIR)/etc/pam.d/$(f)
|
||||
)
|
||||
endef
|
||||
else
|
||||
UTIL_LINUX_CONF_OPTS += --without-selinux
|
||||
endif
|
||||
|
||||
# Used by cramfs utils
|
||||
@@ -91,6 +98,9 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)
|
||||
# Used by login-utils
|
||||
UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam)
|
||||
|
||||
# Used by hardlink
|
||||
UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2)
|
||||
|
||||
# Disable/Enable utilities
|
||||
UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \
|
||||
@@ -104,7 +114,8 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock --disable-hwclock-gplv3,--disable-hwclock) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
|
||||
@@ -149,6 +160,7 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user