diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2024-03-04 17:53:58 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-03-04 22:43:49 -0700 |
| commit | 6eb0138f54e050369c11247905239c06a29388af (patch) | |
| tree | c0856497b7d107d1925bb8414148384ddd2fe2e0 | |
| parent | 8d0b1aa9dd3e627eb1e965cd0be75be8ed7d3289 (diff) | |
libre/systemd: Don't disable systemd-boot on ARM
| -rw-r--r-- | libre/systemd/.SRCINFO | 3 | ||||
| -rw-r--r-- | libre/systemd/PKGBUILD | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libre/systemd/.SRCINFO b/libre/systemd/.SRCINFO index f320087f2..bac65a4c8 100644 --- a/libre/systemd/.SRCINFO +++ b/libre/systemd/.SRCINFO @@ -29,6 +29,7 @@ pkgbase = systemd makedepends = python-lxml makedepends = quota-tools makedepends = shadow + makedepends = gnu-efi-libs makedepends = git makedepends = meson makedepends = libseccomp @@ -107,8 +108,6 @@ pkgbase = systemd sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc sha512sums = a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3 sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97 - makedepends_x86_64 = gnu-efi-libs - makedepends_i686 = gnu-efi-libs makedepends_i686 = pkgconf pkgname = systemd diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 57284fe27..eb4528386 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -94,9 +94,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync' 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls') -makedepends=(${makedepends[*]/gnu-efi-libs}) # don't include on non-x86 (FIXME(lukeshu): why not on ARM, EFI is a thing there) -makedepends_i686=('gnu-efi-libs' 'pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686? -makedepends_x86_64=('gnu-efi-libs') +makedepends_i686=('pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686? options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> @@ -226,6 +224,7 @@ build() { -Dmode=release -Dbpf-framework=true + -Dgnu-efi=true -Dima=false -Dlibidn2=true -Dlz4=true @@ -255,11 +254,6 @@ build() { -Dsbat-distro-version="${pkgver}" -Dsbat-distro-url="https://www.parabola.nu/packages/libre/${CARCH}/${pkgname}/" ) - if [ "$CARCH" != "armv7h" ]; then - # FIXME(lukeshu): Why do we turn off -Dgnu-efi on ARM? EFI is a - # thing on ARM. - _meson_options+=(-Dgnu-efi=true) - fi arch-meson "$pkgbase-stable" build "${_meson_options[@]}" |