Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / abuild
Commits:
3cded6b9 by Robin Candau at 2024-10-13T22:32:45+02:00
upgpkg: 3.13.0-5 Add a patch and instructions to allow running `abuild rootbld`
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- + abuild.install
- + allow_running_abuild_rootbld.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,8 +1,9 @@
pkgbase = abuild
pkgdesc = Alpine build tools
pkgver = 3.13.0
- pkgrel = 4
+ pkgrel = 5
url = https://git.alpinelinux.org/abuild
+ install = abuild.install
arch = x86_64
license = GPL-2.0-or-later
makedepends = zlib
@@ -20,6 +21,7 @@ pkgbase = abuild
depends = bubblewrap
depends = gettext
depends = git
+ optdepends = alpine-keyring: to build packages
optdepends = perl: for cpan resolver
optdepends = perl-libwww: for cpan resolver
optdepends = perl-json: for cpan resolver
@@ -30,7 +32,9 @@ pkgbase = abuild
backup = etc/abuild.conf
source =
https://gitlab.alpinelinux.org/alpine/abuild/-/archive/3.13.0/abuild-3.13.0.tar.gz
source = abuild.tmpfiles
+ source = allow_running_abuild_rootbld.patch
sha512sums =
9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da
sha512sums =
3fc94f88e572a46005eabbca97b3950a56c1026b320c2c8b137e1757cda9f97cc7fa35832574ccbd872efe5a39d6725e685d1fda6af4175e4594951cc89e3cb8
+ sha512sums =
88a972802934f2d3e8440ff3de0ce9c3d2a4b4215244cea0508ff453c48fe1064749339ee1d24f196cec96ae2a9a396b8587adabeceeec155f10ed101d3b7677
pkgname = abuild
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=abuild
pkgver=3.13.0
-pkgrel=4
+pkgrel=5
pkgdesc="Alpine build tools"
url="https://git.alpinelinux.org/abuild";
arch=('x86_64')
@@ -20,10 +20,18 @@ optdepends=('alpine-keyring: to build packages'
'ruby: for gem resolver'
'ruby-augeas: for gem resolver')
backup=("etc/${pkgname}.conf")
+install="${pkgname}.install"
source=("https://gitlab.alpinelinux.org/alpine/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
- "${pkgname}.tmpfiles")
+ "${pkgname}.tmpfiles"
+ allow_running_abuild_rootbld.patch)
sha512sums=('9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da'
-
'3fc94f88e572a46005eabbca97b3950a56c1026b320c2c8b137e1757cda9f97cc7fa35832574ccbd872efe5a39d6725e685d1fda6af4175e4594951cc89e3cb8')
+
'3fc94f88e572a46005eabbca97b3950a56c1026b320c2c8b137e1757cda9f97cc7fa35832574ccbd872efe5a39d6725e685d1fda6af4175e4594951cc89e3cb8'
+
'88a972802934f2d3e8440ff3de0ce9c3d2a4b4215244cea0508ff453c48fe1064749339ee1d24f196cec96ae2a9a396b8587adabeceeec155f10ed101d3b7677')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 < "${srcdir}/allow_running_abuild_rootbld.patch"
+}
build() {
cd "${pkgname}-${pkgver}"
=====================================
abuild.install
=====================================
@@ -0,0 +1,12 @@
+post_install() {
+ cat <<EOM
+:: To be able to build packages in a clean chroot with "abuild rootbld", you
need to install the "alpine-keyring" package.
+ You also need to create the "abuild" group and add your user to it
(requires a logout / login to take effect):
+ # groupadd -g 300 abuild
+ # usermod -aG abuild your_user
+EOM
+}
+
+post_upgrade() {
+ post_install
+}
=====================================
allow_running_abuild_rootbld.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/abuild.in b/abuild.in
+index 9177ab7..a7bac35 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -2495,8 +2495,6 @@ rootbld() {
+ return
+ fi
+
+- $APK info -eq abuild-rootbld || die "rootbld: abuild-rootbld package
not installed"
+-
+ [ $CBUILD = $CHOST ] || die "rootbld: set CBUILD=$CHOST to build for
$CHOST"
+
+ local qarch cachedir=/etc/apk/cache
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/abuild/-/commit/3cded6b92430e483ac7166eaf0d1f08a02a8e9cf
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/abuild/-/commit/3cded6b92430e483ac7166eaf0d1f08a02a8e9cf
You're receiving this email because of your account on gitlab.archlinux.org.
