diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 9731c9cee7..5243f3017c 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -3,10 +3,10 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="util-linux" -PKG_VERSION="2.36.1" -PKG_SHA256="09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed" +PKG_VERSION="2.37" +PKG_SHA256="bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5" PKG_LICENSE="GPL" -PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host pkg-config:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain" diff --git a/packages/sysutils/util-linux/patches/util-linux-0100-enable-lscpu.patch b/packages/sysutils/util-linux/patches/util-linux-0100-enable-lscpu.patch deleted file mode 100644 index 0185cda3aa..0000000000 --- a/packages/sysutils/util-linux/patches/util-linux-0100-enable-lscpu.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a05a294..558851d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1498,7 +1498,11 @@ UL_REQUIRES_BUILD([lsblk], [libsmartcols]) - AM_CONDITIONAL([BUILD_LSBLK], [test "x$build_lsblk" = xyes]) - - --UL_BUILD_INIT([lscpu], [check]) -+AC_ARG_ENABLE([lscpu], -+ AS_HELP_STRING([--disable-lscpu], [do not build lscpu]), -+ [], [UL_DEFAULT_ENABLE([lscpu], [check])] -+) -+UL_BUILD_INIT([lscpu]) - UL_REQUIRES_LINUX([lscpu]) - UL_REQUIRES_BUILD([lscpu], [libsmartcols]) - UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type]) diff --git a/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch b/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch deleted file mode 100644 index a28c8da68a..0000000000 --- a/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1899ec3..e4be942 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1156,7 +1156,11 @@ AS_IF([test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_uuidd" == xye - AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes]) - - --UL_BUILD_INIT([uuidgen], [check]) -+AC_ARG_ENABLE([uuidgen], -+ AS_HELP_STRING([--disable-uuidgen], [do not build uuidgen]), -+ [], [UL_DEFAULT_ENABLE([uuidgen], [check])] -+) -+UL_BUILD_INIT([uuidgen]) - UL_REQUIRES_BUILD([uuidgen], [libuuid]) - AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes]) - -@@ -1165,7 +1169,11 @@ UL_REQUIRES_BUILD([uuidparse], [libuuid]) - UL_REQUIRES_BUILD([uuidparse], [libsmartcols]) - AM_CONDITIONAL([BUILD_UUIDPARSE], [test "x$build_uuidparse" = 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]) - -@@ -1403,20 +1411,32 @@ 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]) -+AC_ARG_ENABLE([fstrim], -+ AS_HELP_STRING([--disable-fstrim], [do not build fstrim(8)]), -+ [], [UL_DEFAULT_ENABLE([fstrim], [check])] -+) -+UL_BUILD_INIT([fstrim]) - 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])