jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: update to 2.31

Browse Source
This commit is contained in:
Lukas Rusak 2017-10-09 16:26:25 -07:00
parent 127a0ea45d
commit b9866fc439
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/sysutils/util-linux/package.mk
View File

@ -17,11 +17,11 @@
################################################################################ ################################################################################
PKG_NAME="util-linux" PKG_NAME="util-linux"
PKG_VERSION="2.29.2" PKG_VERSION="2.31"
PKG_SHA256="accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3" PKG_SHA256="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.29/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%-*}/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST="toolchain" PKG_DEPENDS_HOST="toolchain"
PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_INIT="toolchain" PKG_DEPENDS_INIT="toolchain"

26
packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch
View File

@ -1,7 +1,7 @@
diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac diff -Naur a/configure.ac b/configure.ac
--- util-linux-2.27/configure.ac 2015-09-07 09:59:25.000000000 +0200 --- a/configure.ac 2017-10-03 08:53:23.956354391 -0700
+++ util-linux-2.27.patch/configure.ac 2015-09-12 10:35:53.576532786 +0200 +++ b/configure.ac 2017-10-09 16:39:14.213671977 -0700
@@ -1051,11 +1051,19 @@ @@ -1156,7 +1156,11 @@
AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes]) AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes])
@ -14,6 +14,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
UL_REQUIRES_BUILD([uuidgen], [libuuid]) UL_REQUIRES_BUILD([uuidgen], [libuuid])
AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes]) AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes])
@@ -1165,7 +1169,11 @@
UL_REQUIRES_BUILD([uuidparse], [libsmartcols])
AM_CONDITIONAL([BUILD_UUIDPARSE], [test "x$build_uuidparse" = xyes])
-UL_BUILD_INIT([blkid], [check]) -UL_BUILD_INIT([blkid], [check])
+AC_ARG_ENABLE([blkid], +AC_ARG_ENABLE([blkid],
+ AS_HELP_STRING([--disable-blkid], [do not build blkid(8)]), + AS_HELP_STRING([--disable-blkid], [do not build blkid(8)]),
@ -23,11 +27,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
UL_REQUIRES_BUILD([blkid], [libblkid]) UL_REQUIRES_BUILD([blkid], [libblkid])
AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes]) AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes])
@@ -1242,21 +1250,26 @@ @@ -1403,7 +1411,11 @@
UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes]) AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
-
-UL_BUILD_INIT([mkfs], [yes]) -UL_BUILD_INIT([mkfs], [yes])
+AC_ARG_ENABLE([mkfs], +AC_ARG_ENABLE([mkfs],
+ AS_HELP_STRING([--disable-mkfs], [do not build mkfs(8)]), + AS_HELP_STRING([--disable-mkfs], [do not build mkfs(8)]),
@ -37,15 +40,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes]) AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes])
UL_BUILD_INIT([isosize], [yes]) UL_BUILD_INIT([isosize], [yes])
AM_CONDITIONAL([BUILD_ISOSIZE], [test "x$build_isosize" = xyes]) @@ -1416,7 +1428,11 @@
-
UL_BUILD_INIT([fstrim], [check])
UL_REQUIRES_LINUX([fstrim])
UL_REQUIRES_BUILD([fstrim], [libmount])
AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes]) AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes])
-
-UL_BUILD_INIT([swapon], [check]) -UL_BUILD_INIT([swapon], [check])
+AC_ARG_ENABLE([swapon], +AC_ARG_ENABLE([swapon],
+ AS_HELP_STRING([--disable-swapon], [do not build swapon(8) and swapoff(8)]), + AS_HELP_STRING([--disable-swapon], [do not build swapon(8) and swapoff(8)]),