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:
@@ -1,25 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
coreutils: fix for dummy-man usage
|
||||
|
||||
The options should be before the final argument, otherwise, the following error
|
||||
would appear when compiling.
|
||||
|
||||
"dummy-man: too many non-option arguments"
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
[Gustavo: update for 8.24]
|
||||
|
||||
diff -Nura coreutils-8.24.orig/man/local.mk coreutils-8.24/man/local.mk
|
||||
--- coreutils-8.24.orig/man/local.mk 2015-07-04 11:23:47.190503631 -0300
|
||||
+++ coreutils-8.24/man/local.mk 2015-07-04 11:24:25.046741090 -0300
|
||||
@@ -186,8 +186,8 @@
|
||||
&& $(run_help2man) \
|
||||
--source='$(PACKAGE_STRING)' \
|
||||
--include=$(srcdir)/man/$$name.x \
|
||||
- --output=$$t/$$name.1 \
|
||||
--info-page='\(aq(coreutils) '$$name' invocation\(aq' \
|
||||
+ --output=$$t/$$name.1 \
|
||||
$$t/$$argv$(EXEEXT) \
|
||||
&& sed \
|
||||
-e 's|$*\.td/||g' \
|
||||
@@ -0,0 +1,64 @@
|
||||
From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 11 Mar 2019 16:40:29 -0700
|
||||
Subject: [PATCH] strtod: fix clash with strtold
|
||||
|
||||
Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817).
|
||||
* lib/strtod.c (compute_minus_zero, minus_zero):
|
||||
Simplify by remving the macro / external variable,
|
||||
and having just a function. User changed. This avoids
|
||||
the need for an external variable that might clash.
|
||||
|
||||
Upstream-Status: Backport [rhel5]
|
||||
|
||||
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
|
||||
|
||||
Downloaded from
|
||||
http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
|
||||
|
||||
This patch was committed to gnulib:
|
||||
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4
|
||||
and will be included in the next release of coreutils.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
ChangeLog | 9 +++++++++
|
||||
lib/strtod.c | 11 +++++------
|
||||
2 files changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/lib/strtod.c b/lib/strtod.c
|
||||
index b9eaa51b4..69b1564e1 100644
|
||||
--- a/lib/strtod.c
|
||||
+++ b/lib/strtod.c
|
||||
@@ -294,16 +294,15 @@ parse_number (const char *nptr,
|
||||
ICC 10.0 has a bug when optimizing the expression -zero.
|
||||
The expression -MIN * MIN does not work when cross-compiling
|
||||
to PowerPC on Mac OS X 10.5. */
|
||||
-#if defined __hpux || defined __sgi || defined __ICC
|
||||
static DOUBLE
|
||||
-compute_minus_zero (void)
|
||||
+minus_zero (void)
|
||||
{
|
||||
+#if defined __hpux || defined __sgi || defined __ICC
|
||||
return -MIN * MIN;
|
||||
-}
|
||||
-# define minus_zero compute_minus_zero ()
|
||||
#else
|
||||
-DOUBLE minus_zero = -0.0;
|
||||
+ return -0.0;
|
||||
#endif
|
||||
+}
|
||||
|
||||
/* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the
|
||||
character after the last one used in the number is put in *ENDPTR. */
|
||||
@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr)
|
||||
/* Special case -0.0, since at least ICC miscompiles negation. We
|
||||
can't use copysign(), as that drags in -lm on some platforms. */
|
||||
if (!num && negative)
|
||||
- return minus_zero;
|
||||
+ return minus_zero ();
|
||||
return negative ? -num : num;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -15,6 +15,24 @@ config BR2_PACKAGE_COREUTILS
|
||||
|
||||
http://www.gnu.org/software/coreutils/
|
||||
|
||||
if BR2_PACKAGE_COREUTILS
|
||||
|
||||
config BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES
|
||||
bool "Individual binaries"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
By default (i.e. with this option disabled), coreutils is
|
||||
installed as a single binary (Busybox style) called
|
||||
/usr/bin/coreutils, and all core utilities are symbolic
|
||||
links to this binary.
|
||||
|
||||
With this option enabled, each utility is a separate binary.
|
||||
|
||||
comment "coreutils individual binaries need a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
endif
|
||||
|
||||
comment "coreutils needs a toolchain w/ wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 coreutils-8.30.tar.xz
|
||||
sha256 ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd coreutils-8.31.tar.xz
|
||||
# Locally computed
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -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