deleted file mode 100644
@@ -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
-
@@ -55,12 +55,12 @@ 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, whereis, wipefs
The setarch utility also installs architecture-specific
symlinks like linux32, linux64, uname26, i386 and x86_64.
@@ -95,6 +95,11 @@ 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
@@ -194,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
@@ -1,2 +1,2 @@
-# 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.30/sha256sums.asc
+sha256 c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d util-linux-2.30.tar.xz
@@ -4,14 +4,11 @@
#
################################################################################
-UTIL_LINUX_VERSION_MAJOR = 2.29
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
+UTIL_LINUX_VERSION_MAJOR = 2.30
+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-build-sys-use-lm-for-scriptreplay-if-necessary.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)
@@ -104,6 +101,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) \
@@ -124,6 +122,7 @@ UTIL_LINUX_CONF_OPTS += \
$(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_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) \
- Update the "basic set" description to include fincore, which is built by default, and remove tailf, which was removed in this version. - Add configuration options for the new utilities "chmem" and "lsmem". - Remove patch already applied upstream. - Drop autoreconf, since the patch on term-utils/Makemodule.am is gone. Signed-off-by: Carlos Santos <casantos@datacom.ind.br> --- ...-sys-use-lm-for-scriptreplay-if-necessary.patch | 30 ---------------------- package/util-linux/Config.in | 24 ++++++++++++----- package/util-linux/util-linux.hash | 4 +-- package/util-linux/util-linux.mk | 9 +++---- 4 files changed, 24 insertions(+), 43 deletions(-) delete mode 100644 package/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch