When building util-linux-ng-2.15, I get this:
../lib/fsprobe.c:10:19: error: blkid.h: No such file or directory
Unfortunately, the blkid.pc uses -I${includedir}/blkidi since
e2fsprogs v1.41.2. The old versions use -I${includedir} only.
Reported-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
"SPEC" is usually used in mount(8) as a generic term for device name or
tag (LABEL, UUID). The function blkid_evaluate_* works with TAGs only.
Signed-off-by: Karel Zak <kzak@redhat.com>
It seems better to split SONAME and the public library version. The
library version will be the same as util-linux-ng PACKAGE_VERSION.
PACKAGE_VERSION: <maj>.<min>[-<suffix>] e.g. 2.15-rc2
Symbols versioning: BLKID_<maj>.<min> e.g. BLKID_2.15
blkid_get_library_version(): <maj>.<min>.0 e.g. 2.15.0
SONAME: libblkid.so.1
See also the original patch a0487b1cb5
where was introduced library versioning.
Signed-off-by: Karel Zak <kzak@redhat.com>
For compatibility with e2fsprogs tree:
commit eb630fd8708ae433e55e384079c08e0f0f040d22
Author: Eric Sandeen <sandeen@redhat.com>
Date: Tue Feb 24 23:15:33 2009 -0600
e2fsprogs: blkid.static make target
Nice for testing w/o needing to swizzle around system
libraries...
Signed-off-by: Karel Zak <kzak@redhat.com>
It seems that blkid.pc from e2fsprogs has been fixed:
$ pkg-config --libs blkid
-lblkid
and the pkg-config does not return any other extra libraries (such
-luuid or -ldevmapper).
Signed-off-by: Karel Zak <kzak@redhat.com>
* moves the generic libblkid/libvolume_id wrapper (fsprobe.c) from
mount/ to lib/. We'll use the wrapper in cfdisk and fsck.
The wrapper supports:
- obsolete volume_id (udev)
- obsolete libblkid (e2fsprogs)
- libblkid (util-linux-ng)
* mount, umount and swapon when linked against the new libblkid use
- low-level probing code to read LABEL, UUID or FSTYPE from a device
- high-level blkid_evaluate_spec() to convert LABEL/UUID to devname
Signed-off-by: Karel Zak <kzak@redhat.com>
* cleanup mount/Makefile.am
* add {VOLUMEID,BLKID}_CFLAGS -- necessary for pkg-config
* add support for linking with in-tree libblkid
Signed-off-by: Karel Zak <kzak@redhat.com>
We need an infrastructure for stared libraries. The latest libtool-2
seems useful and it's definitely better than the old 1.5 crap.
You need to install libtool-2 when you want to run ./autogen.sh script
after checkout from git repository.
Signed-off-by: Karel Zak <kzak@redhat.com>
The library ABI and API is backwardly compatible, so it does not
make sense to change the library SONAME. This patch adds a symbol
versioning, naming paradigm is:
BLKID_<maj>.<min>
The original libblkid from e2fsprogs uses "1.0" as a .so version and
"libblkid.1" as a SONAME for all time (at least according to stuff in
/lib/libblkid*)
And the original library is without symbols versioning. It means that
many private functions are exported to applications ;-(
Note that the original blkid_get_library_version() returns
E2FSPROGS_VERSION. The version in util-linux-ng returns BLKID_VERSION
which is <maj>.<min>.<rel>. The <maj>.<min> is the same version as we
use for ABI. This concept seems less confusing than mix a library
version and package version.
Summary:
OLD (e2fsprogs):
ABI versioning: -none-
SONAME: libblkid.1
.so version: libblkid.so.1.0
blkid_get_library_version(): @E2FSPROGS_VERSION@ (e.g. 1.41.1)
NEW (util-linux-ng):
ABI versioning: BLKID_<maj>.<min>
SONAME: libblkid.1
.so version: libblkid.so.<maj.<min> (e.g. 1.41)
blkid_get_library_version(): @BLKID_VERSION@ (e.g. 1.41.1)
(BLKID_VERSION = <maj>.<min>.<rel>)
Signed-off-by: Karel Zak <kzak@redhat.com>
Note, the configure.in stuff is incomplete -- but it's seem we can
remove the libbevmapper crap from blkid at all. So this code autoconf
is temporary only.
Signed-off-by: Karel Zak <kzak@redhat.com>
cramfs is an endianness dependent file system. So far, the cramfs
utilities did not support cramfs images of different endianness than
the host machine.
A separate utility, cramfsswap, was required in order to change the
endianness of the image before and after using cramfs utilities. The
extra utility introduced extra maintenance and an additional step in
the process.
This patch adds endianness support to mkfs.cramfs and fsck.cramfs.
fsck.cramfs now automatically detects the image endianness, and can
work on images of either endianness. mkfs.cramfs now accepts a new
optional parameter (-N) that allows creating the cramfs image in
either endianness.
Signed-off-by: Roy Peled <the.roy.peled@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
I use busybox for most of the utilities, still lacks a few that I wish to use
from util-linux...
So mount comes from busybox. And during the cross compile I don't want to
compile the mount dependencies only to make the configure script happy...
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
The libblkid is always linked with libuuild, so this indirect
dependence in BLKID_LIBS is not a problem. This change helps to people
who compile util-linux-ng with non-standard prefix, ..etc.
Signed-off-by: Karel Zak <kzak@redhat.com>
ncurses library can be build with terminal related functions
landing in separate libtinfo library. Check for ncurses function
when testing ncurses library existence.
Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
setarch.c:248: error: 'ADDR_NO_RANDOMIZE' undeclared (first use in this function)
setarch.c:248: error: (Each undeclared identifier is reported only once
setarch.c:248: error: for each function it appears in.)
setarch.c:251: error: 'FDPIC_FUNCPTRS' undeclared (first use in this function)
setarch.c:257: error: 'ADDR_COMPAT_LAYOUT' undeclared (first use in this function)
setarch.c:260: error: 'READ_IMPLIES_EXEC' undeclared (first use in this function)
Linux gzp1 2.4.36.1-gzp1 #1 SMP Tue Feb 19 10:23:48 CET 2008 i686 GNU/Linux
Reported-By: Gabor Z. Papp <gzp@papp.hu>
Signed-off-by: Karel Zak <kzak@redhat.com>
The dependence on Perl sucks...
Co-Author: James Youngman <jay@gnu.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: James Youngman <jay@gnu.org>
Detect ncursesw and use it in place of ncurses when possible
(default). Allow people to use classic (non-wide) version by
--with-ncurses or disable all ncurses/ncursesw support by
--without-ncurses.
Co-Author: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
The UTIL_CHECK_LIB macro follows the default autoconf behaviour and
generates have_<libname> and HAVE_LIB<LIBNAME> variables.
Some libraries are substitutional (e.g. ncurses and ncursesw). It would be
nice to generate for that libraries the same HAVE_ variables independently
on a library name.
This patch adds optional VARSUFFIX option to UTIL_CHECK_LIB, so the final
variables are have_<varsuffix> and HAVE_LIB<VARSUFFIX>.
For example:
UTIL_CHECK_LIB(yyy, func) generates have_yyy and HAVE_LIBYYY
UTIL_CHECK_LIB(yyy, func, xxx) generates have_xxx and HAVE_LIBXXX
Signed-off-by: Karel Zak <kzak@redhat.com>
Add support for static versions of mount, umount, losetup, fdisk,
and sfdisk.
Co-Author: Karel Zak <kzak@redhat.com>
Signed-off-by: Stepan Kasal <skasal@redhat.com>
Karel Zak
Tom Prince
Signed-off-by: Roy Peled
Alon Bar-Lev
Arkadiusz Miskiewicz
Stepan Kasal