summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-09-08 14:09:04 -0400
committergraysky2020-09-08 14:09:04 -0400
commitf7d93de066166824a7716aa700a0b81f22d773f9 (patch)
treedbdf8740933eda8c2698feccbbfa3e80a247b79d
parent8f6c0cb833c4a85ddaeff610a8d969bc40529d6b (diff)
downloadaur-f7d93de066166824a7716aa700a0b81f22d773f9.tar.gz
Update to 10.2.0.20200823-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--sysusers.conf2
3 files changed, 5 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea3149ecdea..d3a08fc763d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = distccd-alarm
pkgdesc = Official toolchain for Arch ARM builds via distcc on x86_64 volunteers
pkgver = 10.2.0.20200823
- pkgrel = 1
+ pkgrel = 2
url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling
arch = x86_64
license = GPL
@@ -20,7 +20,6 @@ pkgbase = distccd-alarm
source = config.in
source = service.in
source = readme.in
- source = sysusers.conf
md5sums = 87150475eb6e533f1a84ba3fc9a73e37
md5sums = 9e1c82ac8badc286f40d7d22e475e1b2
md5sums = 7015421efcdac437de27769a421a10a2
@@ -28,7 +27,6 @@ pkgbase = distccd-alarm
md5sums = 89694ceb3a0fb07413ffef810173ee55
md5sums = 26741c886597e3fd8d8fc0a61aa8a49a
md5sums = da6ee5bb971d28b85e49d456a3889349
- md5sums = cc2464a203444bb9287849d6773e544c
pkgname = distccd-alarm-armv5
diff --git a/PKGBUILD b/PKGBUILD
index f296f6d1e95..a24005e4df3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=("${_subarchs[@]/#/$pkgbase-}")
_date=20200823
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=10.2.0.$_date
-pkgrel=1
+pkgrel=2
_pkgrel_upstream=1
#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel"
_URL="https://archlinuxarm.org/builder/xtools"
@@ -23,7 +23,7 @@ source=(
"x-tools6h-$_date.tar.xz::$_URL/x-tools6h.tar.xz"
"x-tools7h-$_date.tar.xz::$_URL/x-tools7h.tar.xz"
"x-tools8-$_date.tar.xz::$_URL/x-tools8.tar.xz"
-'config.in' 'service.in' 'readme.in' 'sysusers.conf'
+'config.in' 'service.in' 'readme.in'
)
noextract=(
"x-tools-$_date.tar.xz"
@@ -38,8 +38,7 @@ md5sums=('87150475eb6e533f1a84ba3fc9a73e37'
'6e5060bc78f9c62746e9d2b23668583b'
'89694ceb3a0fb07413ffef810173ee55'
'26741c886597e3fd8d8fc0a61aa8a49a'
- 'da6ee5bb971d28b85e49d456a3889349'
- 'cc2464a203444bb9287849d6773e544c')
+ 'da6ee5bb971d28b85e49d456a3889349')
build() {
# setup config and services
@@ -86,8 +85,7 @@ _package_subarch() {
install -d "${pkgdir}/opt"
bsdtar -x --uid 0 --gid 0 -f "${srcdir}/$2-$_date.tar.xz" -C "${pkgdir}/opt"
- # FS#67629
- install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd-$1.conf"
+ # FS#67629 - since distcc is a dependency there is no need to provide a sysuser.d config
# install services
install -Dm644 "${srcdir}/distccd-$1.service" \
diff --git a/sysusers.conf b/sysusers.conf
deleted file mode 100644
index c026a443481..00000000000
--- a/sysusers.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-g distcc - -
-u distcc - "distcc user" /usr/bin/nologin