mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
alarm/devtools-alarm to 20171108-2.1
This commit is contained in:
Kevin Mihelich
parent
056d5dfb52
commit
4e7abe2c8e
11 changed files with 111 additions and 50 deletions
|
|
@ -1,7 +1,7 @@
|
|||
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/8] makechrootpkg: cache dir
|
||||
Subject: [PATCH 1/9] makechrootpkg: cache dir
|
||||
|
||||
---
|
||||
makechrootpkg.in | 10 ++++++++--
|
||||
|
|
@ -55,5 +55,5 @@ index d4c293f..bf81573 100644
|
|||
--bind="$SRCDEST:/srcdest" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] arch-nspawn: keep mirrorlist
|
||||
Subject: [PATCH 2/9] arch-nspawn: keep mirrorlist
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index c55f498..3896992 100644
|
|||
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
|
||||
[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] makechrootpkg: distcc
|
||||
Subject: [PATCH 3/9] makechrootpkg: distcc
|
||||
|
||||
---
|
||||
makechrootpkg.in | 4 +++-
|
||||
|
|
@ -23,5 +23,5 @@ index bf81573..6f201b2 100644
|
|||
|
||||
_chrootnamcap() {
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] arch-nspawn: arm fix
|
||||
Subject: [PATCH 4/9] arch-nspawn: arm fix
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
|
|
@ -35,5 +35,5 @@ index 6f201b2..e29d42c 100644
|
|||
|
||||
# Clean up garbage from verifysource
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] makechrootpkg: no default logging
|
||||
Subject: [PATCH 5/9] makechrootpkg: no default logging
|
||||
|
||||
---
|
||||
makechrootpkg.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index e29d42c..ba27249 100644
|
|||
keepbuilddir=false
|
||||
update_first=false
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] archbuild: no setarch
|
||||
Subject: [PATCH 6/9] archbuild: no setarch
|
||||
|
||||
---
|
||||
archbuild.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index 8339aef..619fc8c 100644
|
|||
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||
"${chroots}/${repo}-${arch}/root" \
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
|
||||
Subject: [PATCH 7/9] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
|
||||
|
||||
---
|
||||
makechrootpkg.in | 4 +---
|
||||
|
|
@ -23,5 +23,5 @@ index ba27249..6b53337 100644
|
|||
grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
|
||||
echo "$x" >>"$copydir/etc/makepkg.conf"
|
||||
--
|
||||
2.14.1
|
||||
2.16.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From edc1c3cae8a090eb0d8a132d9c4b28df47d2f6cc Mon Sep 17 00:00:00 2001
|
||||
From: Eli Schwartz <eschwartz@archlinux.org>
|
||||
Date: Sun, 3 Sep 2017 03:53:39 -0400
|
||||
Subject: [PATCH 8/9] makechrootpkg: Fix unconditionally running namcap
|
||||
|
||||
Fixes regression in 2fd5931a8c67289a8a4acd327b3ce99a5d64c8c7
|
||||
|
||||
$run_namcap will always be set to ""
|
||||
`if $not_a_var; then ...; fi` is always truthful when $not_a_var is
|
||||
unset or equal to "" and the `then` clause will always be run.
|
||||
|
||||
I'm not sure why global state variables need to be cloned locally for
|
||||
their sole explicit purpose.
|
||||
|
||||
But for now this patch implements the minimum necessary work to properly
|
||||
pass the "do I want namcap" variable into prepare_chroot() according to
|
||||
the current logic flow.
|
||||
Note that I have still not thorougly tested makechrootpkg.
|
||||
|
||||
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
|
||||
---
|
||||
makechrootpkg.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index 6b53337..d6f48b2 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.16.2
|
||||
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
From 1a967b0e55c8033ad62a022fb5c3443c2f72297e Mon Sep 17 00:00:00 2001
|
||||
From: Eli Schwartz <eschwartz@archlinux.org>
|
||||
Date: Sun, 18 Mar 2018 01:46:44 -0400
|
||||
Subject: [PATCH 9/9] makechrootpkg: fix verifysource with pacman-git
|
||||
|
||||
In pacman-git commit d8717a6a9666ec80c8645d190d6f9c7ab73084ac makepkg
|
||||
started checking that the setuid/setgid bit could be removed on the
|
||||
$BUILDDIR in order to prevent this propagating to the packages
|
||||
themselves. Unfortunately, this requires the temporary builddir used
|
||||
during the --verifysource stage of makepkg, to be owned by $makepkg_user
|
||||
which was not the case as it is created as root using mktemp (and given
|
||||
world rwx in addition to the restricted deletion bit.)
|
||||
|
||||
Obviously makepkg cannot chmod a directory that it does not own. Fix
|
||||
this by making $makepkg_user the owner of that directory, as should have
|
||||
been the case all along.
|
||||
|
||||
(Giving world rwx is illogical on general principle. The fact that this
|
||||
is a workaround for makepkg demanding these directories be writable even
|
||||
when they are not going to be used for the makepkg options in question,
|
||||
is not justification for being careless.)
|
||||
|
||||
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
|
||||
---
|
||||
makechrootpkg.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index d6f48b2..2821986 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -252,7 +252,7 @@ download_sources() {
|
||||
|
||||
local builddir
|
||||
builddir="$(mktemp -d)"
|
||||
- chmod 1777 "$builddir"
|
||||
+ chown "$makepkg_user:$makepkg_user" "$builddir"
|
||||
|
||||
# Ensure sources are downloaded
|
||||
sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
pkgname=devtools-alarm
|
||||
_pkgname=devtools
|
||||
pkgver=20171108
|
||||
pkgrel=2
|
||||
pkgrel=2.1
|
||||
pkgdesc='Tools for Arch Linux ARM package maintainers'
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
|
|
@ -24,17 +24,19 @@ source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
|
|||
'0005-makechrootpkg-no-default-logging.patch'
|
||||
'0006-archbuild-no-setarch.patch'
|
||||
'0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch'
|
||||
'0008-fix-namcap-running-by-default.patch')
|
||||
'0008-makechrootpkg-Fix-unconditionally-running-namcap.patch'
|
||||
'0009-makechrootpkg-fix-verifysource-with-pacman-git.patch')
|
||||
md5sums=('4a24b99bc1cffc63634eb7b3f5b116f1'
|
||||
'573830ee23ecffa4971fbc36e5e2b666'
|
||||
'3cac269603dfd9c2f9c4c2be24e8b149'
|
||||
'1f74c22f44a4f2e39cafbd07d03595d5'
|
||||
'2a85106eb9b7ffab1eacf41276ce070c'
|
||||
'f3b14587bb007d84a7d6cba991680c41'
|
||||
'526448ae6f391606388a12e7d91e1fd1'
|
||||
'6f8453fd324e645ddf71b1009d1510a2'
|
||||
'60f7567ac617785c15e0a1a8b6f2abb7'
|
||||
'2d3fe5cf29b36a8b5abad93faa372c22')
|
||||
'6f0857c607eecd7cae37395cf28a6c81'
|
||||
'c73c9aa27af9bbcb8649c476a33cce6e'
|
||||
'28bca7b3fe32ea5236e5dfbccf51551e'
|
||||
'3007724b09d64626d949d698cb5a0816'
|
||||
'5ba5b5da4a4a0d37c4651c48241589d2'
|
||||
'0664e294a68e343c29e3ec01bfdd189c'
|
||||
'048314c00ef274602c8fc830db63c61a'
|
||||
'9b915424e24d3245fd9786133bc203c1'
|
||||
'1dd4421374a9a661472e2139573b6364')
|
||||
|
||||
prepare() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
|
|
@ -46,7 +48,8 @@ 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
|
||||
patch -p1 -i ../0008-makechrootpkg-Fix-unconditionally-running-namcap.patch
|
||||
patch -p1 -i ../0009-makechrootpkg-fix-verifysource-with-pacman-git.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue