Skip to contentSkip to conversation

util-linux: fix partx build breakage

PATCH New Gustavo Zacarias 2 participants 3 messages Oct 18, 2011 – Nov 8, 2011

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 util-linux: fix partx build breakage

addpart, delpart and partx are enabled by default so --disable now to avoid build breaking when we lack libblkid.
Also select libblkid when it's enabled now.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/util-linux/Config.in     |    7 ++++---
 package/util-linux/util-linux.mk |    4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
package/util-linux/Config.in +4 -3
index 816130d..43a8444 100644
@@ -67,6 +67,10 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "build \"wall\""
 
+config BR2_PACKAGE_UTIL_LINUX_PARTX
+	bool "build \"addpart, delpart, partx\""
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+
 ############################################
 # default disabled and should be enabled by
 #  --enable-foo

@@ -86,9 +90,6 @@ config BR2_PACKAGE_UTIL_LINUX_LAST
 config BR2_PACKAGE_UTIL_LINUX_MESG
 	bool "build \"mesg\""
 
-config BR2_PACKAGE_UTIL_LINUX_PARTX
-	bool "build \"addpart, delpart, partx\""
-
 config BR2_PACKAGE_UTIL_LINUX_RAW
 	bool "build \"raw\""
package/util-linux/util-linux.mk +2 -2
index b77e326..a3d6e13 100644
@@ -49,7 +49,8 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall)
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx)
 
 #############################################
 #

@@ -61,7 +62,6 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 2/2 util-linux: disable installing binaries by default

Disable installing binaries by default based on a new "install basic utilities" option.
This is to avoid installing unnecessary bloat when we just need libblkid/libuuid for e2fsprogs for example.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/util-linux/Config.in     |    5 +++++
 package/util-linux/util-linux.mk |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 0 deletions(-)
package/util-linux/Config.in +5 -0
index 43a8444..92b50dc 100644
@@ -16,6 +16,11 @@ if BR2_PACKAGE_UTIL_LINUX
 #  --disable-foo
 #
 
+config BR2_PACKAGE_UTIL_LINUX_BASIC
+	bool "install basic utilities"
+	help
+	  Install the basic util-linux binaries.
+
 config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	bool "build mount utilties"
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
package/util-linux/util-linux.mk +36 -0
index a3d6e13..f744cbe 100644
@@ -3,6 +3,7 @@
 # util-linux
 #
 #############################################################
+
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_VERSION_MAJOR = 2.20
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2

@@ -67,6 +68,41 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 
+# Avoid the basic utilities if we just want the libraries
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_BASIC),y)
+define UTIL_LINUX_INSTALL_BASIC
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
+define UTIL_LINUX_INSTALL_LIBBLKID
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libblkid \
+		DESTDIR=$(TARGET_DIR) install
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
+define UTIL_LINUX_INSTALL_LIBMOUNT
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libmount \
+		DESTDIR=$(TARGET_DIR) install
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
+define UTIL_LINUX_INSTALL_LIBUUID
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libuuid \
+		DESTDIR=$(TARGET_DIR) install
+endef
+endif
+
+define UTIL_LINUX_INSTALL_TARGET_CMDS
+	$(UTIL_LINUX_INSTALL_BASIC)
+	$(UTIL_LINUX_INSTALL_LIBBLKID)
+	$(UTIL_LINUX_INSTALL_LIBMOUNT)
+	$(UTIL_LINUX_INSTALL_LIBUUID)
+endef
+
 $(eval $(call AUTOTARGETS))
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 1/2 util-linux: fix partx build breakage

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> addpart, delpart and partx are enabled by default so --disable now to Gustavo> avoid build breaking when we lack libblkid.
Gustavo> Also select libblkid when it's enabled now.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard