2009-07-02 18:10:41

by Karel Zak

[permalink] [raw]
Subject: [ANNOUNCE] util-linux-ng v2.16-rc2



The second util-linux-ng 2.16 release candidate is available at

ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/

Feedback and bug reports, as always, are welcomed.

Karel


Util-linux-ng 2.16 Release Notes
================================

Release highlights
------------------

libuuid, uuidgen(1) and uuidd(8):
- the libuuid library has been moved from e2fsprogs to util-linux-ng

switch_root:
- this NEW COMMAND allows to switch to another filesystem as the root
of the mount tree.

mount, umount, fsck:
- DOES NOT SUPPORT linking against obsolete libvolume_id (from udev)


Stable maintenance releases between v2.15 and v2.16
---------------------------------------------------

util-linux-ng 2.15.1 [10-Jun-2009]

* ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ReleaseNotes
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ChangeLog


ChangeLog between v2.15 and v2.16
---------------------------------

For more details see ChangeLog files at:
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/


build-sys:
- add --disable-libblkid, remove volume_id support [Karel Zak]
- add --disable-switch_root [Karel Zak]
- add --disable-tls [Karel Zak]
- add --disable-uuidd [Karel Zak]
- add UTIL_{SET,RESTORE}_FLAGS [Karel Zak]
- check for openat() and linux for switch_root [Karel Zak]
- cleanup libuuid stuff [Karel Zak]
- complete /libs to /shlibs rename [Karel Zak]
- enable fsck by default [Karel Zak]
- fix "make -C" bug [Karel Zak]
- fix --disable-uuidd [Karel Zak]
- fix blkid.h include for old e2fsprogs [Karel Zak]
- fix headers in mkswap and libblkid [Karel Zak]
- fix libuuid Makefile.am [Karel Zak]
- release++ (v2.16-rc1) [Karel Zak]
- rename /libs to /shlibs [Karel Zak]
buildsys:
- move $usr{bin,sbin,lib}execdir definition to ./configure [Karel Zak]
cal:
- Highlight today even when month or year specified [Rajeev V. Pillai]
- uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY. [Tom Prince]
chrt:
- don't assume SCHED_BATCH and SCHED_IDLE exist [Aurelien Jarno]
docs:
- add missing commands/projects to AUTHORS file [Karel Zak]
- add v2.16 ReleaseNotes [Karel Zak]
- refresh TODO list [Karel Zak]
- remove example.files/rc[.local] [Karel Zak]
- remove obsolete information from fstab example [Karel Zak]
- update AUTHORS file [Karel Zak]
- update v2.16-ReleaseNotes [Karel Zak]
fdisk:
- (and cfdisk) fix to be consistent about maximum heads [Chris Webb]
- add simple test for doslabel stuff [Zdenek Behan]
hwclock:
- fix mismatched popen/fclose. [John Keeping]
include:
- clean up _PATH_DEV_* macros [Karel Zak]
- fix _PATH_DEV [Karel Zak]
ionice:
- Allow setting the none class [Jakob Unterwurzacher]
ldattach:
- add N_PPS support [Tilman Schmidt]
libblkid:
- add device-mapper snapshot cow device probe [Milan Broz]
- add install-hook for libuuid.[a,so] devel files [Karel Zak]
- blkid_do_safeprobe() has to be tolerant to RAIDs [Karel Zak]
- cleanup debug messages and return codes in blkid_do_probe() [Karel Zak]
- don't require udev symlinks verification for non-root users [Karel Zak]
- fix "hangs forever with partition type mdraid" [Karel Zak]
- fix #ifdefs readability [Karel Zak]
- fix $libdir in blkid.pc [Karel Zak]
- fix LVM1 probe [Milan Broz]
- fix reiserfs name [Karel Zak]
- make libuuid optional [Karel Zak]
- move to misc-utils/ directory [Karel Zak]
- update man page [Karel Zak]
libuuid:
- Don't run uuidd if it would fail due to permission problems [Theodore Ts'o]
- Make sure fd's 0, 1, and 2 are valid before exec'ing uuidd [Theodore Ts'o]
- add --disable-libuuid and LIBUUID_VERSION [Karel Zak]
- add .gitignore [Karel Zak]
- add info about u-l-ng to man pages [Karel Zak]
- add install-hook for libuuid.[a,so] devel files [Karel Zak]
- fix $libdir in uuid.pc [Karel Zak]
- import UUID library from e2fsprogs [Karel Zak]
libuuid, uuidd:
- Avoid infinite loop while reading from the socket fd [Theodore Ts'o]
losetup:
- add --set-capacity [Karel Zak]
- fix return codes of functions arounf is_associated() [Karel Zak]
- handle symlinks in /dev/loop/ [Mike Frysinger]
- suggest to use modprobe rather than insmod in losetup.8 [Karel Zak]
lscpu:
- fix cpuid code on x86/PIC [Mike Frysinger]
mount:
- (and fsck) remove libvolume_id support [Karel Zak]
- a little clean up info about loopdevs in man page [Karel Zak]
- add ext4 to mount.8 [Karel Zak]
- add ext4 to the list of filesystems in mount.8 [Karel Zak]
- add info about obsolete vfat options to mount.8 [Karel Zak]
- allow loop suid umount [Kay Sievers]
- cleanup notes about -l option in mount.8 [Karel Zak]
- fix undefined reference to `security_get_initial_context' [Karel Zak]
- move MS_{PROPAGATION,BIND,MOVE} detection [Karel Zak]
- use "none" fstype for MS_PROPAGATION mounts [Karel Zak]
- use TAG parsing function from libblkid [Karel Zak]
po:
- fix typo in French translation [Olivier Blin]
- merge changes [Karel Zak]
- refresh POTFILES.in [Karel Zak]
- update vi.po (from translationproject.org) [Clytie Siddall]
raw:
- Use the RAW_SETBIND ioctl without stat'ing the raw# file [Jeff Mahoney]
- undeprecate raw [Karel Zak]
switch_root:
- add man page [Karel Zak]
- clean up argv[] usage, add -h and -V [Karel Zak]
- do recursiveRemove after our root is moved to avoid races. [Peter Jones]
- fix coding style [Karel Zak]
- fork before cleaning up the filesystem. [Peter Jones]
- new command [Karel Zak]
- rewrite to use fstatat() and unlinkat() [Karel Zak]
- use err.h, clean up return codes [Karel Zak]
- use file descriptor instead of path for recursiveRemove() [Peter Jones]
- use snprintf() rather tan str{cpy,cat}() [Karel Zak]
tests:
- add functions for work withdisk images [Karel Zak]
- add mdraid libblkid test [Karel Zak]
- don't run some mount tests for non-root users [Karel Zak]
- fix 'delete extended partition' checksum [Karel Zak]
- fix reiserfs test [Karel Zak]
- fix script that creates lscpu dumps [Karel Zak]
- move lscpu /proc and /sys dumps to tarballs [Karel Zak]
- remove broken Xen dumps for lscpu [Karel Zak]
umount:
- clean up help output [Karel Zak]
uuidd:
- Avoid closing the server socket when calling create_daemon() [Theodore Ts'o]
- fix $PIDFILE in uuidd.rc [Karel Zak]
- init /var/run/uuidd, add option for on-demand mode to .rc file [Karel Zak]
- move uuidd files from /var/lib/libuuid to /var/run/uuidd [Karel Zak]
- move uuidd.rc to misc-utils directory [Karel Zak]
- new command (UUID daemon from e2fsprogs) [Karel Zak]
uuidgen:
- new command (from e2fsprogs) [Karel Zak]

--
Karel Zak <[email protected]>


2009-07-02 20:32:26

by Kay Sievers

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2

On Thu, Jul 2, 2009 at 20:10, Karel Zak<[email protected]> wrote:
>
> The second util-linux-ng 2.16 release candidate is available at
>
>   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
>
> Feedback and bug reports, as always, are welcomed.

It builds fine on the host, but fails to build in a clean chroot:

The hack with moving the devel files around to /usr with an install
hook breaks the values stored in the libblkid.la file and relinking
fails, because the lib devel files are now no longer in /lib but
(silently) moved to /usr/lib:

libtool: relink: gcc -std=gnu99 -shared .libs/cache.o .libs/dev.o
.libs/devname.o .libs/devno.o .libs/getsize.o .libs/llseek.o
.libs/probe.o .libs/read.o .libs/resolve.o .libs/save.o .libs/tag.o
.libs/version.o .libs/verify.o .libs/encode.o .libs/config.o
.libs/evaluate.o .libs/blkdev.o .libs/linux_version.o
.libs/canonicalize.o .libs/md5.o -Wl,--whole-archive
probers/.libs/libblkid_probers.a -Wl,--no-whole-archive
-L/var/tmp/util-linux-2.16-build/lib64 -L/lib64 -luuid
-Wl,--version-script=../../../shlibs/blkid/src/blkid.sym -Wl,-soname
-Wl,libblkid.so.1 -o .libs/libblkid.so.1.0.0
/usr/lib64/gcc/x86_64-suse-linux/4.4/../../../../x86_64-suse-linux/bin/ld:
cannot find -luuid
collect2: ld returned 1 exit status

That the .so is installed in the root is really the implementation
detail that should be hidden from anything but the ld loader on the
system. I guess, we want to keep the original --libdir value, and use
a --rootlibdir as it's own parameter, or something similar, and just
move the .so image to the root with the install hook (or the spec
file), instead of moving the devel stuff, faking the .pc files and
patching the .la files. :)

Thanks,
Kay

2009-07-03 09:37:56

by Kay Sievers

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2

On Thu, 2009-07-02 at 22:32 +0200, Kay Sievers wrote:
> On Thu, Jul 2, 2009 at 20:10, Karel Zak<[email protected]> wrote:
> >
> > The second util-linux-ng 2.16 release candidate is available at
> >
> > ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
> >
> > Feedback and bug reports, as always, are welcomed.
>
> It builds fine on the host, but fails to build in a clean chroot:
>
> The hack with moving the devel files around to /usr with an install
> hook breaks the values stored in the libblkid.la file and relinking
> fails, because the lib devel files are now no longer in /lib but
> (silently) moved to /usr/lib:
>
> libtool: relink: gcc -std=gnu99 -shared .libs/cache.o .libs/dev.o
> .libs/devname.o .libs/devno.o .libs/getsize.o .libs/llseek.o
> .libs/probe.o .libs/read.o .libs/resolve.o .libs/save.o .libs/tag.o
> .libs/version.o .libs/verify.o .libs/encode.o .libs/config.o
> .libs/evaluate.o .libs/blkdev.o .libs/linux_version.o
> .libs/canonicalize.o .libs/md5.o -Wl,--whole-archive
> probers/.libs/libblkid_probers.a -Wl,--no-whole-archive
> -L/var/tmp/util-linux-2.16-build/lib64 -L/lib64 -luuid
> -Wl,--version-script=../../../shlibs/blkid/src/blkid.sym -Wl,-soname
> -Wl,libblkid.so.1 -o .libs/libblkid.so.1.0.0
> /usr/lib64/gcc/x86_64-suse-linux/4.4/../../../../x86_64-suse-linux/bin/ld:
> cannot find -luuid
> collect2: ld returned 1 exit status
>
> That the .so is installed in the root is really the implementation
> detail that should be hidden from anything but the ld loader on the
> system. I guess, we want to keep the original --libdir value, and use
> a --rootlibdir as it's own parameter, or something similar, and just
> move the .so image to the root with the install hook (or the spec
> file), instead of moving the devel stuff, faking the .pc files and
> patching the .la files. :)

This seems to make it work in the chroot.

It turns around the logic, and installs the libs in /usr, and moves
the .so to /, so the devel links and the .la files are not changed.

Thanks,
Kay


diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 8b1f46b..b585f0a 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS += -I$(ul_libblkid_srcdir) $(common_cflags)
blkidincdir = $(includedir)/blkid
blkidinc_HEADERS = blkid.h

-lib_LTLIBRARIES = libblkid.la
+usrlibexec_LTLIBRARIES = libblkid.la
libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \
probe.c read.c resolve.c save.c tag.c version.c verify.c \
encode.c blkid.h list.h blkidP.h probers/probers.h \
@@ -49,17 +49,15 @@ test_%: %.c
$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(common_ldadd)


-# move devel files from $(libdir) to $(usrlibexecdir) if needed
+# move lib from $(usrlibexecdir) to $(libdir) if needed
install-data-hook:
- rm $(DESTDIR)$(libdir)/$(lib_LTLIBRARIES)
if test "$(usrlibexecdir)" != "$(libdir)"; then \
- mkdir -p $(DESTDIR)$(usrlibexecdir); \
+ mkdir -p $(DESTDIR)$(libdir); \
mv $(DESTDIR)$(libdir)/libblkid.a $(DESTDIR)$(usrlibexecdir)/; \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libblkid.so); \
- rm $(DESTDIR)$(libdir)/libblkid.so; \
+ so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libblkid.so); \
so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
- ln -sf $$so_img_rel_target$(libdir)/$$so_img_name \
- $(DESTDIR)$(usrlibexecdir)/libblkid.so; \
+ ln -sf $$so_img_rel_target$(libdir)/$$so_img_name $(DESTDIR)$(usrlibexecdir)/libblkid.so; \
+ mv $(DESTDIR)$(usrlibexecdir)/libblkid.so.* $(DESTDIR)$(libdir); \
fi

uninstall-hook:
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
index fff1152..cdd51db 100644
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
@@ -10,7 +10,7 @@ tst_uuid_CFLAGS = -I$(ul_libuuid_srcdir)
uuidincdir = $(includedir)/uuid
uuidinc_HEADERS = uuid.h

-lib_LTLIBRARIES = libuuid.la
+usrlibexec_LTLIBRARIES = libuuid.la
libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \
uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
@@ -30,17 +30,15 @@ test_%: %.c
$(COMPILE) -DTEST_PROGRAM $< .libs/libuuid.a -o $@


-# move devel files from $(libdir) to $(usrlibexecdir) if needed
+# move lib from $(usrlibexecdir) to $(libdir) if needed
install-data-hook:
- rm $(DESTDIR)$(libdir)/$(lib_LTLIBRARIES)
if test "$(usrlibexecdir)" != "$(libdir)"; then \
- mkdir -p $(DESTDIR)$(usrlibexecdir); \
+ mkdir -p $(DESTDIR)$(libdir); \
mv $(DESTDIR)$(libdir)/libuuid.a $(DESTDIR)$(usrlibexecdir)/; \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libuuid.so); \
- rm $(DESTDIR)$(libdir)/libuuid.so; \
+ so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libuuid.so); \
so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
- ln -sf $$so_img_rel_target$(libdir)/$$so_img_name \
- $(DESTDIR)$(usrlibexecdir)/libuuid.so; \
+ ln -sf $$so_img_rel_target$(libdir)/$$so_img_name $(DESTDIR)$(usrlibexecdir)/libuuid.so; \
+ mv $(DESTDIR)$(usrlibexecdir)/libuuid.so.* $(DESTDIR)$(libdir); \
fi

uninstall-hook:

2009-07-03 10:53:50

by Karel Zak

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2

On Fri, Jul 03, 2009 at 11:29:41AM +0200, Kay Sievers wrote:
> On Thu, 2009-07-02 at 22:32 +0200, Kay Sievers wrote:
> This seems to make it work in the chroot.
>
> It turns around the logic, and installs the libs in /usr, and moves
> the .so to /, so the devel links and the .la files are not changed.

Yes, this is probably the best solution. (I'll also rename
usrlibexecdir, that's too confusing.)

Thanks!

Karel

--
Karel Zak <[email protected]>

2009-07-13 17:22:59

by Peter Breitenlohner

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2 -- shlib versions

On Mon, 13 Jul 2009, Peter Breitenlohner wrote:

> On Thu, 2 Jul 2009, Karel Zak wrote:
>
>> The second util-linux-ng 2.16 release candidate is available at
>>
>> ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
>>
>> Feedback and bug reports, as always, are welcomed.
>
> Hi Karel,
>
> I just tried to build util-linux-ng-2.16-rc2 (i686/x86_64 linux-gnu
> with gcc-3.4.6, libc-2.3.6), but in order to succeed I had to apply the
> attached patch (#include <stdarg.h> from shlibs/blkid/src/blkidP.h).

The choice of shared library versions from util-linux-ng-2.16-rc2:
libblkid.so.1 -> libblkid.so.1.0.0
libuuid.so.1 -> libuuid.so.1.0.0
is somewhat unfortunate, because e2fsprogs-1.41.3 has:
libblkid.so.1 -> libblkid.so.1.0
libuuid.so.1 -> libuuid.so.1.2
with the consequence that as long as the older e2fsprogs libraries are not
removed, ldconfig will create a symlink to the older libuuid from e2fsprogs
(I am not sure about the symlink for libblkid).

This problem could safely be avoided if util-linux-ng were to choose at
least libuuid.so.1.2.0 or maybe even better to be absolutely safe
libblkid.so.1.1.0 and libuuid.so.1.3.0.

Regards
Peter

2009-07-13 17:32:42

by Peter Breitenlohner

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2 -- a small patch

On Thu, 2 Jul 2009, Karel Zak wrote:

> The second util-linux-ng 2.16 release candidate is available at
>
> ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
>
> Feedback and bug reports, as always, are welcomed.

Hi Karel,

I just tried to build util-linux-ng-2.16-rc2 (i686/x86_64 linux-gnu
with gcc-3.4.6, libc-2.3.6), but in order to succeed I had to apply the
attached patch (#include <stdarg.h> from shlibs/blkid/src/blkidP.h).

Regards
Peter


Attachments:
util-linux-ng-2.16-rc2-patch (551.00 B)

2009-07-13 18:35:23

by Karel Zak

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2 -- a small patch

On Mon, Jul 13, 2009 at 07:05:19PM +0200, Peter Breitenlohner wrote:
> I just tried to build util-linux-ng-2.16-rc2 (i686/x86_64 linux-gnu
> with gcc-3.4.6, libc-2.3.6), but in order to succeed I had to apply the
> attached patch (#include <stdarg.h> from shlibs/blkid/src/blkidP.h).

Applied, thanks.

Karel

--
Karel Zak <[email protected]>

2009-07-13 22:01:45

by Karel Zak

[permalink] [raw]
Subject: Re: [ANNOUNCE] util-linux-ng v2.16-rc2 -- shlib versions

On Mon, Jul 13, 2009 at 07:22:51PM +0200, Peter Breitenlohner wrote:
> The choice of shared library versions from util-linux-ng-2.16-rc2:
> libblkid.so.1 -> libblkid.so.1.0.0
> libuuid.so.1 -> libuuid.so.1.0.0
> is somewhat unfortunate, because e2fsprogs-1.41.3 has:
> libblkid.so.1 -> libblkid.so.1.0
> libuuid.so.1 -> libuuid.so.1.2
> with the consequence that as long as the older e2fsprogs libraries are not
> removed, ldconfig will create a symlink to the older libuuid from e2fsprogs
> (I am not sure about the symlink for libblkid).
>
> This problem could safely be avoided if util-linux-ng were to choose at
> least libuuid.so.1.2.0 or maybe even better to be absolutely safe
> libblkid.so.1.1.0 and libuuid.so.1.3.0.

Fixed. See the patch below.

Karel


>From dc2b8d87c13c7d6aa4f9735ed9f21c02f241c2d4 Mon Sep 17 00:00:00 2001
From: Karel Zak <[email protected]>
Date: Mon, 13 Jul 2009 23:44:30 +0200
Subject: [PATCH] build-sys: fix libuuid and libblkid version-info

Signed-off-by: Karel Zak <[email protected]>
---
configure.ac | 14 ++++++++++++--
shlibs/blkid/src/Makefile.am | 2 +-
shlibs/uuid/src/Makefile.am | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f352f88..2e77520 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,17 @@ PACKAGE_VERSION_RELEASE=0
dnl libblkid version
LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
LIBBLKID_DATE="10-Feb-2009"
+LIBBLKID_LT_MAJOR=1
+LIBBLKID_LT_MINOR=1
+LIBBLKID_LT_MICRO=0
+LIBBLKID_VERSION_INFO=`expr $LIBBLKID_LT_MAJOR + $LIBBLKID_LT_MINOR`:$LIBBLKID_LT_MICRO:$LIBBLKID_LT_MINOR

dnl libuuid version
LIBUUID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
+LIBUUID_LT_MAJOR=1
+LIBUUID_LT_MINOR=3
+LIBUUID_LT_MICRO=0
+LIBUUID_VERSION_INFO=`expr $LIBUUID_LT_MAJOR + $LIBUUID_LT_MINOR`:$LIBUUID_LT_MICRO:$LIBUUID_LT_MINOR

# Check whether exec_prefix=/usr:
case $exec_prefix:$prefix in
@@ -259,7 +267,8 @@ AC_ARG_ENABLE([libuuid],
AS_HELP_STRING([--disable-libuuid], [do not build libuuid and uuid utilities]),
[], enable_libuuid=yes
)
-AC_SUBST(LIBUUID_VERSION)
+AC_SUBST([LIBUUID_VERSION])
+AC_SUBST([LIBUUID_VERSION_INFO])
AM_CONDITIONAL(BUILD_LIBUUID, test "x$enable_libuuid" = xyes)
have_uuid=yes

@@ -311,7 +320,8 @@ AC_ARG_ENABLE([libblkid],
AS_HELP_STRING([--disable-libblkid], [do not build libblkid and blkid utilities]),
[], enable_libblkid=yes
)
-AC_SUBST(LIBBLKID_VERSION)
+AC_SUBST([LIBBLKID_VERSION])
+AC_SUBST([LIBBLKID_VERSION_INFO])
AM_CONDITIONAL(BUILD_LIBBLKID, test "x$enable_libblkid" = xyes)
AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string])
AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index d9970d2..bd040ce 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -36,7 +36,7 @@ libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym

libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
- -version-info 1:0:0
+ -version-info $(LIBBLKID_VERSION_INFO)

tests = test_cache test_config test_dev test_devname test_devno test_getsize \
test_read test_resolve test_save test_tag test_verify test_evaluate
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
index 1272180..9af1979 100644
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
@@ -17,7 +17,7 @@ libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
libuuid_la_DEPENDENCIES = uuid.sym

libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
- -version-info 1:0:0
+ -version-info $(LIBUUID_VERSION_INFO)

EXTRA_DIST = uuid.sym gen_uuid_nt.c

--
1.6.2.2