ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-build-sys' of https://github.com/rudimeier/util-linux

This commit is contained in:
Karel Zak 2014-05-26 12:52:18 +02:00
parent a37811b51f 0f918ac197
commit 574528ed40
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -830,7 +830,7 @@ AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes])
UL_BUILD_INIT([sfdisk], [check])
UL_EXCLUDE_ARCH([sfdisk], [spark*])
UL_EXCLUDE_ARCH([sfdisk], [sparc*])
AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_sfdisk" = xyes])
@ -1124,7 +1124,7 @@ AM_CONDITIONAL([BUILD_CAL], [test "x$build_cal" = xyes])
UL_BUILD_INIT([logger], [yes])
AM_CONDITIONAL([BUILD_LOGGER], [test "x$build_logger" = xyes])
UL_BUILD_INIT([loop], [yes])
UL_BUILD_INIT([look], [yes])
AM_CONDITIONAL([BUILD_LOOK], [test "x$build_look" = xyes])
UL_BUILD_INIT([mcookie], [yes])

2
libblkid/src/partitions/bsd.c
View File

@ -158,7 +158,7 @@ nothing:
* alpha luna88k mac68k | 0 | 64
* sparc(OpenBSD) vax | |
* ------------------------+-------------+------------
* spark64 sparc(NetBSD) | 0 | 128
* sparc64 sparc(NetBSD) | 0 | 128
* ------------------------+-------------+------------
*
* ...and more (see http://fxr.watson.org/fxr/ident?v=NETBSD;i=LABELSECTOR)