Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,30 +0,0 @@
|
||||
From 02283be90292b2f57183aa930c4d69375f1d905d Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Wed, 18 Jan 2017 13:17:21 +0100
|
||||
Subject: [PATCH] build-sys: use -lm for scriptreplay if necessary
|
||||
|
||||
Reported-by: Bert van Hall <bert.vanhall@avionic-design.de>
|
||||
Addresses: https://github.com/karelzak/util-linux/pull/397
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
(cherry picked from commit feda4342df1ced25df3d200ed23469e740196c86)
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
|
||||
---
|
||||
term-utils/Makemodule.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
|
||||
index 1b7c5fc..ad1bb1f 100644
|
||||
--- a/term-utils/Makemodule.am
|
||||
+++ b/term-utils/Makemodule.am
|
||||
@@ -21,7 +21,7 @@ if BUILD_SCRIPTREPLAY
|
||||
usrbin_exec_PROGRAMS += scriptreplay
|
||||
dist_man_MANS += term-utils/scriptreplay.1
|
||||
scriptreplay_SOURCES = term-utils/scriptreplay.c
|
||||
-scriptreplay_LDADD = $(LDADD) libcommon.la
|
||||
+scriptreplay_LDADD = $(LDADD) libcommon.la $(MATH_LIBS)
|
||||
endif # BUILD_SCRIPTREPLAY
|
||||
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From a9e4662d26b10789b28282d7e77ab189ef34cf5c Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <casantos@datacom.ind.br>
|
||||
Date: Sun, 14 Jan 2018 16:39:31 -0200
|
||||
Subject: [PATCH] docs: add ISC licence
|
||||
|
||||
Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC. This is
|
||||
useful for Linux distributions an integration tools like Buildroot,
|
||||
to collect detailed legal information for each package.
|
||||
|
||||
[kzak@redhat.com: - remove C-comments and rfkill header]
|
||||
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
Documentation/licenses/COPYING.ISC | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
create mode 100644 Documentation/licenses/COPYING.ISC
|
||||
|
||||
diff --git a/Documentation/licenses/COPYING.ISC b/Documentation/licenses/COPYING.ISC
|
||||
new file mode 100644
|
||||
index 000000000..8351a30e3
|
||||
--- /dev/null
|
||||
+++ b/Documentation/licenses/COPYING.ISC
|
||||
@@ -0,0 +1,11 @@
|
||||
+Permission to use, copy, modify, and/or distribute this software for any
|
||||
+purpose with or without fee is hereby granted, provided that the above
|
||||
+copyright notice and this permission notice appear in all copies.
|
||||
+
|
||||
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From a9cf659e0508c1f56813a7d74c64f67bbc962538 Mon Sep 17 00:00:00 2001
|
||||
From: Carlo Caione <carlo@endlessm.com>
|
||||
Date: Mon, 19 Mar 2018 10:31:07 +0000
|
||||
Subject: [PATCH] lib/randutils: Do not block on getrandom()
|
||||
|
||||
In Endless we have hit a problem when using 'sfdisk' on the really first
|
||||
boot to automatically expand the rootfs partition. On this platform
|
||||
'sfdisk' is blocking on getrandom() because not enough random bytes are
|
||||
available. This is an ARM platform without a hwrng.
|
||||
|
||||
We fix this passing GRND_NONBLOCK to getrandom(). 'sfdisk' will use the
|
||||
best entropy it has available and fallback only as necessary.
|
||||
|
||||
Signed-off-by: Carlo Caione <carlo@endlessm.com>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
lib/randutils.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/randutils.c b/lib/randutils.c
|
||||
index e1c4059e1..02c3d9eb0 100644
|
||||
--- a/lib/randutils.c
|
||||
+++ b/lib/randutils.c
|
||||
@@ -36,6 +36,8 @@
|
||||
|
||||
#if !defined(HAVE_GETRANDOM) && defined(SYS_getrandom)
|
||||
/* libc without function, but we have syscal */
|
||||
+#define GRND_NONBLOCK 0x01
|
||||
+#define GRND_RANDOM 0x02
|
||||
static int getrandom(void *buf, size_t buflen, unsigned int flags)
|
||||
{
|
||||
return (syscall(SYS_getrandom, buf, buflen, flags));
|
||||
@@ -104,13 +106,15 @@ void random_get_bytes(void *buf, size_t nbytes)
|
||||
int x;
|
||||
|
||||
errno = 0;
|
||||
- x = getrandom(cp, n, 0);
|
||||
+ x = getrandom(cp, n, GRND_NONBLOCK);
|
||||
if (x > 0) { /* success */
|
||||
n -= x;
|
||||
cp += x;
|
||||
lose_counter = 0;
|
||||
} else if (errno == ENOSYS) /* kernel without getrandom() */
|
||||
break;
|
||||
+ else if (errno == EAGAIN)
|
||||
+ break;
|
||||
else if (lose_counter++ > 16) /* entropy problem? */
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
From edc1c90cb972fdca1f66be5a8e2b0706bd2a4949 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 20 Mar 2018 14:17:24 +0100
|
||||
Subject: [PATCH] lib/randutils: don't break on EAGAIN, use usleep()
|
||||
|
||||
The current code uses lose_counter to make more attempts to read
|
||||
random numbers. It seems better to wait a moment between attempts to
|
||||
avoid busy loop (we do the same in all-io.h).
|
||||
|
||||
The worst case is 1 second delay for all random_get_bytes() on systems
|
||||
with uninitialized entropy pool -- for example you call sfdisk (MBR Id
|
||||
or GPT UUIDs) on very first boot, etc. In this case it will use libc
|
||||
rand() as a fallback solution.
|
||||
|
||||
Note that we do not use random numbers for security sensitive things
|
||||
like keys or so. It's used for random based UUIDs etc.
|
||||
|
||||
Addresses: https://github.com/karelzak/util-linux/pull/603
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
lib/randutils.c | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/randutils.c b/lib/randutils.c
|
||||
index 02c3d9eb0..de4279530 100644
|
||||
--- a/lib/randutils.c
|
||||
+++ b/lib/randutils.c
|
||||
@@ -95,6 +95,9 @@ int random_get_fd(void)
|
||||
* Use /dev/urandom if possible, and if not,
|
||||
* use glibc pseudo-random functions.
|
||||
*/
|
||||
+#define UL_RAND_READ_ATTEMPTS 8
|
||||
+#define UL_RAND_READ_DELAY 125000 /* microseconds */
|
||||
+
|
||||
void random_get_bytes(void *buf, size_t nbytes)
|
||||
{
|
||||
unsigned char *cp = (unsigned char *)buf;
|
||||
@@ -111,11 +114,14 @@ void random_get_bytes(void *buf, size_t nbytes)
|
||||
n -= x;
|
||||
cp += x;
|
||||
lose_counter = 0;
|
||||
- } else if (errno == ENOSYS) /* kernel without getrandom() */
|
||||
- break;
|
||||
- else if (errno == EAGAIN)
|
||||
+
|
||||
+ } else if (errno == ENOSYS) { /* kernel without getrandom() */
|
||||
break;
|
||||
- else if (lose_counter++ > 16) /* entropy problem? */
|
||||
+
|
||||
+ } else if (errno == EAGAIN && lose_counter < UL_RAND_READ_ATTEMPTS) {
|
||||
+ xusleep(UL_RAND_READ_DELAY); /* no etropy, wait and try again */
|
||||
+ lose_counter++;
|
||||
+ } else
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -134,8 +140,9 @@ void random_get_bytes(void *buf, size_t nbytes)
|
||||
while (n > 0) {
|
||||
ssize_t x = read(fd, cp, n);
|
||||
if (x <= 0) {
|
||||
- if (lose_counter++ > 16)
|
||||
+ if (lose_counter++ > UL_RAND_READ_ATTEMPTS)
|
||||
break;
|
||||
+ xusleep(UL_RAND_READ_DELAY);
|
||||
continue;
|
||||
}
|
||||
n -= x;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
menuconfig BR2_PACKAGE_UTIL_LINUX
|
||||
bool "util-linux"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
Various useful/essential linux libraries and utilities.
|
||||
|
||||
@@ -55,12 +54,13 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
|
||||
Install the basic set of util-linux binaries.
|
||||
|
||||
blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm,
|
||||
column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, flock,
|
||||
fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, ldattach,
|
||||
look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, mkfs,
|
||||
mkswap, namei, prlimit, readprofile, renice, rev, rtcwake,
|
||||
script, scriptreplay, setarch, setsid, sfdisk, swaplabel,
|
||||
swapoff, swapon, tailf, uuidgen, whereis, wipefs
|
||||
column, ctrlaltdel, dmesg, fdisk, fincore, findfs, findmnt,
|
||||
flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize,
|
||||
ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie,
|
||||
mkfs, mkswap, namei, prlimit, readprofile, renice, rev,
|
||||
rtcwake, script, scriptreplay, setarch, setsid, sfdisk,
|
||||
swaplabel, swapoff, swapon, uuidgen, uuidparse, whereis,
|
||||
wipefs
|
||||
|
||||
The setarch utility also installs architecture-specific
|
||||
symlinks like linux32, linux64, uname26, i386 and x86_64.
|
||||
@@ -95,11 +95,17 @@ comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic l
|
||||
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
|
||||
|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_CHMEM
|
||||
bool "chmem"
|
||||
help
|
||||
Sets a particular size or range of memory online or offline
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_CRAMFS
|
||||
bool "cramfs utilities"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Utilities for compressed ROM file system (fsck.cramfs, mkfs.cramfs)
|
||||
Utilities for compressed ROM file system (fsck.cramfs,
|
||||
mkfs.cramfs)
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_EJECT
|
||||
bool "eject"
|
||||
@@ -159,26 +165,26 @@ config BR2_PACKAGE_UTIL_LINUX_LINE
|
||||
help
|
||||
Read one line
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
|
||||
bool "login utilities"
|
||||
depends on BR2_USE_MMU # fork() (login, runuser, su, sulogin)
|
||||
depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
|
||||
depends on BR2_USE_MMU # linux-pam
|
||||
select BR2_PACKAGE_LINUX_PAM
|
||||
help
|
||||
Login utilities (last, login, runuser, su, sulogin)
|
||||
|
||||
comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
|
||||
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
|
||||
|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LOGGER
|
||||
bool "logger"
|
||||
help
|
||||
Enter messages into the system log
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LOGIN
|
||||
bool "login"
|
||||
depends on BR2_ENABLE_LOCALE # linux-pam
|
||||
depends on BR2_USE_WCHAR # linux-pam
|
||||
depends on !BR2_STATIC_LIBS # linux-pam
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
|
||||
depends on BR2_USE_MMU # fork(), linux-pam
|
||||
select BR2_PACKAGE_LINUX_PAM
|
||||
help
|
||||
Begin a session on the system
|
||||
|
||||
comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
|
||||
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
|
||||
|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LOSETUP
|
||||
bool "losetup"
|
||||
depends on BR2_USE_MMU # libsmartcols
|
||||
@@ -193,6 +199,13 @@ config BR2_PACKAGE_UTIL_LINUX_LSLOGINS
|
||||
help
|
||||
Display information about known users in the system
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LSMEM
|
||||
bool "lsmem"
|
||||
depends on BR2_USE_MMU # libsmartcols
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
|
||||
help
|
||||
List the ranges of available memory with their online status
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_MESG
|
||||
bool "mesg"
|
||||
help
|
||||
@@ -279,10 +292,30 @@ config BR2_PACKAGE_UTIL_LINUX_RENAME
|
||||
help
|
||||
Rename files
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_RESET
|
||||
bool "reset"
|
||||
config BR2_PACKAGE_UTIL_LINUX_RFKILL
|
||||
bool "rfkill"
|
||||
depends on BR2_USE_MMU # libsmartcols
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
|
||||
help
|
||||
Reset the terminal
|
||||
Tool for enabling and disabling wireless devices. This new
|
||||
implementation is based upon, and backward compatible with,
|
||||
the original rfkill from Johannes Berg and Marcel Holtmann.
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_RUNUSER
|
||||
bool "runuser"
|
||||
depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
|
||||
depends on BR2_USE_MMU # fork(), linux-pam
|
||||
select BR2_PACKAGE_LINUX_PAM
|
||||
help
|
||||
Run a command with substitute user and group ID (does not need
|
||||
to ask for a password, because it may be executed by the root
|
||||
user only)
|
||||
|
||||
comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
|
||||
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
|
||||
|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
|
||||
bool "scheduling utilities"
|
||||
@@ -301,6 +334,26 @@ config BR2_PACKAGE_UTIL_LINUX_SETTERM
|
||||
help
|
||||
Set terminal attributes
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_SU
|
||||
bool "su"
|
||||
depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
|
||||
depends on BR2_USE_MMU # fork(), linux-pam
|
||||
select BR2_PACKAGE_LINUX_PAM
|
||||
help
|
||||
Run a command with substitute user and group ID
|
||||
|
||||
comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
|
||||
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
|
||||
|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_SULOGIN
|
||||
bool "sulogin"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
Single-user login
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
|
||||
bool "switch_root"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
|
||||
@@ -1,2 +1,9 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc
|
||||
sha256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 util-linux-2.29.2.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.31/sha256sums.asc
|
||||
sha256 1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11 util-linux-2.31.1.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 1e4b65802b0df8115395c697029d03339f983d451a473a08643309c684410d9a README.licensing
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPLv2
|
||||
sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.UCB
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPLv2.1
|
||||
sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3
|
||||
sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC
|
||||
|
||||
@@ -4,20 +4,18 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.29
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.31
|
||||
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)
|
||||
|
||||
# 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch
|
||||
UTIL_LINUX_AUTORECONF = YES
|
||||
|
||||
# README.licensing claims that some files are GPLv2-only, but this is not true.
|
||||
# Some files are GPLv3+ but only in tests.
|
||||
UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
|
||||
UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
|
||||
# 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.
|
||||
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.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
|
||||
UTIL_LINUX_INSTALL_STAGING = YES
|
||||
UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
||||
UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
# uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support
|
||||
# (used in logger.c), and the common default is N.
|
||||
UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \
|
||||
@@ -25,6 +23,7 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \
|
||||
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
|
||||
# (which needs systemd to be installed)
|
||||
@@ -32,7 +31,6 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
--without-systemd \
|
||||
--with-systemdsystemunitdir=no
|
||||
|
||||
# We don't want the host-busybox dependency to be added automatically
|
||||
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# We also don't want the host-python dependency
|
||||
@@ -44,14 +42,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
UTIL_LINUX_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
# Prevent the installation from attempting to move shared libraries from
|
||||
# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
|
||||
# the same when merged usr is in use.
|
||||
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
||||
UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
UTIL_LINUX_DEPENDENCIES += ncurses
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
UTIL_LINUX_CONF_OPTS += --with-ncursesw
|
||||
UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
|
||||
UTIL_LINUX_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
|
||||
else
|
||||
UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar
|
||||
UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
|
||||
UTIL_LINUX_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
|
||||
endif
|
||||
else
|
||||
ifeq ($(BR2_USE_WCHAR),y)
|
||||
@@ -62,11 +67,6 @@ endif
|
||||
UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
UTIL_LINUX_DEPENDENCIES += gettext
|
||||
UTIL_LINUX_LIBS += -lintl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
|
||||
UTIL_LINUX_DEPENDENCIES += libcap-ng
|
||||
endif
|
||||
@@ -104,6 +104,7 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
|
||||
@@ -121,9 +122,10 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \
|
||||
@@ -137,10 +139,13 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \
|
||||
@@ -231,7 +236,7 @@ UTIL_LINUX_CONF_OPTS += --without-audit
|
||||
endif
|
||||
|
||||
# Install PAM configuration files
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
|
||||
define UTIL_LINUX_INSTALL_PAMFILES
|
||||
$(INSTALL) -m 0644 package/util-linux/su.pam \
|
||||
$(TARGET_DIR)/etc/pam.d/su
|
||||
@@ -239,9 +244,8 @@ define UTIL_LINUX_INSTALL_PAMFILES
|
||||
$(TARGET_DIR)/etc/pam.d/su-l
|
||||
$(UTIL_LINUX_SELINUX_PAMFILES_TWEAK)
|
||||
endef
|
||||
endif
|
||||
|
||||
UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES
|
||||
endif
|
||||
|
||||
# Install agetty->getty symlink to avoid breakage when there's no busybox
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y)
|
||||
@@ -254,13 +258,5 @@ endif
|
||||
|
||||
UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
|
||||
define UTIL_LINUX_TWEAK_UUID_PC
|
||||
$(SED) '/Libs\.private: .*/d' $(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
|
||||
printf "Libs.private: -lintl\n" >>$(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
|
||||
endef
|
||||
UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_TWEAK_UUID_PC
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user