From 9f85b0878f307141bd5ca57a0e3500409219115c Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 6 Feb 2022 14:45:21 +0000 Subject: made changes to acpid --- repo/util/acpi.xibuild | 22 +++++----------------- repo/util/pciutils.xibuild | 3 ++- repo/util/sudo.xibuild | 1 + 3 files changed, 8 insertions(+), 18 deletions(-) (limited to 'repo/util') diff --git a/repo/util/acpi.xibuild b/repo/util/acpi.xibuild index ff720a4..c09792d 100644 --- a/repo/util/acpi.xibuild +++ b/repo/util/acpi.xibuild @@ -1,29 +1,17 @@ #!/bin/bash MAKEDEPS=(make) -DEPS=(glibc) +DEPS=(glibc acpid) -PKG_VER=2.0.33 -SOURCE=https://downloads.sourceforge.net/acpid2/acpid-$PKG_VER.tar.xz +PKG_VER=1.7 +SOURCE=https://downloads.sourceforge.net/acpiclient/acpi-$PKG_VER.tar.gz DESC="Client for battery, power, and thermal readings" -BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( - https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) - build () { - ./configure --prefix=/usr \ - --docdir=/usr/share/doc/acpid-$PKG_VER && + ./configure --prefix=/usr make } package () { - make DESTDIR=$PKG_DEST install - install -v -m755 -d $PKG_DEST/etc/acpi/events && - cp -r samples $PKG_DEST/usr/share/doc/acpid-$PKG_VER - - tar xf $BOOTSCRIPTS.tar.xz - cd $BOOTSCRIPTS - make DESTDIR=$PKG_DEST install-acpid + make -C "acpi-$PKG_VER" DESTDIR"=$PKG_DEST" install } diff --git a/repo/util/pciutils.xibuild b/repo/util/pciutils.xibuild index 421dbd9..b10c4e3 100644 --- a/repo/util/pciutils.xibuild +++ b/repo/util/pciutils.xibuild @@ -14,13 +14,14 @@ build () { } package () { - make DESTDIR=$PKG_DEST + make DESTDIR=$PKG_DEST \ PREFIX=/usr \ SHAREDIR=/usr/share/hwdata \ SHARED=yes \ install install-lib && chmod -v 755 $PKG_DEST/usr/lib/libpci.so + mkdir -pv $PKG_DEST/etc/cron.weekly/ cat > $PKG_DEST/etc/cron.weekly/update-pciids.sh << "EOF" && #!/bin/bash /usr/sbin/update-pciids diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild index a613ccb..f1d220f 100644 --- a/repo/util/sudo.xibuild +++ b/repo/util/sudo.xibuild @@ -28,6 +28,7 @@ Defaults secure_path="/usr/sbin:/usr/bin" %wheel ALL=(ALL) ALL EOF + mkdir -pv $PKG_DEST/etc/pam.d cat > $PKG_DEST/etc/pam.d/sudo << "EOF" # Begin /etc/pam.d/sudo -- cgit v1.2.1