diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | gcc-13.patch | 12 | ||||
| -rw-r--r-- | mkinitcpio-pba.conf | 1 | ||||
| -rw-r--r-- | mkinitcpio-rescue.conf | 1 | ||||
| -rw-r--r-- | sedutil-mkimg.sh | 5 |
6 files changed, 32 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = sedutil-ladar pkgdesc = TCG OPAL 2.00 SED Management Program. ladar's fork, SHA512 variant pkgver = 1.16.0 - pkgrel = 4 + pkgrel = 5 url = https://github.com/ladar/sedutil install = sedutil.install arch = x86_64 @@ -13,6 +13,7 @@ pkgbase = sedutil-ladar backup = etc/sedutil/sedutil-sleep.conf source = https://github.com/ladar/sedutil/releases/download/1.16.0/sedutil-1.16.0-SHA512.tar.gz source = show_asterisk.patch + source = gcc-13.patch source = sedutil-mkimg.sh source = mkinitcpio-pba.conf source = mkinitcpio-rescue.conf @@ -26,9 +27,10 @@ pkgbase = sedutil-ladar source = sedutil-sleep.service sha256sums = e31fdfdc9d57f8bc63652bca5abe0468be145b6f5d5a215ce34b666cf9893f84 sha256sums = c192b82c7ce0080e920e805a05b49b0cca4692467b9d716e6c5fcbf8f2a9463c - sha256sums = 8f1e5c43e70382cef32a9fe888d7aba71c8cceecd9c045c492746a85a200ab17 - sha256sums = fa4729c0922f07f6349567bfb11e62f4c25f117da191a4d8caa684dcd1bde502 - sha256sums = 74bf3b603cd62a571626a6238c48354c9d0448d05039fb02e412cce7829dbf30 + sha256sums = 5a576f2401258fcac3de90dd3a4b3496d0867e1513bc2cbde4263d8a636f6f6c + sha256sums = 21350ae1ce66ec44d10931471d6fac7780530742120a8836c6c2826753e4f8b1 + sha256sums = d0ba87d38805e3d7c69feaac96a50c1c08d371dc059447569bc0d1fb351cf638 + sha256sums = 2a8e44163be138a4f6404239dbbd857947af7be1113f30f41ecf7186daf7c6b6 sha256sums = d9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447 sha256sums = c4ac3b9e9572138e3599b953418a246da0f41ec28dc2edd67867abbb011a47ac sha256sums = eb734a57b48964be9a703250215532c25b33d38510766ef571a1999100095bfc @@ -3,7 +3,7 @@ pkgname=sedutil-ladar _pkgname=sedutil pkgver=1.16.0 -pkgrel=4 +pkgrel=5 pkgdesc="TCG OPAL 2.00 SED Management Program. ladar's fork, SHA512 variant" arch=(x86_64) url=https://github.com/ladar/sedutil @@ -16,6 +16,7 @@ backup=(etc/sedutil/sedutil-sleep.conf) install=sedutil.install source=("$url/releases/download/$pkgver/$_pkgname-$pkgver-SHA512.tar.gz" show_asterisk.patch + gcc-13.patch sedutil-mkimg.sh mkinitcpio-pba.conf mkinitcpio-rescue.conf @@ -29,9 +30,10 @@ source=("$url/releases/download/$pkgver/$_pkgname-$pkgver-SHA512.tar.gz" sedutil-sleep.service) sha256sums=('e31fdfdc9d57f8bc63652bca5abe0468be145b6f5d5a215ce34b666cf9893f84' 'c192b82c7ce0080e920e805a05b49b0cca4692467b9d716e6c5fcbf8f2a9463c' - '8f1e5c43e70382cef32a9fe888d7aba71c8cceecd9c045c492746a85a200ab17' - 'fa4729c0922f07f6349567bfb11e62f4c25f117da191a4d8caa684dcd1bde502' - '74bf3b603cd62a571626a6238c48354c9d0448d05039fb02e412cce7829dbf30' + '5a576f2401258fcac3de90dd3a4b3496d0867e1513bc2cbde4263d8a636f6f6c' + '21350ae1ce66ec44d10931471d6fac7780530742120a8836c6c2826753e4f8b1' + 'd0ba87d38805e3d7c69feaac96a50c1c08d371dc059447569bc0d1fb351cf638' + '2a8e44163be138a4f6404239dbbd857947af7be1113f30f41ecf7186daf7c6b6' 'd9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447' 'c4ac3b9e9572138e3599b953418a246da0f41ec28dc2edd67867abbb011a47ac' 'eb734a57b48964be9a703250215532c25b33d38510766ef571a1999100095bfc' @@ -44,7 +46,9 @@ sha256sums=('e31fdfdc9d57f8bc63652bca5abe0468be145b6f5d5a215ce34b666cf9893f84' prepare() { cd $_pkgname-$pkgver # disable visual feedback - patch -p1 -i "$srcdir"/show_asterisk.patch + patch -Np1 -i "$srcdir"/show_asterisk.patch + # fix compilation with GCC 13 + patch -Np1 -i "$srcdir"/gcc-13.patch } build() { diff --git a/gcc-13.patch b/gcc-13.patch new file mode 100644 index 000000000000..69ec28c44389 --- /dev/null +++ b/gcc-13.patch @@ -0,0 +1,12 @@ +# Fix compilation with GCC 13 +--- a/Common/DtaOptions.h ++++ b/Common/DtaOptions.h +@@ -21,6 +21,8 @@ along with sedutil. If not, see <http:/ + #ifndef _DTAOPTIONS_H + #define _DTAOPTIONS_H + ++#include <cstdint> ++ + /** Output modes */ + typedef enum _sedutiloutput { + sedutilNormal, diff --git a/mkinitcpio-pba.conf b/mkinitcpio-pba.conf index 97fec3e58562..f412e8acdaa5 100644 --- a/mkinitcpio-pba.conf +++ b/mkinitcpio-pba.conf @@ -4,3 +4,4 @@ FILES=() HOOKS=(base udev keyboard autodetect block keymap sedutil-pba) COMPRESSION=zstd COMPRESSION_OPTIONS=(-16) +MODULES_DECOMPRESS=yes diff --git a/mkinitcpio-rescue.conf b/mkinitcpio-rescue.conf index 647bf3c5175c..7d0fc55d0a70 100644 --- a/mkinitcpio-rescue.conf +++ b/mkinitcpio-rescue.conf @@ -4,3 +4,4 @@ FILES=() HOOKS=(base udev keyboard autodetect block keymap sedutil-rescue) COMPRESSION=zstd COMPRESSION_OPTIONS=(-16) +MODULES_DECOMPRESS=yes diff --git a/sedutil-mkimg.sh b/sedutil-mkimg.sh index 2a750cbd0dcf..724b38f0028b 100644 --- a/sedutil-mkimg.sh +++ b/sedutil-mkimg.sh @@ -11,7 +11,7 @@ IMGSIZE=64M # Partition label PARTLABEL=SEDUTIL # Kernel image -KERNEL=$(find /usr/lib/modules -type f -name vmlinuz -print -quit) +KERNEL=$(find /usr/lib/modules -type f -name vmlinuz -print | sort | head -n1) # Required packages DEPENDS=(gptfdisk syslinux) @@ -35,7 +35,7 @@ package() { local img=${buildtype}.img # generate initramfs - mkinitcpio -c /usr/share/sedutil/mkinitcpio-"${buildtype}".conf -g initramfs-"${buildtype}".img >/dev/null + mkinitcpio -k ${KERNEL} -c /usr/share/sedutil/mkinitcpio-"${buildtype}".conf -g initramfs-"${buildtype}".img >/dev/null # create a GPT image with an EFI system partition truncate -s $IMGSIZE "$img" sgdisk -n 0:0:0 -t 0:ef00 "$img" >/dev/null @@ -61,6 +61,7 @@ echo '==> Checking requirements' check pkgdir=$(mktemp -d) mkdir -p "$pkgdir"; chmod 755 "$pkgdir"; cd "$pkgdir" +echo "Using kernel: $KERNEL" echo '==> Creating pre-boot authentication image' package pba echo '==> Creating rescue image' |