util-linux: bump to version 2.33
- Update "basic set" help to include the new "choom" utility. - Re-generate checksums for license files, whose names now follow the SPDX License List. - Pull a patch already applied upstream that make rtcwake use poweroff if shutdown is not found (e.g. Busybox, which the default init system on Buldroot). - Pull a patch already submitted upstream to fix the output of escaped characters by agetty. Signed-off-by: Carlos Santos <casantos@datacom.com.br> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Carlos Santos
Peter Korsgaard
parent
419fc6abca
commit
dbb68d7973
@ -0,0 +1,86 @@
|
||||
From e1686b25acdedb34cc357f08f0dd3ca01c559dfd Mon Sep 17 00:00:00 2001
|
||||
From: Justin Chen <justinpopo6@gmail.com>
|
||||
Date: Thu, 1 Nov 2018 11:10:38 -0700
|
||||
Subject: [PATCH] rtcwake: use poweroff if shutdown is not found
|
||||
|
||||
Some systems do not have the shutdown command. Use poweroff as an
|
||||
alternative.
|
||||
|
||||
Signed-off-by: Justin Chen <justinpopo6@gmail.com>
|
||||
---
|
||||
include/pathnames.h | 1 +
|
||||
sys-utils/rtcwake.c | 39 +++++++++++++++++++++++++++------------
|
||||
2 files changed, 28 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/include/pathnames.h b/include/pathnames.h
|
||||
index 3d5052e6f..ed8ea330d 100644
|
||||
--- a/include/pathnames.h
|
||||
+++ b/include/pathnames.h
|
||||
@@ -53,6 +53,7 @@
|
||||
# define _PATH_LOGIN "/bin/login"
|
||||
#endif
|
||||
#define _PATH_SHUTDOWN "/sbin/shutdown"
|
||||
+#define _PATH_POWEROFF "/sbin/poweroff"
|
||||
|
||||
#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
|
||||
#define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
|
||||
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
|
||||
index b63c64627..029f00f9b 100644
|
||||
--- a/sys-utils/rtcwake.c
|
||||
+++ b/sys-utils/rtcwake.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <termios.h>
|
||||
@@ -582,18 +583,32 @@ int main(int argc, char **argv)
|
||||
char *arg[5];
|
||||
int i = 0;
|
||||
|
||||
- if (ctl.verbose)
|
||||
- printf(_("suspend mode: off; executing %s\n"),
|
||||
- _PATH_SHUTDOWN);
|
||||
- arg[i++] = _PATH_SHUTDOWN;
|
||||
- arg[i++] = "-h";
|
||||
- arg[i++] = "-P";
|
||||
- arg[i++] = "now";
|
||||
- arg[i] = NULL;
|
||||
- if (!ctl.dryrun) {
|
||||
- execv(arg[0], arg);
|
||||
- warn(_("failed to execute %s"), _PATH_SHUTDOWN);
|
||||
- rc = EXIT_FAILURE;
|
||||
+ if (!access(_PATH_SHUTDOWN, X_OK)) {
|
||||
+ arg[i++] = _PATH_SHUTDOWN;
|
||||
+ arg[i++] = "-h";
|
||||
+ arg[i++] = "-P";
|
||||
+ arg[i++] = "now";
|
||||
+ arg[i] = NULL;
|
||||
+ } else if (!access(_PATH_POWEROFF, X_OK)) {
|
||||
+ arg[i++] = _PATH_POWEROFF;
|
||||
+ arg[i] = NULL;
|
||||
+ } else {
|
||||
+ arg[i] = NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (arg[0]) {
|
||||
+ if (ctl.verbose)
|
||||
+ printf(_("suspend mode: off; executing %s\n"),
|
||||
+ arg[0]);
|
||||
+ if (!ctl.dryrun) {
|
||||
+ execv(arg[0], arg);
|
||||
+ warn(_("failed to execute %s"), arg[0]);
|
||||
+ rc = EX_EXEC_ENOENT;
|
||||
+ }
|
||||
+ } else {
|
||||
+ /* Failed to find shutdown command */
|
||||
+ warn(_("failed to find shutdown command"));
|
||||
+ rc = EX_EXEC_ENOENT;
|
||||
}
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 73c5a3cc748b853936319e6cdc94159a6974db52 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Wed, 7 Nov 2018 13:55:06 +0100
|
||||
Subject: [PATCH] agetty: fix output of escaped characters
|
||||
|
||||
Signed-off-by: Christian Hesse <mail@eworm.de>
|
||||
---
|
||||
term-utils/agetty.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
|
||||
index 05a269abb..b9f08728e 100644
|
||||
--- a/term-utils/agetty.c
|
||||
+++ b/term-utils/agetty.c
|
||||
@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
|
||||
break;
|
||||
}
|
||||
default:
|
||||
- putchar(c);
|
||||
+ putc(c, ie->output);
|
||||
break;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -53,7 +53,7 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
|
||||
help
|
||||
Install the basic set of util-linux binaries.
|
||||
|
||||
blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm,
|
||||
blkdiscard, blkid, blockdev, chcpu, choom, col, colcrt, colrm,
|
||||
column, ctrlaltdel, dmesg, fdisk, fincore, findfs, findmnt,
|
||||
flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize,
|
||||
ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie,
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.32/sha256sums.asc
|
||||
sha256 86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2 util-linux-2.32.1.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.33/sha256sums.asc
|
||||
sha256 f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a util-linux-2.33.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 4335620e8f478ee4dc4d26540448d39469091ef1d8e3fbbbb8bf753206ceac74 README.licensing
|
||||
sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause
|
||||
sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later
|
||||
sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later
|
||||
|
||||
@ -4,15 +4,20 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.32
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.33
|
||||
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)
|
||||
|
||||
# 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_LICENSE_FILES = README.licensing \
|
||||
Documentation/licenses/COPYING.BSD-3-Clause \
|
||||
Documentation/licenses/COPYING.BSD-4-Clause-UC \
|
||||
Documentation/licenses/COPYING.GPL-2.0-or-later \
|
||||
Documentation/licenses/COPYING.ISC \
|
||||
Documentation/licenses/COPYING.LGPL-2.1-or-later
|
||||
UTIL_LINUX_INSTALL_STAGING = YES
|
||||
UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
UTIL_LINUX_CONF_OPTS += \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user