From 3aaaad17cb479b448a42cf5dfba289a6b7f690b9 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 30 May 2025 09:03:14 +0200 Subject: [PATCH] systemd/abuild: remove The abuild package has been forked to temp/abuild and extra-repos/systemd/abuild in the past. The systemd one is legacy from the initial systemd repo bootstrap method that is currently broken and will be replaced soon (see MR 6440). While the new one is not ready yet, this package is currently not useful so remove it to fix the failing upstream-compat check (currently it is on a different version than temp/abuild). [ci:skip-vercheck]: just removing a comment in temp/abuild Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6573 [ci:skip-build]: already built successfully in CI --- extra-repos/systemd/abuild/APKBUILD | 107 ------------------ extra-repos/systemd/abuild/abuild.pre-install | 5 - extra-repos/systemd/abuild/abuild.pre-upgrade | 1 - temp/abuild/APKBUILD | 4 - 4 files changed, 117 deletions(-) delete mode 100644 extra-repos/systemd/abuild/APKBUILD delete mode 100644 extra-repos/systemd/abuild/abuild.pre-install delete mode 120000 extra-repos/systemd/abuild/abuild.pre-upgrade diff --git a/extra-repos/systemd/abuild/APKBUILD b/extra-repos/systemd/abuild/APKBUILD deleted file mode 100644 index 1a7c059e0..000000000 --- a/extra-repos/systemd/abuild/APKBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# Forked from Alpine to add systemd-service support -# HACK: pma#3452: this is now in temp/abuild AND extra-repos/systemd/abuild for -# initial systemd bringup. Until this is resolved, make changes to both -# APKBUILDs at once. - -pkgname=abuild -pkgver=99993.15.0_rc3 -_pkgver=3.15.0_rc3 -_commit="ea2f884eba612f2e27a750241501e35b2d859234" -pkgrel=0 -pkgdesc="Script to build Alpine Packages" -url="https://git.alpinelinux.org/cgit/abuild/" -arch="all" -license="GPL-2.0-only" -depends="fakeroot scanelf openssl>3 apk-tools>=2.0.7-r1 libc-utils - attr tar pkgconf patch lzip curl libcap-getcap" -makedepends="openssl-dev>3 zlib-dev pkgconfig scdoc" -checkdepends="kyua git" -install="$pkgname.pre-install $pkgname.pre-upgrade" -subpackages=" - apkbuild-cpan:cpan:noarch - apkbuild-gem-resolver:gems:noarch - apkbuild-pypi:pypi:noarch - abuild-rootbld:_rootbld:noarch - $pkgname-doc - " -options="suid !check" # tests are SLOW in qemu -pkggroups="abuild" -source=" - https://gitlab.alpinelinux.org/postmarketOS/abuild/-/archive/$_commit/abuild-$_commit.tar.gz - " -builddir="$srcdir/$pkgname-$_commit" - -build() { - make VERSION="$_pkgver-r$pkgrel" -} - -check() { - make check -} - -package() { - make install VERSION="$_pkgver-r$pkgrel" DESTDIR="$pkgdir" - - install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf - - case "$CARCH" in - x86*|ppc64le) - # binutils only supports it here - cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF - - # binutils ld.bfd supports this on this architecture; default to it - export RUSTFLAGS="\$RUSTFLAGS -Clink-arg=-Wl,-z,pack-relative-relocs" - export LDFLAGS="\$LDFLAGS -Wl,-z,pack-relative-relocs" - EOF - esac - - case "$CARCH" in - x86_64) - # https://lists.alpinelinux.org/~alpine/devel/%3C1628515011.zujvcn248v.none%40localhost%3E - # note that this is x86-exclusive. on other architectures, this is pretty much always bad - # https://github.com/rust-lang/rust/pull/106380 - cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF - - # -fno-plt has very slight improvements to general code size and speed on x86-only, - # for the common system dynamic linking case - export CFLAGS="\$CFLAGS -fno-plt" - export CXXFLAGS="\$CXXFLAGS -fno-plt" - EOF - ;; - esac - - install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles -} - -cpan() { - pkgdesc="Script to generate perl APKBUILD from CPAN" - depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny - perl-lwp-protocol-https" - - amove usr/bin/apkbuild-cpan -} - -gems() { - pkgdesc="APKBUILD dependency resolver for RubyGems" - depends="ruby ruby-augeas" - - amove usr/bin/apkbuild-gem-resolver -} - -pypi() { - pkgdesc="Script to generate python3 APKBUILD from PYPI" - depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https - perl-ipc-system-simple" - - amove usr/bin/apkbuild-pypi -} - -_rootbld() { - pkgdesc="Build packages in chroot" - depends="abuild bubblewrap cmd:envsubst git" - mkdir -p "$subpkgdir" -} - -sha512sums=" -fafaff1015229c42c4486461897b94e36b98c44d462c816f59a8c04dd501070f23f921a610158c8bb04e163dbb2d1588e093e82c34af70073280e4dc5691b01f abuild-ea2f884eba612f2e27a750241501e35b2d859234.tar.gz -" diff --git a/extra-repos/systemd/abuild/abuild.pre-install b/extra-repos/systemd/abuild/abuild.pre-install deleted file mode 100644 index fd3d39a36..000000000 --- a/extra-repos/systemd/abuild/abuild.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -addgroup -S abuild 2>/dev/null - -exit 0 diff --git a/extra-repos/systemd/abuild/abuild.pre-upgrade b/extra-repos/systemd/abuild/abuild.pre-upgrade deleted file mode 120000 index 99e4a2144..000000000 --- a/extra-repos/systemd/abuild/abuild.pre-upgrade +++ /dev/null @@ -1 +0,0 @@ -abuild.pre-install \ No newline at end of file diff --git a/temp/abuild/APKBUILD b/temp/abuild/APKBUILD index d8f5f6c7e..367ff9a6c 100644 --- a/temp/abuild/APKBUILD +++ b/temp/abuild/APKBUILD @@ -1,8 +1,4 @@ # Forked from Alpine to add systemd-service support -# HACK: pma#3452: this is now in temp/abuild AND extra-repos/systemd/abuild for -# initial systemd bringup. Until this is resolved, make changes to both -# APKBUILDs at once. - pkgname=abuild pkgver=99993.15.0 _pkgver=3.15.0