From 48eee6e821cc5c91854d74cdb73b18ebcd726133 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 5 Mar 2025 14:46:01 +0100 Subject: [PATCH] Dont be opinionated on placement of artifacts (#1304) Just provide them in teh root folder, no need for fancy things Signed-off-by: Itxaka --- packages/system/systemd/build.yaml | 14 +++++++------- packages/system/systemd/collection.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/system/systemd/build.yaml b/packages/system/systemd/build.yaml index 396a6a0..f243808 100644 --- a/packages/system/systemd/build.yaml +++ b/packages/system/systemd/build.yaml @@ -10,15 +10,15 @@ steps: # Minimal systemd build, remove almost everything, we only interested in the efi boot files - cd systemd && meson setup build -Dmode=release -Dbootloader=enabled -Defi=true -Dukify=disabled -Dblkid=disabled -Dopenssl=disabled -Dsbat-distro="Kairos" -Dsbat-distro-url="kairos.io" -Dsbat-distro-summary="Kairos" -Dsbat-distro-version="kairos-${PACKAGE_VERSION}" -Ddns-servers='' -Dsysvinit-path= -Dsysvrcnd-path= -Dtpm=true -Dinstall-tests=false -Dnss-resolve=disabled -Dlogind=false -Dcoredump=false -Dhomed=disabled -Dfirstboot=false -Dhostnamed=false -Dhibernate=false -Dinitrd=false -Dimportd=disabled -Dkernel-install=false -Dlocaled=false -Dmachined=false -Dnetworkd=false -Dnss-myhostname=false -Dnss-mymachines=disabled -Dnss-systemd=false -Doomd=false -Dportabled=false -Dhwdb=false -Dpstore=false -Dquotacheck=false -Drandomseed=false -Drepart=disabled -Dresolve=false -Drfkill=false -Dsysext=false -Danalyze=false -Dsysupdate=disabled -Dsysusers=false -Dstoragetm=false -Dtimedated=false -Dtimesyncd=false -Dtmpfiles=false -Duserdb=false -Dvconsole=false -Dxdg-autostart=false -Didn=false -Dpolkit=disabled -Dnscd=false -Dkmod=disabled -Ddbus=disabled -Dglib=disabled -Dbacklight=false -Dldconfig=false -Dgshadow=false -Dwheel-group=false -Dadm-group=false -Dxkbcommon=disabled -Dzstd=disabled -Dlz4=disabled -Dutmp=false -Dlink-udev-shared=false -Dlink-systemctl-shared=false -Dlink-networkd-shared=false -Dlink-timesyncd-shared=false -Dlink-journalctl-shared=false -Dlink-boot-shared=false -Dlink-portabled-shared=false -Denvironment-d=false -Dqrencode=disabled -Dpwquality=disabled -Dlibcurl=disabled -Dfdisk=disabled -Dlibidn2=disabled -Dlibiptc=disabled -Ddns-over-tls=false -Didn=false -Dgnutls=disabled -Dp11kit=disabled -Dlibidn=disabled -Dlibidn2=disabled -Dgcrypt=disabled -Dxz=disabled -Dzlib=disabled -Dbzip2=disabled - cd systemd && ninja -C build - - mkdir -p /package/usr/kairos/ + - mkdir -p /package/ {{ if .Values.arch }} {{ if eq .Values.arch "arm64" }} - - cp systemd/build/src/boot/efi/systemd-bootaa64.efi /package/usr/kairos/ - - cp systemd/build/src/boot/efi/linuxaa64.efi.stub /package/usr/kairos/ - - cp systemd/build/src/boot/efi/addonaa64.efi.stub /package/usr/kairos/ + - cp systemd/build/src/boot/efi/systemd-bootaa64.efi /package/ + - cp systemd/build/src/boot/efi/linuxaa64.efi.stub /package/ + - cp systemd/build/src/boot/efi/addonaa64.efi.stub /package/ {{else}} - - cp systemd/build/src/boot/efi/systemd-bootx64.efi /package/usr/kairos/ - - cp systemd/build/src/boot/efi/linuxx64.efi.stub /package/usr/kairos/ - - cp systemd/build/src/boot/efi/addonx64.efi.stub /package/usr/kairos/ + - cp systemd/build/src/boot/efi/systemd-bootx64.efi /package/ + - cp systemd/build/src/boot/efi/linuxx64.efi.stub /package/ + - cp systemd/build/src/boot/efi/addonx64.efi.stub /package/ {{end}} {{end}} diff --git a/packages/system/systemd/collection.yaml b/packages/system/systemd/collection.yaml index 2c66057..7218b94 100644 --- a/packages/system/systemd/collection.yaml +++ b/packages/system/systemd/collection.yaml @@ -1,7 +1,7 @@ packages: - name: "systemd-boot" category: "system" - version: "256.7" + version: "256.7-1" labels: github.repo: "systemd" autobump.revdeps: "true"