diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index ed27f8f66d..d09617f224 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -3,13 +3,13 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="util-linux" -PKG_VERSION="2.39.3" -PKG_SHA256="7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" +PKG_VERSION="2.41" +PKG_SHA256="81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6" PKG_LICENSE="GPL" 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" +PKG_DEPENDS_TARGET="autotools:host gcc:host" +PKG_DEPENDS_INIT="autotools:host gcc:host" PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="+pic:host" @@ -56,7 +56,8 @@ PKG_CONFIGURE_OPTS_TARGET="${UTILLINUX_CONFIG_DEFAULT} \ --enable-blkid \ --enable-lscpu \ --enable-lsfd \ - --enable-mount" + --enable-mount \ + --enable-nologin" if [ "${SWAP_SUPPORT}" = "yes" ]; then PKG_CONFIGURE_OPTS_TARGET+=" --enable-swapon" @@ -85,14 +86,14 @@ post_makeinstall_target() { cp -PR ${PKG_DIR}/scripts/mount-swap ${INSTALL}/usr/lib/libreelec mkdir -p ${INSTALL}/etc - cat ${PKG_DIR}/config/swap.conf | \ + cat ${PKG_DIR}/config/swap.conf | sed -e "s,@SWAPFILESIZE@,${SWAPFILESIZE},g" \ -e "s,@SWAP_ENABLED_DEFAULT@,${SWAP_ENABLED_DEFAULT},g" \ - > ${INSTALL}/etc/swap.conf + >${INSTALL}/etc/swap.conf fi } -post_install () { +post_install() { if [ "${SWAP_SUPPORT}" = "yes" ]; then enable_service swap.service fi diff --git a/packages/sysutils/util-linux/scripts/mount-swap b/packages/sysutils/util-linux/scripts/mount-swap index e02a39f3a0..6ecdef3891 100755 --- a/packages/sysutils/util-linux/scripts/mount-swap +++ b/packages/sysutils/util-linux/scripts/mount-swap @@ -11,12 +11,12 @@ if [ -f /storage/.config/swap.conf ]; then . /storage/.config/swap.conf fi -if [ -e /dev/.storage_netboot ] ; then +if [ -e /dev/.storage_netboot ]; then logger -t Boot "### netbooting... swap disabled ###" exit 0 fi -if [ ! "${SWAP_ENABLED}" = "yes" ] ; then +if [ ! "${SWAP_ENABLED}" = "yes" ]; then logger -t Boot "### swap disabled via configfile ###" exit 0 fi