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

util-linux: update to 2.22.1.

Browse source
This commit is contained in:
Juan RP 2012-10-12 12:32:37 +02:00
parent f7033a0613
commit 13af8a76dd
5 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
srcpkgs/util-linux/libblkid-devel.template
View file

@ -1,6 +1,7 @@
# Template file for 'libblkid-devel'.
#
depends="zlib-devel libuuid-devel>=$version libblkid>=$version"
noarch=yes
depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
short_desc="libblkid development files"
long_desc="
libblkid contains a library to handle device identification
@ -8,10 +9,8 @@ long_desc="
This package contains files for development, headers, static libs, etc."
do_install()
{
do_install() {
vmove usr/include/blkid usr/include
vmove usr/lib/libblkid.a usr/lib
vmove usr/lib/pkgconfig/blkid.pc usr/lib/pkgconfig
vmove usr/share/man/man3/libblkid.3 usr/share/man/man3
}

7
srcpkgs/util-linux/libmount-devel.template
View file

@ -1,6 +1,7 @@
# Template file for 'libmount-devel'.
#
depends="libuuid-devel>=$version libblkid-devel>=$version libmount>=$version"
noarch=yes
depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
short_desc="mount(8) library development files"
long_desc="
This NEW LIBRARY is designed to be used in low-level utils like
@ -9,10 +10,8 @@ long_desc="
This packages contains files for development, static files, headers, etc."
do_install()
{
do_install() {
mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
mv ${SRCPKGDESTDIR}/usr/lib/libmount.a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/*mount* ${DESTDIR}/usr/lib/pkgconfig
mv ${SRCPKGDESTDIR}/usr/include/libmount ${DESTDIR}/usr/include
}

7
srcpkgs/util-linux/libuuid-devel.template
View file

@ -1,6 +1,7 @@
# Template file for 'libuuid-devel'.
#
depends="libuuid>=$version"
noarch=yes
depends="libuuid-${version}_${revision}"
short_desc="UUID library development files"
long_desc="
libuuid generates and parses 128-bit universally unique id's (UUIDs).
@ -8,9 +9,7 @@ long_desc="
This packages contains files for development, static files, headers, etc."
do_install()
{
vmove usr/lib/libuuid.a usr/lib
do_install() {
vmove usr/lib/pkgconfig usr/lib
vmove usr/include usr
vmove usr/share/man/man3 usr/share/man

27
srcpkgs/util-linux/patches/localstatedir-mess.patch
View file

@ -1,27 +0,0 @@
--- configure.orig 2012-07-27 11:11:26.767603020 +0200
+++ configure 2012-07-27 11:12:15.692451582 +0200
@@ -3383,23 +3383,7 @@ $as_echo "$as_me: --libdir defaults to
esac ;;
esac
-case $prefix:$localstatedir in
- NONE:'${prefix}/var')
- localstatedir=/run
- { $as_echo "$as_me:${as_lineno-$LINENO}: --localstatedir defaults to /run" >&5
-$as_echo "$as_me: --localstatedir defaults to /run" >&6;}
- ;;
- *:'${prefix}/var')
- localstatedir=${prefix}/run
- ;;
- NONE:*)
- ;;
- *:*)
- localstatedir=${prefix}/${localstatedir}
- ;;
-esac
-
-
+localstatedir=/run
libdirname=`basename "$libdir"`

7
srcpkgs/util-linux/template
View file

@ -1,6 +1,6 @@
# Template file for 'util-linux'
pkgname=util-linux
version=2.22
version=2.22.1
revision=1
depends="coreutils shadow>=4.1.5.1_3"
makedepends="pkg-config zlib-devel ncurses-devel pam-devel"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.22/${pkgname}-${version}.tar.xz"
checksum=32b329aa72c2ea546378bf81f08e30cf30440196c2edf7777b4f509a3fdbe5a2
checksum=c6de9f59882d7adedc2d2e7fdb940e8cdb256080491f632cabe7edde5764d82f
long_desc="
The ${pkgname} package contains miscellaneous utility programs. Among
them are utilities for handling file systems, consoles, partitions,
@ -21,7 +21,6 @@ long_desc="
# Create uuidd system account for uuidd.
system_accounts="uuidd"
uuidd_homedir="/run/uuidd"
systemd_services="uuidd.socket on"
conf_files="
@ -39,7 +38,7 @@ do_configure() {
--enable-vipw --enable-newgrp --enable-chfn-chsh \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--without-udev --enable-write --disable-kill \
--enable-socket-activation \
--enable-socket-activation --disable-static \
SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
}