NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-linux: allow disabling the basic set of tools

Browse Source 
When even a single extra util-linux utility is enabled, the default
build and install will install many more programs, including many that
overlap with those offered by busybox.

Fix by reworking the install-utilies menu to take advantage of the new
--disable-all-programs config option. This option make it possible to
disable the basic set of apps, and then enable only the desired apps.

Original patch by Danomi Manchego, visible at
http://patchwork.ozlabs.org/patch/494866/

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Thomas/Arnout: remove the choice between all/custom/no, and simply have
a list of options with the basic set of tools, and then one option for
each tool. This gives the same flexibility, but avoids the choice, which
is never nice to have.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Carlos Santos 2016-07-09 22:16:09 -03:00 committed by Thomas Petazzoni
parent bd1e5ba54b
commit e8ddc0de9e
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/util-linux/Config.in
View File

@ -45,7 +45,7 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID
Install libuuid.
config BR2_PACKAGE_UTIL_LINUX_BINARIES
bool "install utilities"
bool "basic set"
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
@ -55,19 +55,17 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
help
Install the basic set of util-linux binaries.
blkdiscard, blkid, blockdev, cfdisk, 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
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
The setarch utility also installs architecture-specific
symlinks like linux32, linux64, uname26, i386 and x86_64.
if BR2_PACKAGE_UTIL_LINUX_BINARIES
config BR2_PACKAGE_UTIL_LINUX_AGETTY
bool "agetty"
depends on BR2_USE_MMU # fork()
@ -371,7 +369,5 @@ config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL
endif
endif
comment "util-linux needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR

7
package/util-linux/util-linux.mk
View File

@ -71,6 +71,7 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam)
# Disable/Enable utilities
UTIL_LINUX_CONF_OPTS += \
$(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \
$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \
$(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \
$(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \
@ -142,12 +143,6 @@ else
HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs
endif
# Avoid building the tools if they are disabled since we can't install on
# a per-directory basis.
ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
UTIL_LINUX_CONF_OPTS += --disable-all-programs
endif
# Install libmount Python bindings
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
UTIL_LINUX_CONF_OPTS += --with-python