chroot-util-linux: update to 2.24 and make this build with musl.
This commit is contained in:
parent
4eff817659
commit
a1d0a1d6f3
3 changed files with 24 additions and 20 deletions
1
srcpkgs/chroot-util-linux/patches
Symbolic link
1
srcpkgs/chroot-util-linux/patches
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../util-linux/patches
|
|
@ -1,8 +1,11 @@
|
||||||
# Template file for 'chroot-util-linux'
|
# Template file for 'chroot-util-linux'
|
||||||
pkgname=chroot-util-linux
|
pkgname=chroot-util-linux
|
||||||
version=2.21
|
version=2.24
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="util-linux-${version}"
|
wrksrc="${pkgname/chroot-/}-${version}"
|
||||||
|
bootstrap=yes
|
||||||
|
conflicts="util-linux>=0"
|
||||||
|
provides="util-linux-${version}_${revision}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--without-ncurses --without-udev --disable-libuuid
|
configure_args="--without-ncurses --without-udev --disable-libuuid
|
||||||
--disable-libblkid --disable-libmount --disable-mount --disable-losetup
|
--disable-libblkid --disable-libmount --disable-mount --disable-losetup
|
||||||
|
@ -14,15 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
|
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
distfiles="${KERNEL_SITE}/utils/util-linux/v2.21/util-linux-${version}.tar.xz"
|
distfiles="${KERNEL_SITE}/utils/util-linux/v2.21/util-linux-${version}.tar.xz"
|
||||||
checksum=5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
|
checksum=30add9a8869cef9e5a76755214f074689b6294cea63f4569711faeb099aecc06
|
||||||
long_desc="
|
|
||||||
The util-linux package contains miscellaneous utility programs. Among
|
|
||||||
them are utilities for handling file systems, consoles, partitions,
|
|
||||||
and messages.
|
|
||||||
|
|
||||||
This package is only meant to be used by xbps-src, don't install it manually."
|
|
||||||
|
|
||||||
bootstrap=yes
|
|
||||||
|
|
||||||
if [ -z "$CHROOT_READY" ]; then
|
if [ -z "$CHROOT_READY" ]; then
|
||||||
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
|
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
|
||||||
|
@ -36,12 +31,3 @@ post_install() {
|
||||||
rm -rf ${DESTDIR}/usr/sbin
|
rm -rf ${DESTDIR}/usr/sbin
|
||||||
rm -rf ${DESTDIR}/usr/share/man
|
rm -rf ${DESTDIR}/usr/share/man
|
||||||
}
|
}
|
||||||
|
|
||||||
chroot-util-linux_package() {
|
|
||||||
conflicts="util-linux>=0"
|
|
||||||
provides="util-linux-${version}"
|
|
||||||
replaces="chroot-gnu-getopt>=0"
|
|
||||||
pkg_install() {
|
|
||||||
vmove usr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
17
srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch
Normal file
17
srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
TIMESPEC_TO_TIMEVAL is a macro defined by glibc.
|
||||||
|
|
||||||
|
--- sys-utils/dmesg.c.orig 2014-01-07 21:40:23.490421172 +0100
|
||||||
|
+++ sys-utils/dmesg.c 2014-01-07 21:41:22.419080539 +0100
|
||||||
|
@@ -35,6 +35,12 @@
|
||||||
|
#include "mangle.h"
|
||||||
|
#include "pager.h"
|
||||||
|
|
||||||
|
+#ifndef TIMESPEC_TO_TIMEVAL
|
||||||
|
+#define TIMESPEC_TO_TIMEVAL(tv, ts) { \
|
||||||
|
+ (tv)->tv_sec = (ts)->tv_sec; \
|
||||||
|
+ (tv)->tv_usec = (ts)->tv_nsec / 1000; \
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
/* Close the log. Currently a NOP. */
|
||||||
|
#define SYSLOG_ACTION_CLOSE 0
|
||||||
|
/* Open the log. Currently a NOP. */
|
Loading…
Reference in a new issue