diff options
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | PKGBUILD | 62 | ||||
| -rw-r--r-- | config.in | 2 | ||||
| -rw-r--r-- | readme.in | 20 | ||||
| -rw-r--r-- | service.in | 2 |
5 files changed, 54 insertions, 63 deletions
@@ -1,34 +1,27 @@ pkgbase = distccd-alarm - pkgdesc = Toolchain for Arch ARM builds via distcc on x86_64 volunteers - pkgver = 8.3.0 + pkgdesc = Official toolchain for Arch ARM builds via distcc on x86_64 volunteers + pkgver = 12.1.0.20220530 pkgrel = 1 - url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling + url = https://github.com/graysky2/distccd-alarm arch = x86_64 license = GPL depends = distcc + noextract = x-tools7h-20220530.tar.xz + noextract = x-tools8-20220530.tar.xz options = libtool options = emptydirs options = !strip - source = x-tools-20190909.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools.tar.xz - source = x-tools6h-20190909.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools6h.tar.xz - source = x-tools7h-20190909.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools7h.tar.xz - source = x-tools8-20190909.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools8.tar.xz + source = x-tools7h-20220530.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools7h.tar.xz + source = x-tools8-20220530.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools8.tar.xz source = config.in source = service.in source = readme.in - md5sums = 8b93708e0f7ef971b01b71dfedaffe40 - md5sums = 8b8c261c91f11545f4b54b0bddaf1db1 - md5sums = 856aa3e81afda734deff8fb2848d5760 - md5sums = 56c435708efe81dcf0e668907219c3ed - md5sums = 89694ceb3a0fb07413ffef810173ee55 - md5sums = 7e664f8ce386f467f1a7381c9ac3c06f - md5sums = da6ee5bb971d28b85e49d456a3889349 - -pkgname = distccd-alarm-armv5 - -pkgname = distccd-alarm-armv6h + md5sums = 18ae923647b6d543a8b2a446a07d910c + md5sums = 368d04d810f15aa42d7cefe20ae910f7 + md5sums = 6bd0313f391b8c21d9ba1eae88026bf7 + md5sums = 26741c886597e3fd8d8fc0a61aa8a49a + md5sums = 9219b50ec9dce99aed3cca88a584c835 pkgname = distccd-alarm-armv7h pkgname = distccd-alarm-armv8 - @@ -1,47 +1,44 @@ -# Maintainer: graysky <graysky AT archlinux DOT us> +# Maintainer: graysky <therealgraysky AT protonmail DOT com> # Contributor: Jason Plum <jplum@archlinuxarm.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> -_subarchs=(armv5 armv6h armv7h armv8) -_pkgrel_upstream=1 pkgbase='distccd-alarm' +_subarchs=(armv7h armv8) pkgname=("${_subarchs[@]/#/$pkgbase-}") -_date=20190909 -# inspect source tarball under $name/share/gcc-x.y.z -pkgver=8.3.0 +_date=20220530 +pkgver=12.1.0.$_date pkgrel=1 +_URL="https://archlinuxarm.org/builder/xtools" +#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel" arch=('x86_64') license=('GPL' ) -pkgdesc="Toolchain for Arch ARM builds via distcc on x86_64 volunteers" -url="https://archlinuxarm.org/wiki/Distcc_Cross-Compiling" +pkgdesc="Official toolchain for Arch ARM builds via distcc on x86_64 volunteers" +url="https://github.com/graysky2/distccd-alarm" depends=('distcc') options=('libtool' 'emptydirs' '!strip') -#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel" -_URL="https://archlinuxarm.org/builder/xtools" source=( -"x-tools-$_date.tar.xz::$_URL/x-tools.tar.xz" -"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' ) +noextract=( +"x-tools7h-$_date.tar.xz" +"x-tools8-$_date.tar.xz" +) #PKGEXT='.pkg.tar' -md5sums=('8b93708e0f7ef971b01b71dfedaffe40' - '8b8c261c91f11545f4b54b0bddaf1db1' - '856aa3e81afda734deff8fb2848d5760' - '56c435708efe81dcf0e668907219c3ed' - '89694ceb3a0fb07413ffef810173ee55' - '7e664f8ce386f467f1a7381c9ac3c06f' - 'da6ee5bb971d28b85e49d456a3889349') +md5sums=('18ae923647b6d543a8b2a446a07d910c' + '368d04d810f15aa42d7cefe20ae910f7' + '6bd0313f391b8c21d9ba1eae88026bf7' + '26741c886597e3fd8d8fc0a61aa8a49a' + '9219b50ec9dce99aed3cca88a584c835') build() { # setup config and services - _path=('' '6h' '7h' '8') - _name=('arm-unknown-linux-gnueabi' 'arm-unknown-linux-gnueabihf' - 'arm-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnu') - _port=('3633' '3634' '3635' '3636') + _path=('7h' '8') + _name=('arm-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnu') + _port=('3635' '3636') - for i in 0 1 2 3; do + for i in 0 1; do # make service units sed "s/@VERS@/${_subarchs[$i]}/" <service.in >"distccd-${_subarchs[$i]}.service" @@ -55,7 +52,7 @@ build() { # make readme.install sed -e "s/@VERS@/${_subarchs[$i]}/g" \ -e "s/@PORT@/${_port[$i]}/g" \ - <readme.in >../"${_subarchs[$i]}".install + <readme.in >${startdir}/"${_subarchs[$i]}".install done } @@ -68,25 +65,30 @@ _package_subarch() { # install symlink to distccd install -d "${pkgdir}/usr/bin" ln -sf /usr/bin/distccd "${pkgdir}/usr/bin/distccd-$1" + # install whitelist for toolchain new for v3.3 install -d "${pkgdir}/usr/lib/distcc" - for bin in c++ cc cpp g++ gcc; do + for bin in c++ cc clang clang++ cpp g++ gcc; do ln -sf /usr/bin/distcc "${pkgdir}/usr/lib/distcc/$3-$bin" done - # copy in toolchain + + # install toolchain install -d "${pkgdir}/opt" - cp -a "${srcdir}/$2" "${pkgdir}/opt" + bsdtar -x --uid 0 --gid 0 -f "${srcdir}/$2-$_date.tar.xz" -C "${pkgdir}/opt" + + # 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" \ "${pkgdir}/usr/lib/systemd/system/distccd-$1.service" + # install config install -Dm644 "${srcdir}/distccd-$1.conf" \ "${pkgdir}/etc/conf.d/distccd-$1" } for i in "${!_subarchs[@]}"; do - _bins=('arm-unknown-linux-gnueabi' 'armv6l-unknown-linux-gnueabihf' - 'armv7l-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnu') + _bins=('armv7l-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnu') _xtoolsdir="${source[i]##*/}" _xtoolsdir="${_xtoolsdir%%.*}" eval 'package_distccd-alarm-'${_subarchs[i]}'() { diff --git a/config.in b/config.in index 50d4bb1755e3..6581253e3558 100644 --- a/config.in +++ b/config.in @@ -6,4 +6,4 @@ # PATH=/opt/x-tools@VERS@/@PATH@/bin:$PATH -DISTCC_ARGS="--allow 127.0.0.1 --port @PORT@ --nice 19 --log-file /tmp/distccd-@LOG@.log" +DISTCC_ARGS="--allow-private --log-level info --log-file /tmp/distccd-@LOG@.log --port @PORT@" diff --git a/readme.in b/readme.in index f75af65e0b8a..0788c52f07a3 100644 --- a/readme.in +++ b/readme.in @@ -1,15 +1,11 @@ - post_install() { - echo '--> This package expects your @VERS@ device to run distccd on port @PORT@' - echo '--> Adjust DISTCC_ARGS in /etc/conf.d/distccd on your @VERS@ device to match this' - echo '--> ie: DISTCC_ARGS=" ... --port @PORT@ ..."' - echo '--> Remember to define the new port in DISTCC_HOSTS in /etc/makepkg.conf as well' - echo '--> ie: DISTCC_HOSTS="localhost:@PORT@ foo:@PORT@ bar:@PORT@"' -} + cat <<END + +>>> This package expects your @VERS@ device to run distccd on port @PORT@ + Adjust DISTCC_ARGS in /etc/conf.d/distccd on your @VERS@ device to match this + ie: DISTCC_ARGS=" ... --port @PORT@ ..." + Remember to define the new port in DISTCC_HOSTS in /etc/makepkg.conf as well + ie: DISTCC_HOSTS="localhost:@PORT@ foo:@PORT@ bar:@PORT@" -post_upgrade() { - # change occurred on version 7.2.1-4 so warn users of older versions - if [ $(vercmp 7.2.1-5 $2) -eq 1 ]; then - post_install - fi +END } diff --git a/service.in b/service.in index 5507cf3ef8d7..14c02277c844 100644 --- a/service.in +++ b/service.in @@ -4,7 +4,7 @@ Documentation=man:distccd(1) After=network.target [Service] -User=nobody +User=distcc EnvironmentFile=/etc/conf.d/distccd-@VERS@ ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS |