diff --git a/Config.in.legacy b/Config.in.legacy index ea69f5a924..c9300831fe 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.11" +config BR2_PACKAGE_UTIL_LINUX_RESET + bool "util-linux reset option removed" + select BR2_LEGACY + help + The util-linux package no longer offers a "reset" command. Use + either the reset command provided by BusyBox or select ncurses + programs, which will install a symlink from "tset" to reset. + config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW bool "policycoreutils audit2allow option removed" select BR2_LEGACY diff --git a/package/util-linux/0001-build-sys-support-ncursesw-without-headers-in-ncurse.patch b/package/util-linux/0001-build-sys-support-ncursesw-without-headers-in-ncurse.patch deleted file mode 100644 index 062ac6725b..0000000000 --- a/package/util-linux/0001-build-sys-support-ncursesw-without-headers-in-ncurse.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 87c26ce5b689abe1b52181f98ef3c9eb1b1a5165 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 1 Aug 2017 14:36:25 +0200 -Subject: [PATCH] build-sys: support ncursesw without headers in ncursesw/ - directory - -Let's check always for alone ncurses.h and term.h if the preferred -variant with ncursesw/ subdirectory is not available. - -The patch also minimize number of HAVE_...NCURSES_H macros in -config.h. We don't need to check for ncurses.h if ncurses/ncurses.h is -available. - -Reported-by: Carlos Santos -Signed-off-by: Karel Zak ---- - configure.ac | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b204ec11e..592bd587e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -810,6 +810,13 @@ AS_IF([test "x$with_ncursesw" != xno], [ - AS_IF([test "x$have_ncursesw" = xyes], [ - AC_CHECK_HEADERS([ncursesw/ncurses.h], [have_ncursesw_header=yes]) - AC_CHECK_HEADERS([ncursesw/term.h]) -+ -+ # Define HAVE_NCURSES_H only if check for HAVE_NCURSESW_NCURSES_H is -+ # unsuccessful to avoid too many *_H permitations in config.h -+ AS_IF([test "x$have_ncursesw_header" = xno], [ -+ AC_CHECK_HEADERS([ncurses.h], [have_ncursesw_header=yes]) -+ AC_CHECK_HEADERS([term.h]) -+ ]) - AS_IF([test "x$have_ncursesw_header" = xno], [have_ncursesw=no]) - ]) - AS_IF([test "x$have_ncursesw" = xyes], [ -@@ -834,8 +841,15 @@ AS_CASE([$with_ncurses:$build_widechar], - AS_IF([test "x$have_ncursesw" = xno -a "x$with_ncurses" != xno ], [ - UL_NCURSES_CHECK([ncurses]) - AS_IF([test "x$have_ncurses" = xyes], [ -- AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h], [have_ncurses_header=yes]) -- AC_CHECK_HEADERS([ncurses/term.h term.h]) -+ AC_CHECK_HEADERS([ncurses/ncurses.h], [have_ncurses_header=yes]) -+ AC_CHECK_HEADERS([ncurses/term.h]) -+ -+ # Define HAVE_NCURSES_H only if check for HAVE_NCURSES_NCURSES_H is -+ # unsuccessful to avoid too many *_H permitations in config.h -+ AS_IF([test "x$have_ncurses_header" = xno], [ -+ AC_CHECK_HEADERS([ncurses.h], [have_ncurses_header=yes]) -+ AC_CHECK_HEADERS([term.h]) -+ ]) - AS_IF([test "x$have_ncurses_header" = xno], [have_ncurses=no]) - ]) - AS_IF([test "x$have_ncurses" = xyes], [ --- -2.13.5 - diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 5a600c333d..5f0a35cdbb 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -59,7 +59,8 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES 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, whereis, wipefs + swaplabel, swapoff, swapon, uuidgen, uuidparse, whereis, + wipefs The setarch utility also installs architecture-specific symlinks like linux32, linux64, uname26, i386 and x86_64. @@ -291,10 +292,14 @@ 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" diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 2711f51be2..2c010797b5 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.30/sha256sums.asc -sha256 7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc util-linux-2.30.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.31/sha256sums.asc +sha256 f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a util-linux-2.31.tar.xz diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4b684b99c2..8464288600 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,18 +4,15 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.30 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION_MAJOR = 2.31 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) 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-Revert-build-sys-ncurses-headers-cleanup.patch -UTIL_LINUX_AUTORECONF = YES - # 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. -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (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 +# 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 sys-utils/rfkill.c UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support @@ -134,7 +131,7 @@ 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) \