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,18 +4,21 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
COREUTILS_VERSION = 8.30
|
||||
COREUTILS_VERSION = 8.31
|
||||
COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
|
||||
COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
|
||||
COREUTILS_LICENSE = GPL-3.0+
|
||||
COREUTILS_LICENSE_FILES = COPYING
|
||||
|
||||
# coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build
|
||||
COREUTILS_AUTORECONF = YES
|
||||
COREUTILS_GETTEXTIZE = YES
|
||||
|
||||
COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=symlinks \
|
||||
COREUTILS_CONF_OPTS = --disable-rpath \
|
||||
$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y)
|
||||
COREUTILS_CONF_OPTS += --disable-single-binary
|
||||
else
|
||||
COREUTILS_CONF_OPTS += --enable-single-binary=symlinks
|
||||
endif
|
||||
|
||||
COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
|
||||
ac_cv_func_chown_works=yes \
|
||||
ac_cv_func_euidaccess=no \
|
||||
@@ -96,28 +99,63 @@ COREUTILS_DEPENDENCIES += openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_ROOTFS_MERGED_USR),)
|
||||
define COREUTILS_CLEANUP_BIN
|
||||
# We want to move a few binaries from /usr/bin to /bin. In the case of
|
||||
# coreutils being built as multi-call binary, we do so by re-creating
|
||||
# the corresponding symlinks. If coreutils is built with individual
|
||||
# binaries, we actually move the binaries.
|
||||
ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y)
|
||||
define COREUTILS_FIX_BIN_LOCATION
|
||||
$(foreach f,$(COREUTILS_BIN_PROGS), \
|
||||
mv $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin
|
||||
)
|
||||
endef
|
||||
else
|
||||
define COREUTILS_FIX_BIN_LOCATION
|
||||
# some things go in /bin rather than /usr/bin
|
||||
$(foreach f,$(COREUTILS_BIN_PROGS), \
|
||||
rm -f $(TARGET_DIR)/usr/bin/$(f) && \
|
||||
ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f)
|
||||
)
|
||||
endef
|
||||
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
|
||||
endif
|
||||
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_BIN_LOCATION
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
COREUTILS_CONF_OPTS += --enable-no-install-program=stdbuf
|
||||
endif
|
||||
|
||||
define COREUTILS_CLEANUP
|
||||
# link for archaic shells
|
||||
ln -fs coreutils $(TARGET_DIR)/usr/bin/[
|
||||
# gnu thinks chroot is in bin, debian thinks it's in sbin
|
||||
# link for archaic shells
|
||||
define COREUTILS_CREATE_TEST_SYMLINK
|
||||
ln -fs test $(TARGET_DIR)/usr/bin/[
|
||||
endef
|
||||
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CREATE_TEST_SYMLINK
|
||||
|
||||
# gnu thinks chroot is in bin, debian thinks it's in sbin
|
||||
ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y)
|
||||
define COREUTILS_FIX_CHROOT_LOCATION
|
||||
mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin
|
||||
endef
|
||||
else
|
||||
define COREUTILS_FIX_CHROOT_LOCATION
|
||||
rm -f $(TARGET_DIR)/usr/bin/chroot
|
||||
ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot
|
||||
endef
|
||||
endif
|
||||
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION
|
||||
|
||||
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP
|
||||
# Explicitly install ln and realpath, which we *are* insterested in.
|
||||
# A lot of other programs still get installed, however, but disabling
|
||||
# them does not gain much at build time, and is a loooong list that is
|
||||
# difficult to maintain...
|
||||
HOST_COREUTILS_CONF_OPTS = \
|
||||
--disable-acl \
|
||||
--disable-libcap \
|
||||
--disable-rpath \
|
||||
--disable-single-binary \
|
||||
--disable-xattr \
|
||||
--without-gmp \
|
||||
--enable-install-program=ln,realpath
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user