From 703eaff622ef6d41d50d04aa3a9b1e8af3906efd Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sun, 22 Oct 2023 10:33:02 +0200
Subject: [PATCH] ostree: sorted through dependencies

 - new dependency: grub2, as it previously built its own stub for grub-mkconfig
 - dropped hard dependency: avahi, moved to optional
 - new optional: dracut, libsodium
---
 ostree/.footprint |  6 +++++-
 ostree/.signature |  6 +++---
 ostree/Pkgfile    | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ostree/.footprint b/ostree/.footprint
index c9f4c0a16..7e30ea316 100644
--- a/ostree/.footprint
+++ b/ostree/.footprint
@@ -1,3 +1,6 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/grub.d/
+lrwxrwxrwx	root/root	etc/grub.d/15_ostree -> /usr/lib/ostree/libostree/grub2-15_ostree
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ostree
@@ -45,7 +48,8 @@ lrwxrwxrwx	root/root	usr/lib/libostree-1.so -> libostree-1.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libostree-1.so.1 -> libostree-1.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libostree-1.so.1.0.0
 drwxr-xr-x	root/root	usr/lib/ostree/
--rwxr-xr-x	root/root	usr/lib/ostree/ostree-grub-generator
+drwxr-xr-x	root/root	usr/lib/ostree/libostree/
+-rwxr-xr-x	root/root	usr/lib/ostree/libostree/grub2-15_ostree
 -rwxr-xr-x	root/root	usr/lib/ostree/ostree-prepare-root
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/ostree-1.pc
diff --git a/ostree/.signature b/ostree/.signature
index 740f38957..4de472d13 100644
--- a/ostree/.signature
+++ b/ostree/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38kFQ+vcVT/SkR6gp7M7LbUKjlNZbuMPIT+GNoNjKISpnAfUuCAAfs3PyXoFfPYBOdZnR4AsPYw9E72zv/IwqQo=
-SHA256 (Pkgfile) = 65811e469b92545d0f9fd7088861a0d2b024c5665f6e0cd924a1f24ef093920a
-SHA256 (.footprint) = d9580ba42c0e4b13357f48a8a1aa453e470e1797f4168f73468805d32d30d861
+RWSagIOpLGJF311h0tRyAicOtCPSnxKYpR+3cIjTDqoH8qo/v5NBrH+jIV6mJcsZc90Ymliwr9Z0HWhFuH1fdStKRVbcDqjSpgA=
+SHA256 (Pkgfile) = 6e1c74070e5e77d1aa8917780159e13fcf05a43b21bd614085aa91b7a0814938
+SHA256 (.footprint) = 0c901ac98b9d1ad8fb1763a7b5e6e61fd5aa20f177ec7ee8589de69433cb59c4
 SHA256 (libostree-2023.7.tar.xz) = 19cda718705f7ac8c018c939c38b1bb8412deaaa04862da98cd9fe9243f073bf
diff --git a/ostree/Pkgfile b/ostree/Pkgfile
index 35a7ee0d1..21e0d4488 100644
--- a/ostree/Pkgfile
+++ b/ostree/Pkgfile
@@ -1,27 +1,35 @@
 # Description: Operating system and container binary deployment and upgrades
 # URL: https://ostree.readthedocs.org/en/latest/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: avahi fuse gpgme keyutils libsoup
-# Optional: docbook-xsl
+# Depends on: fuse3 gpgme grub2 keyutils libsoup
+# Optional: avahi brotli docbook-xsl dracut libsodium
 
 name=ostree
 version=2023.7
-release=1
+release=2
 source=(https://github.com/ostreedev/ostree/releases/download/v$version/libostree-$version.tar.xz)
 
 build() {
+  prt-get isinst avahi || PKGMK_OSTREE+=' --without-avahi'
   prt-get isinst docbook-xsl && PKGMK_OSTREE+=' --enable-man=yes' || PKGMK_OSTREE+=' --enable-man=no'
+  prt-get isinst dracut && PKGMK_OSTREE+=' --with-dracut=yesbutnoconf'
+  prt-get isinst libsodium && PKGMK_OSTREE+=' --with-ed25519-libsodium'
 
   cd lib$name-$version
+
   ./configure $PKGMK_OSTREE \
     --prefix=/usr \
     --libexecdir=/usr/lib/$name \
     --with-openssl \
-    --with-builtin-grub2-mkconfig \
+    --with-modern-grub \
+    --with-grub2-mkconfig-path=/usr/bin/grub-mkconfig \
     --enable-experimental-api \
     --disable-static
   make
   make DESTDIR=$PKG install
 
+  install -d -m0755 $PKG/etc
+  mv $PKG/usr/etc/grub.d $PKG/etc
+
   rm -fr $PKG/usr/share/ostree/trusted.gpg.d/README-gpg
 }