diff --git a/pkg.info b/pkg.info index 7bd8918..44ccabe 100644 --- a/pkg.info +++ b/pkg.info @@ -1,22 +1,32 @@ name: util-linux description: Linux system utilities version: 2.41.3 -revision: 1 +revision: 2 url: https://github.com/util-linux/util-linux license: GPL2 architecture: any type: source depends: + - coreutils + - file - glibc - libcap + - libudev + - libutempter + - libxcrypt - ncurses - pam + - readline - shadow - - udev - zlib make_depends: - - libxcrypt - - readline + - asciidoctor + - bash-completion + - cryptsetup + - meson + - python3 + - sqlite + - udev downloads: - url: https://github.com/util-linux/util-linux/archive/refs/tags/v${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} diff --git a/source.sh b/source.sh index 421d3cf..5a6eaa3 100644 --- a/source.sh +++ b/source.sh @@ -2,42 +2,30 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -# The prepare function is executed in the root of the temp directory -# This function is used for putting downloaded files to the correct location or applying patches -prepare() { - cd "$BPM_SOURCE" - ./autogen.sh -} - # The build function is executed in the source directory # This function is used to compile the source code build() { - ./configure --bindir=/usr/bin \ - --libdir=/usr/lib \ - --runstatedir=/run \ - --sbindir=/usr/sbin \ - --disable-chfn-chsh \ - --disable-login \ - --disable-nologin \ - --disable-su \ - --disable-setpriv \ - --disable-runuser \ - --disable-pylibmount \ - --disable-liblastlog2 \ - --disable-static \ - --without-python \ - --without-systemd \ - --without-systemdsystemunitdir \ - ADJTIME_PATH=/var/lib/hwclock/adjtime \ - --docdir=/usr/share/doc/util-linux - make + meson setup --prefix=/usr \ + -Dfs-search-path=/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin \ + -Dsystemd=disabled \ + -Dlibuser=disabled \ + -Dlibutempter=enabled \ + -Dncurses=disabled \ + -Dncursesw=enabled \ + -Deconf=disabled \ + -Dbuild-chfn-chsh=enabled \ + -Dbuild-line=disabled \ + -Dbuild-mesg=enabled \ + -Dbuild-newgrp=enabled \ + -Dbuild-vipw=enabled \ + -Dbuild-write=enabled \ + build + meson compile -C build } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - make check-programs - cd tests SHELL=/bin/sh ./run.sh --exclude="kill/decode" # kill/decode test fails with bash 5.3 } @@ -45,7 +33,9 @@ check() { # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - make DESTDIR="$BPM_OUTPUT" install + meson install -C build --destdir="$BPM_OUTPUT" + + # Create missing hwclock directory install -d "$BPM_OUTPUT"/var/lib/hwclock/ # Install package license