diff options
| author | Carlos Santos <casantos@datacom.ind.br> | 2016-07-09 22:16:09 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-10-16 15:53:53 +0200 |
| commit | e8ddc0de9eb1ee6dc0c255ef03ba654f42453433 (patch) | |
| tree | 79c6e749a6e09104e9a177e015830fad18491c03 /package/util-linux/util-linux.mk | |
| parent | bd1e5ba54b253c43d66f1401dc0975d86ef82196 (diff) | |
| download | buildroot-e8ddc0de9eb1ee6dc0c255ef03ba654f42453433.tar.gz buildroot-e8ddc0de9eb1ee6dc0c255ef03ba654f42453433.zip | |
util-linux: allow disabling the basic set of tools
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>
Diffstat (limited to 'package/util-linux/util-linux.mk')
| -rw-r--r-- | package/util-linux/util-linux.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4dadc3f41f..bd6508ce44 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -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 |
