util-linux: bump version and revamp options
PATCH 1/1 util-linux: bump version and revamp options
Bump to latest 2.22.2 version and revamp available options.
* Remove the assumed enable/disable defaults since these seem to change quite often, so do what's wise and always enable/disable things.
* Switch from build "X" menu options to just X, add some help and sort.
* Introduce new option to install binaries (or not) to reduce bloat for packages that just need libblkid and/or libuuid.
--- package/util-linux/Config.in | 189 ++++++++++++++------- .../util-linux-001-sscanf-no-ms-as.patch | 75 +++++--- .../util-linux-002-add-missing-rpmatch.patch | 51 ++++++ .../util-linux-002-uclibc-build-fix.patch | 16 -- .../util-linux-003-fdisk-aarch64-support.patch | 22 --- ...l-linux-003-program-invocation-short-name.patch | 18 ++ .../util-linux/util-linux-004-xtensa-support.patch | 21 ++- package/util-linux/util-linux.mk | 88 +++++----- 8 files changed, 311 insertions(+), 169 deletions(-) create mode 100644 package/util-linux/util-linux-002-add-missing-rpmatch.patch delete mode 100644 package/util-linux/util-linux-002-uclibc-build-fix.patch delete mode 100644 package/util-linux/util-linux-003-fdisk-aarch64-support.patch create mode 100644 package/util-linux/util-linux-003-program-invocation-short-name.patch
package/util-linux/Config.in +129 -60
@@ -3,7 +3,7 @@ config BR2_PACKAGE_UTIL_LINUX depends on BR2_LARGEFILE depends on BR2_USE_WCHAR help - Various useful/essential Linux utilities. + Various useful/essential linux libraries and utilities. Things like mkfs, mkswap, swapon, fdisk, mount, dmesg, etc...
@@ -11,96 +11,165 @@ config BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX -############################################ -# default enabled and should be disabled by -# --disable-foo -# - -config BR2_PACKAGE_UTIL_LINUX_MOUNT - bool "build mount utilties" - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - -config BR2_PACKAGE_UTIL_LINUX_FSCK - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - bool "build \"fsck\"" +config BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + bool "libblkid" + help + Install libblkid. config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - bool "build libmount" + # libc lacks UTIME_NOW & UTIME_COMMIT + depends on !(BR2_microblazeel || BR2_microblazebe) + bool "libmount" + help + Install libmount. config BR2_PACKAGE_UTIL_LINUX_LIBUUID - bool "build libuuid and uuid utilities" - default y - -config BR2_PACKAGE_UTIL_LINUX_UUIDD - bool "build \"uuidd\"" + bool "libuuid" + help + Install libuuid. -config BR2_PACKAGE_UTIL_LINUX_LIBBLKID +config BR2_PACKAGE_UTIL_LINUX_BINARIES + bool "install utilities" + depends on BR2_USE_MMU # fork() + # libc lacks UTIME_NOW & UTIME_COMMIT for libmount + depends on !(BR2_microblazeel || BR2_microblazebe) + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID - bool "build libblkid and blkid utilities" - default y + help + Install the basic set of util-linux binaries. + +if BR2_PACKAGE_UTIL_LINUX_BINARIES config BR2_PACKAGE_UTIL_LINUX_AGETTY - bool "build \"agetty\"" + bool "agetty" + help + Alternative linux getty + +config BR2_PACKAGE_UTIL_LINUX_ARCH + bool "arch" + help + Print machine architecture config BR2_PACKAGE_UTIL_LINUX_CRAMFS - bool "build \"fsck.cramfs, mkfs.cramfs\"" + bool "cramfs utilities" + select BR2_PACKAGE_ZLIB + help + Build fsck.cramfs and mkfs.cramfs -config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT - bool "build \"switch_root\"" +config BR2_PACKAGE_UTIL_LINUX_DDATE + bool "ddate" + help + Convert Gregorian dates to Discordian dates -config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT - bool "build \"pivot_root\"" +config BR2_PACKAGE_UTIL_LINUX_EJECT + bool "eject" + help + Eject removable media config BR2_PACKAGE_UTIL_LINUX_FALLOCATE - bool "build \"fallocate\"" + bool "fallocate" + help + Preallocate space to a file -config BR2_PACKAGE_UTIL_LINUX_UNSHARE - bool "build \"unshare\"" +config BR2_PACKAGE_UTIL_LINUX_FSCK + bool "fsck" + help + Check and repair a linux filesystem -config BR2_PACKAGE_UTIL_LINUX_RENAME - bool "build \"rename\"" +config BR2_PACKAGE_UTIL_LINUX_KILL + bool "kill" + help + Send a signal to a process -config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS - bool "build \"chrt, ionice, taskset\"" +config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS + bool "login utilities" + depends on BR2_ENABLE_LOCALE # linux-pam + select BR2_PACKAGE_LINUX_PAM + help + Build login utilities (last, login, su, sulogin) -config BR2_PACKAGE_UTIL_LINUX_WALL - bool "build \"wall\"" +comment "login utilities require a toolchain with locale support" + depends on !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_UTIL_LINUX_MESG + bool "mesg" + help + Control write access to your terminal + +config BR2_PACKAGE_UTIL_LINUX_MOUNT + bool "mount/umount" + help + Mount/unmount filesystems + +config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT + bool "pivot_root" + help + Change the root filesystem config BR2_PACKAGE_UTIL_LINUX_PARTX - bool "build \"addpart, delpart, partx\"" - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + bool "partition utilities" + help + Partition tools (addpart, delpart, partx) -############################################ -# default disabled and should be enabled by -# --enable-foo -# -config BR2_PACKAGE_UTIL_LINUX_ARCH - bool "build \"arch\"" +config BR2_PACKAGE_UTIL_LINUX_RAW + bool "raw" + help + Build a linux raw character device -config BR2_PACKAGE_UTIL_LINUX_INIT - bool "build \"simpleinit, shutdown, initctl\"" +config BR2_PACKAGE_UTIL_LINUX_RENAME + bool "rename" + help + Rename files -config BR2_PACKAGE_UTIL_LINUX_KILL - bool "build \"kill\"" +config BR2_PACKAGE_UTIL_LINUX_RESET + bool "reset" + help + Reset the terminal + +config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS + bool "schedutils" + help + Scheduling utilities (chrt, ionice, taskset) -config BR2_PACKAGE_UTIL_LINUX_LAST - bool "build \"last\"" +config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT + bool "switch_root" + help + Switch to another filesystem as the root of the mount tree -config BR2_PACKAGE_UTIL_LINUX_MESG - bool "build \"mesg\"" +config BR2_PACKAGE_UTIL_LINUX_UNSHARE + bool "unshare" + help + Run program with some namespaces unshared from parent -config BR2_PACKAGE_UTIL_LINUX_RAW - bool "build \"raw\"" +config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP + bool "utmpdump" + help + Dump UTMP and WTMP files in raw format -config BR2_PACKAGE_UTIL_LINUX_RESET - bool "build \"reset\"" +config BR2_PACKAGE_UTIL_LINUX_UUIDD + bool "uuidd" + help + UUID generation daemon -config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS - bool "build \"chfn, chsh, login, newgrp, vipw\"" +config BR2_PACKAGE_UTIL_LINUX_WALL + bool "wall" + help + Send a message to everybody's terminal + +config BR2_PACKAGE_WDCTL + bool "wdctl" + help + Shows hardware watchdog status config BR2_PACKAGE_UTIL_LINUX_WRITE - bool "build \"write\"" + bool "write" + help + Send a message to another user + +endif endif
package/util-linux/util-linux-001-sscanf-no-ms-as.patch +51 -24
120 lines not on this page · raw message
package/util-linux/util-linux-002-add-missing-rpmatch.patch new file +51 -0
51 lines not on this page · raw message
package/util-linux/util-linux-002-uclibc-build-fix.patch deleted +0 -16
@@ -1,16 +0,0 @@ -Signed-off-by: Khem Raj <[email protected]> - -Index: util-linux-2.19.1/configure.ac -=================================================================== ---- util-linux-2.19.1.orig/configure.ac -+++ util-linux-2.19.1/configure.ac -@@ -250,7 +250,7 @@ esac - - - AC_MSG_CHECKING(whether program_invocation_short_name is defined) --AC_TRY_COMPILE([#include <argp.h>], -+AC_TRY_COMPILE([#include <errno.h>], - [program_invocation_short_name = "test";], - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, - [Define if program_invocation_short_name is defined]) -
package/util-linux/util-linux-003-fdisk-aarch64-support.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Add case for the aarch64 architecture - -Taken from https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1061609 - -Code written by Wookey. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/fdisk/fdiskbsdlabel.h -=================================================================== ---- a/fdisk/fdiskbsdlabel.h -+++ b/fdisk/fdiskbsdlabel.h -@@ -48,7 +48,8 @@ - - #if defined (i386) || defined (__sparc__) || defined (__arm__) || \ - defined (__mips__) || defined (__s390__) || defined (__sh__) || \ -- defined(__x86_64__) || defined (__avr32__) || defined(__cris__) -+ defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ -+ defined(__aarch64__) - #define BSD_LABELSECTOR 1 - #define BSD_LABELOFFSET 0 - #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
package/util-linux/util-linux-003-program-invocation-short-name.patch new file +18 -0
@@ -0,0 +1,18 @@ +uClibc build fix: program_invocation_short_name is defined in errno.h +and not argp.h +Update to util-linux-2.22.2 from a previous patch by Khem. + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura util-linux-2.22.2.orig/configure.ac util-linux-2.22.2/configure.ac +--- util-linux-2.22.2.orig/configure.ac 2013-03-07 15:16:18.912418476 -0300 ++++ util-linux-2.22.2/configure.ac 2013-03-07 15:16:25.909640745 -0300 +@@ -372,7 +372,7 @@ + + + AC_MSG_CHECKING(whether program_invocation_short_name is defined) +-AC_TRY_COMPILE([#include <argp.h>], ++AC_TRY_COMPILE([#include <errno.h>], + [program_invocation_short_name = "test";], + AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, + [Define if program_invocation_short_name is defined])
package/util-linux/util-linux-004-xtensa-support.patch +13 -8
@@ -1,11 +1,16 @@ ---- util-linux-2.20.1/fdisk/fdiskbsdlabel.h.orig 2013-01-21 19:17:58.023049856 -0800 -+++ util-linux-2.20.1/fdisk/fdiskbsdlabel.h 2013-01-21 19:18:09.867050151 -0800 -@@ -49,7 +49,7 @@ - #if defined (i386) || defined (__sparc__) || defined (__arm__) || \ +Forward-port of xtensa support patch to util-linux-2.22.2 by ?? + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura util-linux-2.22.2/fdisks/fdiskbsdlabel.h util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h +--- util-linux-2.22.2/fdisks/fdiskbsdlabel.h 2012-12-12 17:04:47.898355058 -0300 ++++ util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h 2013-03-07 18:17:32.292723061 -0300 +@@ -48,7 +48,7 @@ + + #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \ defined (__mips__) || defined (__s390__) || defined (__sh__) || \ - defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ -- defined(__aarch64__) -+ defined(__aarch64__) || defined(__xtensa__) +- defined (__aarch64__) || \ ++ defined (__aarch64__) || defined (__xtensa__) || \ + defined(__x86_64__) || defined (__avr32__) || defined(__cris__) #define BSD_LABELSECTOR 1 #define BSD_LABELOFFSET 0 - #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
package/util-linux/util-linux.mk +49 -39
118 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 1/1 util-linux: bump version and revamp options
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Bump to latest 2.22.2 version and revamp available options. Gustavo> * Remove the assumed enable/disable defaults since these seem to change
Gustavo> quite often, so do what's wise and always enable/disable things.
Gustavo> * Switch from build "X" menu options to just X, add some help and sort.
Gustavo> * Introduce new option to install binaries (or not) to reduce bloat for
Gustavo> packages that just need libblkid and/or libuuid.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard