jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util-linux-ng, libuuid, libblkid: update to 2.17.

Browse source 
--HG--
extra : convert_revision : 8df14f008026b1489cbceb384f47b811ceecf89f
This commit is contained in:
Juan RP 2010-02-17 04:04:58 +01:00
parent bdb3610156
commit 37462ec65f
5 changed files with 17 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/libblkid/libblkid-devel.template
View file

@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run zlib-devel
Add_dependency run libuuid-devel
Add_dependency run libblkid

6
srcpkgs/libblkid/template
View file

@ -1,14 +1,14 @@
# Template file for 'libblkid'
pkgname=libblkid
version=2.16.2
version=2.17
_utilng=util-linux-ng
wrksrc=${_utilng}-${version}
distfiles="${KERNEL_SITE}/utils/$pkgname/v2.16/${_utilng}-${version}.tar.bz2"
distfiles="${KERNEL_SITE}/utils/$pkgname/v2.17/${_utilng}-${version}.tar.bz2"
build_style=gnu_configure
configure_args="--disable-libuuid --enable-libblkid"
short_desc="Library to handle device identification"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
checksum=8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3
long_desc="
The libblkid package contains a library to handle device identification
and token extraction."

6
srcpkgs/libuuid/template
View file

@ -1,15 +1,15 @@
# Template file for 'libuuid'
pkgname=libuuid
version=2.16.2
version=2.17
_utilng=util-linux-ng
wrksrc=${_utilng}-${version}
distfiles="${KERNEL_SITE}/utils/${_utilng}/v2.16/${_utilng}-${version}.tar.bz2"
distfiles="${KERNEL_SITE}/utils/${_utilng}/v2.17/${_utilng}-${version}.tar.bz2"
build_style=gnu_configure
configure_args="--disable-mount --disable-fsck --enable-libuuid
--disable-libblkid"
short_desc="UUID library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
checksum=8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3
long_desc="
libuuid generates and parses 128-bit universally unique id's (UUIDs).
See RFC 4122 for more information,"

134
srcpkgs/util-linux-ng/patches/build_blkid_uuid_utils.diff
View file

