From e52c1d9b5a4a930f6d557b7ac23720b0a14e6632 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@ariadne.space>
Date: Mon, 11 Dec 2023 11:35:56 -0800
Subject: [PATCH] systemd: put libsystemd back in /lib, use meson pipelines
 fully

Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
---
 systemd.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/systemd.yaml b/systemd.yaml
index fd06cffb890..f82d80cb485 100644
--- a/systemd.yaml
+++ b/systemd.yaml
@@ -1,7 +1,7 @@
 package:
   name: systemd
   version: "255"
-  epoch: 1
+  epoch: 2
   description: The systemd System and Service Manager
   copyright:
     - license: LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -37,12 +37,14 @@ pipeline:
 
   - uses: meson/configure
 
-  - runs: |
-      meson setup build/
-      ninja -C build/
+  - uses: meson/compile
 
   - uses: meson/install
 
+  - runs: |
+      mkdir -p ${{targets.destdir}}/lib
+      mv ${{targets.destdir}}/usr/lib/libsystemd.so* ${{targets.destdir}}/lib/
+
 subpackages:
   - name: "systemd-dev"
     description: "headers for systemd"
@@ -53,8 +55,8 @@ subpackages:
     description: "systemd library"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib
-          mv ${{targets.destdir}}/usr/lib/libsystemd.so* ${{targets.subpkgdir}}/usr/lib
+          mkdir -p ${{targets.subpkgdir}}/lib
+          mv ${{targets.destdir}}/lib/libsystemd.so.* ${{targets.subpkgdir}}/lib
 
 update:
   enabled: true