mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
util-linux: update to util-linux-2.27, simplifing and rework buildscript, needs a full rebuild
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
b788b2d5e4
commit
490ce24d9d
@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="util-linux"
|
||||
PKG_VERSION="2.26.2"
|
||||
PKG_VERSION="2.27"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.26/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.27/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
@ -32,63 +32,15 @@ PKG_LONGDESC="The util-linux package contains a large variety of low-level syste
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \
|
||||
UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \
|
||||
--disable-nls \
|
||||
--disable-rpath \
|
||||
--enable-tls \
|
||||
--enable-libuuid \
|
||||
--enable-libblkid \
|
||||
--enable-libmount \
|
||||
--enable-libsmartcols \
|
||||
--disable-mount \
|
||||
--enable-losetup \
|
||||
--enable-fsck \
|
||||
--disable-partx \
|
||||
--enable-uuidd \
|
||||
--disable-mountpoint \
|
||||
--disable-fallocate \
|
||||
--disable-unshare \
|
||||
--disable-nsenter \
|
||||
--disable-setpriv \
|
||||
--disable-eject \
|
||||
--disable-agetty \
|
||||
--disable-cramfs \
|
||||
--disable-bfs \
|
||||
--disable-minix \
|
||||
--disable-fdformat \
|
||||
--disable-hwclock \
|
||||
--disable-wdctl \
|
||||
--disable-switch-root \
|
||||
--disable-pivot-root \
|
||||
--enable-tunelp \
|
||||
--disable-kill \
|
||||
--enable-deprecated-last \
|
||||
--disable-last \
|
||||
--disable-utmpdump \
|
||||
--disable-line \
|
||||
--disable-mesg \
|
||||
--disable-raw \
|
||||
--disable-rename \
|
||||
--disable-reset \
|
||||
--disable-vipw \
|
||||
--disable-newgrp \
|
||||
--disable-chfn-chsh \
|
||||
--disable-all-programs \
|
||||
--enable-chsh-only-listed \
|
||||
--disable-login \
|
||||
--disable-login-chown-vcs \
|
||||
--disable-login-stat-mail \
|
||||
--disable-nologin \
|
||||
--disable-sulogin \
|
||||
--disable-su \
|
||||
--disable-runuser \
|
||||
--disable-ul \
|
||||
--disable-more \
|
||||
--disable-pg \
|
||||
--disable-setterm \
|
||||
--disable-schedutils \
|
||||
--disable-wall \
|
||||
--disable-write \
|
||||
--enable-libmount-force-mountinfo \
|
||||
--disable-bash-completion \
|
||||
--disable-colors-default \
|
||||
--disable-pylibmount \
|
||||
--disable-pg-bell \
|
||||
--disable-use-tty-group \
|
||||
@ -99,38 +51,51 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \
|
||||
--without-audit \
|
||||
--without-udev \
|
||||
--without-ncurses \
|
||||
--without-readline \
|
||||
--without-slang \
|
||||
--without-termcap \
|
||||
--without-tinfo \
|
||||
--without-utempter \
|
||||
--without-util \
|
||||
--without-libz \
|
||||
--without-user \
|
||||
--without-systemd \
|
||||
--without-smack \
|
||||
--without-python \
|
||||
--without-systemdsystemunitdir"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET \
|
||||
--enable-static \
|
||||
--disable-shared"
|
||||
PKG_CONFIGURE_OPTS_TARGET="$UTILLINUX_CONFIG_DEFAULT \
|
||||
--enable-libuuid \
|
||||
--enable-libblkid \
|
||||
--enable-libmount \
|
||||
--enable-libsmartcols \
|
||||
--enable-losetup \
|
||||
--enable-fsck \
|
||||
--enable-blkid"
|
||||
|
||||
PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET \
|
||||
--prefix=/ \
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-swapon"
|
||||
fi
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared $UTILLINUX_CONFIG_DEFAULT"
|
||||
|
||||
PKG_CONFIGURE_OPTS_INIT="--prefix=/ \
|
||||
--bindir=/bin \
|
||||
--sbindir=/sbin \
|
||||
--sysconfdir=/etc \
|
||||
--libexecdir=/lib \
|
||||
--localstatedir=/var \
|
||||
--enable-static --disable-shared"
|
||||
$UTILLINUX_CONFIG_DEFAULT \
|
||||
--enable-libblkid \
|
||||
--enable-libmount \
|
||||
--enable-fsck"
|
||||
|
||||
if [ "$INITRAMFS_PARTED_SUPPORT" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_INIT --enable-mkfs --enable-libuuid"
|
||||
fi
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
rm -rf $INSTALL/usr/sbin
|
||||
rm -rf $INSTALL/usr/share
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp .libs/blkid $INSTALL/usr/sbin
|
||||
cp .libs/fsck $INSTALL/usr/sbin
|
||||
cp .libs/losetup $INSTALL/usr/sbin
|
||||
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
cp .libs/swapon $INSTALL/usr/sbin
|
||||
cp .libs/swapoff $INSTALL/usr/sbin
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/openelec
|
||||
cp -PR $PKG_DIR/scripts/mount-swap $INSTALL/usr/lib/openelec
|
||||
|
||||
@ -142,24 +107,6 @@ post_makeinstall_target() {
|
||||
fi
|
||||
}
|
||||
|
||||
post_makeinstall_init() {
|
||||
rm -rf $INSTALL/bin
|
||||
rm -rf $INSTALL/sbin
|
||||
|
||||
if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then
|
||||
# install libuuid and libblkid here, needed by 'parted'
|
||||
rm -rf $INSTALL/lib/libmount.so*
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp mkfs $INSTALL/sbin
|
||||
else
|
||||
rm -rf $INSTALL/lib
|
||||
fi
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp fsck $INSTALL/sbin
|
||||
}
|
||||
|
||||
post_install () {
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
enable_service swap.service
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
|
||||
--- util-linux-2.27/configure.ac 2015-09-07 09:59:25.000000000 +0200
|
||||
+++ util-linux-2.27.patch/configure.ac 2015-09-10 10:53:17.284448191 +0200
|
||||
@@ -1055,7 +1055,11 @@
|
||||
UL_REQUIRES_BUILD([uuidgen], [libuuid])
|
||||
AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes])
|
||||
|
||||
-UL_BUILD_INIT([blkid], [check])
|
||||
+AC_ARG_ENABLE([blkid],
|
||||
+ AS_HELP_STRING([--disable-blkid], [do not build blkid(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([blkid], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([blkid])
|
||||
UL_REQUIRES_BUILD([blkid], [libblkid])
|
||||
AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes])
|
||||
|
||||
@@ -1242,21 +1246,26 @@
|
||||
UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
|
||||
AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
|
||||
|
||||
-
|
||||
-UL_BUILD_INIT([mkfs], [yes])
|
||||
+AC_ARG_ENABLE([mkfs],
|
||||
+ AS_HELP_STRING([--disable-mkfs], [do not build mkfs(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([mkfs], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([mkfs])
|
||||
AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes])
|
||||
|
||||
UL_BUILD_INIT([isosize], [yes])
|
||||
AM_CONDITIONAL([BUILD_ISOSIZE], [test "x$build_isosize" = xyes])
|
||||
|
||||
-
|
||||
UL_BUILD_INIT([fstrim], [check])
|
||||
UL_REQUIRES_LINUX([fstrim])
|
||||
UL_REQUIRES_BUILD([fstrim], [libmount])
|
||||
AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes])
|
||||
|
||||
-
|
||||
-UL_BUILD_INIT([swapon], [check])
|
||||
+AC_ARG_ENABLE([swapon],
|
||||
+ AS_HELP_STRING([--disable-swapon], [do not build swapon(8) and swapoff(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([swapon], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([swapon])
|
||||
UL_REQUIRES_LINUX([swapon])
|
||||
UL_REQUIRES_BUILD([swapon], [libblkid])
|
||||
UL_REQUIRES_BUILD([swapon], [libmount])
|
||||
Loading…
x
Reference in New Issue
Block a user