@ -1,134 +0,0 @@
Build blkid and findfs and link with -lblkid.
Build uuidd and uuidgen and link with -luuid.
--- misc-utils/Makefile.in.orig 2009-07-16 01:17:47.000000000 +0200
+++ misc-utils/Makefile.in 2009-08-12 11:54:16.836456343 +0200
@@ -48,13 +48,13 @@ usrbin_exec_PROGRAMS = cal$(EXEEXT) ddat
look$(EXEEXT) mcookie$(EXEEXT) namei$(EXEEXT) script$(EXEEXT) \
whereis$(EXEEXT) scriptreplay$(EXEEXT) $(am__EXEEXT_4) \
$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7)
-@BUILD_LIBUUID_TRUE@am__append_1 = uuidgen
-@BUILD_LIBUUID_TRUE@am__append_2 = uuidgen.1
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@am__append_3 = uuidd
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@am__append_4 = uuidd.8
-@BUILD_LIBBLKID_TRUE@am__append_5 = blkid findfs
-@BUILD_LIBBLKID_TRUE@am__append_6 = blkid.8 findfs.8
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@am__append_7 = blkid.static
+am__append_1 = uuidgen
+am__append_2 = uuidgen.1
+am__append_3 = uuidd
+am__append_4 = uuidd.8
+am__append_5 = blkid findfs
+am__append_6 = blkid.8 findfs.8
+am__append_7 = blkid.static
@HAVE_NCURSES_TRUE@@LINUX_TRUE@am__append_8 = setterm
@HAVE_NCURSES_TRUE@@LINUX_TRUE@am__append_9 = setterm.1
@BUILD_KILL_TRUE@am__append_10 = kill
@@ -85,27 +85,27 @@ am__installdirs = "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(usrbin_execdir)" "$(DESTDIR)$(usrsbin_execdir)" \
"$(DESTDIR)$(usrbin_execdir)" "$(DESTDIR)$(usrbin_execdir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-@BUILD_LIBBLKID_TRUE@am__EXEEXT_2 = blkid$(EXEEXT) findfs$(EXEEXT)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@am__EXEEXT_3 = blkid.static$(EXEEXT)
-@BUILD_LIBUUID_TRUE@am__EXEEXT_4 = uuidgen$(EXEEXT)
+am__EXEEXT_2 = blkid$(EXEEXT) findfs$(EXEEXT)
+am__EXEEXT_3 = blkid.static$(EXEEXT)
+am__EXEEXT_4 = uuidgen$(EXEEXT)
@HAVE_NCURSES_TRUE@@LINUX_TRUE@am__EXEEXT_5 = setterm$(EXEEXT)
@BUILD_RENAME_TRUE@am__EXEEXT_6 = rename$(EXEEXT)
@BUILD_WRITE_TRUE@am__EXEEXT_7 = write$(EXEEXT)
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@am__EXEEXT_8 = uuidd$(EXEEXT)
+am__EXEEXT_8 = uuidd$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(usrbin_exec_PROGRAMS) \
$(usrsbin_exec_PROGRAMS)
blkid_SOURCES = blkid.c
blkid_OBJECTS = blkid-blkid.$(OBJEXT)
-@BUILD_LIBBLKID_TRUE@blkid_DEPENDENCIES = $(ul_libblkid_la)
+blkid_DEPENDENCIES = -lblkid
blkid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(blkid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am__blkid_static_SOURCES_DIST = blkid.c
am__objects_1 = blkid_static-blkid.$(OBJEXT)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@am_blkid_static_OBJECTS = \
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@ $(am__objects_1)
+am_blkid_static_OBJECTS = \
+ $(am__objects_1)
blkid_static_OBJECTS = $(am_blkid_static_OBJECTS)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@blkid_static_DEPENDENCIES = $(ul_libblkid_la)
+blkid_static_DEPENDENCIES = -lblkid
blkid_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(blkid_static_CFLAGS) \
$(CFLAGS) $(blkid_static_LDFLAGS) $(LDFLAGS) -o $@
@@ -117,7 +117,7 @@ ddate_OBJECTS = ddate.$(OBJEXT)
ddate_LDADD = $(LDADD)
findfs_SOURCES = findfs.c
findfs_OBJECTS = findfs-findfs.$(OBJEXT)
-@BUILD_LIBBLKID_TRUE@findfs_DEPENDENCIES = $(ul_libblkid_la)
+findfs_DEPENDENCIES = -lblkid
findfs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(findfs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -151,14 +151,13 @@ setterm_OBJECTS = setterm.$(OBJEXT)
setterm_DEPENDENCIES =
uuidd_SOURCES = uuidd.c
uuidd_OBJECTS = uuidd-uuidd.$(OBJEXT)
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@uuidd_DEPENDENCIES = \
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@ $(ul_libuuid_la)
+uuidd_DEPENDENCIES = -luuid
uuidd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(uuidd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
uuidgen_SOURCES = uuidgen.c
uuidgen_OBJECTS = uuidgen-uuidgen.$(OBJEXT)
-@BUILD_LIBUUID_TRUE@uuidgen_DEPENDENCIES = $(ul_libuuid_la)
+uuidgen_DEPENDENCIES = -luuid
uuidgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(uuidgen_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -388,12 +387,12 @@ dist_noinst_DATA = $(dist_man_MANS)
# blkid
ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
-ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
+ul_libblkid_la = -lblkid
# uuid
ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
-ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
+ul_libuuid_la = -luuid
EXTRA_DIST = README.flushb uuidd.rc README.cal README.ddate \
README.namei README.namei2 README.reset reset.033c
mcookie_SOURCES = mcookie.c ../lib/md5.c
@@ -404,18 +403,18 @@ dist_man_MANS = cal.1 chkdupexe.1 ddate.
$(am__append_4) $(am__append_6) $(am__append_9) \
$(am__append_11) $(am__append_13) $(am__append_14) \
$(am__append_16)
-@BUILD_LIBUUID_TRUE@uuidgen_LDADD = $(ul_libuuid_la)
-@BUILD_LIBUUID_TRUE@uuidgen_CFLAGS = -I$(ul_libuuid_srcdir)
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@uuidd_LDADD = $(ul_libuuid_la)
-@BUILD_LIBUUID_TRUE@@BUILD_UUIDD_TRUE@uuidd_CFLAGS = -I$(ul_libuuid_srcdir)
-@BUILD_LIBBLKID_TRUE@blkid_LDADD = $(ul_libblkid_la)
-@BUILD_LIBBLKID_TRUE@blkid_CFLAGS = -I$(ul_libblkid_srcdir)
-@BUILD_LIBBLKID_TRUE@findfs_LDADD = $(ul_libblkid_la)
-@BUILD_LIBBLKID_TRUE@findfs_CFLAGS = -I$(ul_libblkid_srcdir)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@blkid_static_SOURCES = $(blkid_SOURCES)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@blkid_static_LDFLAGS = "-all-static" # libtool option
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@blkid_static_LDADD = $(ul_libblkid_la)
-@BUILD_LIBBLKID_TRUE@@HAVE_STATIC_BLKID_TRUE@blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
+uuidgen_LDADD = $(ul_libuuid_la)
+uuidgen_CFLAGS = -I$(ul_libuuid_srcdir)
+uuidd_LDADD = $(ul_libuuid_la)
+uuidd_CFLAGS = -I$(ul_libuuid_srcdir)
+blkid_LDADD = $(ul_libblkid_la)
+blkid_CFLAGS = -I$(ul_libblkid_srcdir)
+findfs_LDADD = $(ul_libblkid_la)
+findfs_CFLAGS = -I$(ul_libblkid_srcdir)
+blkid_static_SOURCES = $(blkid_SOURCES)
+blkid_static_LDFLAGS = "-all-static" # libtool option
+blkid_static_LDADD = $(ul_libblkid_la) $(ul_libuuid_la)
+blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
@HAVE_NCURSES_FALSE@@HAVE_TERMCAP_TRUE@@HAVE_TINFO_FALSE@cal_LDADD = -ltermcap
@HAVE_NCURSES_TRUE@@HAVE_TINFO_FALSE@cal_LDADD = @NCURSES_LIBS@
@HAVE_TINFO_TRUE@cal_LDADD = -ltinfo @NCURSES_LIBS@

19
srcpkgs/util-linux-ng/template
View file

@ -1,14 +1,13 @@
# Template file for 'util-linux-ng'
pkgname=util-linux-ng
version=2.16.2
revision=1
distfiles="${KERNEL_SITE}/utils/$pkgname/v2.16/$pkgname-$version.tar.bz2"
version=2.17
distfiles="${KERNEL_SITE}/utils/$pkgname/v2.17/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-partx --enable-write --disable-libuuid
--disable-libblkid --disable-fsck"
configure_args="--enable-partx --enable-write --enable-libuuid
--enable-libblkid --disable-fsck --disable-rpath --with-gnu-ld"
short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
checksum=8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3
long_desc="
The util-linux-ng package contains miscellaneous utility programs. Among
them are utilities for handling file systems, consoles, partitions,
@ -22,13 +21,13 @@ Add_dependency run coreutils
Add_dependency run zlib
Add_dependency run libuuid
Add_dependency run libblkid
Add_dependency run ncurses-libs
Add_dependency run ncursesw
Add_dependency build pkg-config
Add_dependency build gettext
Add_dependency build zlib-devel
Add_dependency build libuuid-devel
Add_dependency build libblkid-devel
Add_dependency build ncurses-devel
Add_dependency build ncursesw-devel
post_configure()
{
@ -40,6 +39,10 @@ post_configure()
post_install()
{
# Remove stuff provided by libuuid and libblkid.
rm -rf ${DESTDIR}/usr/lib ${DESTDIR}/usr/include \
${DESTDIR}/lib ${DESTDIR}/usr/share/man/man3
# Move logger to /bin.
install -d -m 755 ${DESTDIR}/bin
mv ${DESTDIR}/usr/bin/logger ${DESTDIR}/bin