gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util-linux: fix partx build breakage

Browse Source 
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 <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2011-10-18 12:53:15 -03:00 committed by Peter Korsgaard
parent d7139cd936
commit 789a7cf406
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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\""

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

@ -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) \