diff --git a/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch index 2b0ed7b63..00f95ae07 100644 --- a/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch +++ b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch @@ -1,17 +1,17 @@ -From 8c1483d23cbb96d667b97bb18eb91615bd0db34f Mon Sep 17 00:00:00 2001 +From 192aa6fbdf1ed6fc441d56a14adf4479bd2799fa Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:25:58 -0700 -Subject: [PATCH 1/7] makechrootpkg: cache dir +Subject: [PATCH 1/8] makechrootpkg: cache dir --- makechrootpkg.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in -index 709e824..2c4a926 100644 +index d4c293f..bf81573 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in -@@ -51,6 +51,7 @@ usage() { +@@ -38,6 +38,7 @@ usage() { echo 'Flags:' echo '-h This help' echo '-c Clean the chroot before building' @@ -19,41 +19,41 @@ index 709e824..2c4a926 100644 echo '-d <dir> Bind directory into build chroot as read-write' echo '-D <dir> Bind directory into build chroot as read-only' echo '-u Update the working copy of the chroot before building' -@@ -252,12 +253,13 @@ move_products() { +@@ -323,12 +324,13 @@ main() { + [[ -z "$copy" || $copy = root ]] && copy=copy + src_owner=${SUDO_USER:-$USER} - orig_argv=("$@") +- while getopts 'hcur:I:l:nTD:d:U:' arg; do ++ while getopts 'hcuC:r:I:l:nTD:d:U:' arg; do + case "$arg" in + c) clean_first=true ;; + D) bindmounts_ro+=("--bind-ro=$OPTARG") ;; + d) bindmounts_rw+=("--bind=$OPTARG") ;; + u) update_first=true ;; ++ C) cache_dir="$OPTARG" ;; + r) passeddir="$OPTARG" ;; + I) install_pkgs+=("$OPTARG") ;; + l) copy="$OPTARG" ;; +@@ -350,6 +352,10 @@ main() { + [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" + [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" --while getopts 'hcur:I:l:nTD:d:' arg; do -+while getopts 'hcuC:r:I:l:nTD:d:' arg; do - case "$arg" in - c) clean_first=true ;; - D) bindmounts_ro+=(--bind-ro="$OPTARG") ;; - d) bindmounts_rw+=(--bind="$OPTARG") ;; - u) update_first=true ;; -+ C) cache_dir="$OPTARG" ;; - r) passeddir="$OPTARG" ;; - I) install_pkgs+=("$OPTARG") ;; - l) copy="$OPTARG" ;; -@@ -276,6 +278,10 @@ chrootdir=$(readlink -e "$passeddir") - [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" - [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" - -+if [ -n "$cache_dir" ]; then -+ cache_dir="-c $cache_dir" -+fi ++ if [ -n "$cache_dir" ]; then ++ cache_dir="-c $cache_dir" ++ fi + - # Detect chrootdir filesystem type - chroottype=$(stat -f -c %T "$chrootdir") + if [[ ${copy:0:1} = / ]]; then + copydir=$copy + else +@@ -413,7 +419,7 @@ main() { -@@ -327,7 +333,7 @@ download_sources + prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" - prepare_chroot - --if arch-nspawn "$copydir" \ -+if arch-nspawn $cache_dir "$copydir" \ - --bind="$PWD:/startdir" \ - --bind="$SRCDEST:/srcdest" \ - "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ +- if arch-nspawn "$copydir" \ ++ if arch-nspawn $cache_dir "$copydir" \ + --bind="$PWD:/startdir" \ + --bind="$SRCDEST:/srcdest" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch b/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch index 6c1678f5d..96a2f1eeb 100644 --- a/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch +++ b/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch @@ -1,25 +1,25 @@ -From 0931501eb0adc8e5a941bc3324c25dcd73b430cf Mon Sep 17 00:00:00 2001 +From b7c0c20f3681aa0982d4f804c18292b4aa3efa72 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:27:34 -0700 -Subject: [PATCH 2/7] arch-nspawn: keep mirrorlist +Subject: [PATCH 2/8] arch-nspawn: keep mirrorlist --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in -index e46b57f..081c708 100644 +index c55f498..3896992 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in -@@ -73,7 +73,7 @@ build_mount_args() { +@@ -80,7 +80,7 @@ build_mount_args() { copy_hostconf () { cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d" - echo "Server = $host_mirror" >"$working_dir/etc/pacman.d/mirrorlist" + #echo "Server = $host_mirror" >"$working_dir/etc/pacman.d/mirrorlist" - [[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf" - [[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf" + [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" + [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf" -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch index b2eea3cb1..0d4630ab9 100644 --- a/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch +++ b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch @@ -1,28 +1,27 @@ -From a94a490e14cadde174ca0a31fe7ae01323bb6116 Mon Sep 17 00:00:00 2001 +From 6cdbb9492c27ba80a7120266817775880f273046 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:32:15 -0700 -Subject: [PATCH 3/7] makechrootpkg: distcc +Subject: [PATCH 3/8] makechrootpkg: distcc --- - makechrootpkg.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + makechrootpkg.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in -index 2c4a926..4b86084 100644 +index bf81573..6f201b2 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in -@@ -202,7 +202,10 @@ _chrootbuild() { - . /etc/profile - export HOME=/build - cd /startdir -- sudo -u builduser makepkg "$@" +@@ -232,7 +232,9 @@ _chrootbuild() { + # use "$" in arguments to commands with "sudo -i". ${foo} or + # ${1} is OK, but $foo or $1 isn't. + # https://bugzilla.sudo.ws/show_bug.cgi?id=765 +- sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" + mkdir /build/.distcc + chown builduser /build/.distcc -+ -+ sudo -u builduser DISTCC_IO_TIMEOUT=0 DISTCC_DIR='/build/.distcc' makepkg "$@" ++ sudo -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@" } _chrootnamcap() { -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch b/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch index 1295b229e..6d37b1c47 100644 --- a/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch +++ b/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch @@ -1,43 +1,39 @@ -From 986d267949d8111f04954c0e56ab51251fa6b418 Mon Sep 17 00:00:00 2001 +From 5a4c63d070cdbfa0595c1e090cbf6caba54c08e2 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:33:00 -0700 -Subject: [PATCH 4/7] arch-nspawn: arm fix +Subject: [PATCH 4/8] arch-nspawn: arm fix --- arch-nspawn.in | 2 +- - makechrootpkg.in | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + makechrootpkg.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in -index 081c708..c80afba 100644 +index 3896992..714fb0a 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in -@@ -96,7 +96,7 @@ copy_hostconf +@@ -111,7 +111,7 @@ eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")" - eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") + [[ -z $nosetarch ]] || unset CARCH -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ +exec systemd-nspawn -q \ -D "$working_dir" \ - --register=no \ - "${mount_args[@]}" \ + -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ + --register=no --keep-unit --as-pid2 \ diff --git a/makechrootpkg.in b/makechrootpkg.in -index 4b86084..39dc498 100644 +index 6f201b2..e29d42c 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in -@@ -223,10 +223,10 @@ download_sources() { +@@ -258,7 +258,7 @@ download_sources() { + # Ensure sources are downloaded - if [[ -n $SUDO_USER ]]; then - sudo -u $SUDO_USER env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ -- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o -+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o - else - ( export SRCDEST BUILDDIR="$builddir" -- makepkg --asroot --config="$copydir/etc/makepkg.conf" --verifysource -o -+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o - ) - fi - (( $? != 0 )) && die "Could not download sources." + sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ +- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || ++ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o || + die "Could not download sources." + + # Clean up garbage from verifysource -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch b/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch index 9f72b1572..79509c48d 100644 --- a/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch +++ b/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch @@ -1,25 +1,25 @@ -From 32f7c91339f5bb396c10604a3487ca88da406b22 Mon Sep 17 00:00:00 2001 +From 3111a45460053111c3f736ccbee88c2f30a403ce Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:33:41 -0700 -Subject: [PATCH 5/7] makechrootpkg: no default logging +Subject: [PATCH 5/8] makechrootpkg: no default logging --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in -index 39dc498..9a69dda 100644 +index e29d42c..ba27249 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in -@@ -12,7 +12,7 @@ m4_include(lib/common.sh) +@@ -305,7 +305,7 @@ move_products() { + # }}} - shopt -s nullglob - --makepkg_args=(-s --noconfirm -L --holdver) -+makepkg_args=(-s --noconfirm --holdver) - repack=false - update_first=false - clean_first=false + main() { +- default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg) ++ default_makepkg_args=(--syncdeps --noconfirm --holdver --skipinteg) + makepkg_args=("${default_makepkg_args[@]}") + keepbuilddir=false + update_first=false -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0006-archbuild-no-setarch.patch b/alarm/devtools-alarm/0006-archbuild-no-setarch.patch index 43f5a0e08..dc6313910 100644 --- a/alarm/devtools-alarm/0006-archbuild-no-setarch.patch +++ b/alarm/devtools-alarm/0006-archbuild-no-setarch.patch @@ -1,17 +1,17 @@ -From fb9af59e9753f358ffb469aa13c0db2980cec300 Mon Sep 17 00:00:00 2001 +From 476a3b7efbd047ccf4be07ee40a0d1f336084f5a Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 28 Dec 2014 22:34:04 -0700 -Subject: [PATCH 6/7] archbuild: no setarch +Subject: [PATCH 6/8] archbuild: no setarch --- archbuild.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archbuild.in b/archbuild.in -index 9c5d706..a4b5bed 100644 +index 8339aef..619fc8c 100644 --- a/archbuild.in +++ b/archbuild.in -@@ -62,7 +62,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then +@@ -60,7 +60,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" @@ -21,5 +21,5 @@ index 9c5d706..a4b5bed 100644 -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch b/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch index 46fe51ef6..f1e1291fd 100644 --- a/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch +++ b/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch @@ -1,27 +1,27 @@ -From 9e66d2ff9e974918683b0286b6d543547faa1dc1 Mon Sep 17 00:00:00 2001 +From bc2d5d2809daaed89ea8632f074d5018fa4a3d73 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 3 Jul 2016 21:32:15 -0600 -Subject: [PATCH 7/7] makechrootpkg: don't delete MAKEFLAGS and PACKAGER +Subject: [PATCH 7/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER --- makechrootpkg.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in -index 9a69dda..a018130 100644 +index ba27249..6b53337 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in -@@ -165,9 +165,7 @@ prepare_chroot() { +@@ -188,9 +188,7 @@ prepare_chroot() { $install -m 644 "$USER_HOME/$x" "$copydir/build/$x" done - sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" - for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ -- "MAKEFLAGS='$MAKEFLAGS'" "PACKAGER='$PACKAGER'" +- "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" + for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest do grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf" -- -2.9.0 +2.14.1 diff --git a/alarm/devtools-alarm/0008-fix-namcap-running-by-default.patch b/alarm/devtools-alarm/0008-fix-namcap-running-by-default.patch new file mode 100644 index 000000000..5d96350a4 --- /dev/null +++ b/alarm/devtools-alarm/0008-fix-namcap-running-by-default.patch @@ -0,0 +1,25 @@ +From 44d15a4567a148d185af82f1b60bba7c48c17496 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Tue, 14 Nov 2017 22:33:27 -0700 +Subject: [PATCH 8/8] fix namcap running by default + +--- + makechrootpkg.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makechrootpkg.in b/makechrootpkg.in +index 6b53337..45ef1b9 100644 +--- a/makechrootpkg.in ++++ b/makechrootpkg.in +@@ -417,7 +417,7 @@ main() { + + download_sources "$copydir" "$makepkg_user" + +- prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" ++ prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" $run_namcap + + if arch-nspawn $cache_dir "$copydir" \ + --bind="$PWD:/startdir" \ +-- +2.14.1 + diff --git a/alarm/devtools-alarm/PKGBUILD b/alarm/devtools-alarm/PKGBUILD index 6a450876f..dd7112b62 100644 --- a/alarm/devtools-alarm/PKGBUILD +++ b/alarm/devtools-alarm/PKGBUILD @@ -6,8 +6,8 @@ pkgname=devtools-alarm _pkgname=devtools -pkgver=20160528 -pkgrel=2 +pkgver=20171108 +pkgrel=1 pkgdesc='Tools for Arch Linux ARM package maintainers' arch=('any') license=('GPL') @@ -22,15 +22,17 @@ source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz" '0004-arch-nspawn-arm-fix.patch' '0005-makechrootpkg-no-default-logging.patch' '0006-archbuild-no-setarch.patch' - '0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch') -md5sums=('aa2ec2fd3a377fb5a1e7b0d2e491f99b' - '0e95fab4943ac07968613210386bb3a2' - '7fa66ac96350d20a7ea5796fc3a74551' - '8d070301e36c453a922997c7511326db' - '3ef8b4a7bbc0772c36be29ac27f4e08e' - '1d8710a87530f36d544afb99bad4cb01' - 'e745a81238e1dcfc46ae2aec64e59731' - '95cd4a5c70892c6f12424655884f43fb') + '0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch' + '0008-fix-namcap-running-by-default.patch') +md5sums=('4a24b99bc1cffc63634eb7b3f5b116f1' + '3cac269603dfd9c2f9c4c2be24e8b149' + '1f74c22f44a4f2e39cafbd07d03595d5' + '2a85106eb9b7ffab1eacf41276ce070c' + 'f3b14587bb007d84a7d6cba991680c41' + '526448ae6f391606388a12e7d91e1fd1' + '6f8453fd324e645ddf71b1009d1510a2' + '60f7567ac617785c15e0a1a8b6f2abb7' + '2d3fe5cf29b36a8b5abad93faa372c22') prepare() { cd "${_pkgname}-${pkgver}" @@ -41,6 +43,7 @@ prepare() { patch -p1 -i ../0005-makechrootpkg-no-default-logging.patch patch -p1 -i ../0006-archbuild-no-setarch.patch patch -p1 -i ../0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch + patch -p1 -i ../0008-fix-namcap-running-by-default.patch } build() {