archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

alarm/devtools-alarm to 20160528-2

Browse source
This commit is contained in:
Kevin Mihelich 2016-07-04 03:33:59 +00:00
parent 20c65aefb6
commit ebda3851ba
8 changed files with 50 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch
View file

@ -1,7 +1,7 @@
From 8c1483d23cbb96d667b97bb18eb91615bd0db34f 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/6] makechrootpkg: cache dir
Subject: [PATCH 1/7] makechrootpkg: cache dir
---
makechrootpkg.in | 10 ++++++++--
@ -55,5 +55,5 @@ index 709e824..2c4a926 100644
--bind="$SRCDEST:/srcdest" \
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
--
2.8.3
2.9.0

4
alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch
View file

@ -1,7 +1,7 @@
From 0931501eb0adc8e5a941bc3324c25dcd73b430cf 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/6] arch-nspawn: keep mirrorlist
Subject: [PATCH 2/7] arch-nspawn: keep mirrorlist
---
arch-nspawn.in | 2 +-
@ -21,5 +21,5 @@ index e46b57f..081c708 100644
[[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf"
[[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf"
--
2.8.3
2.9.0

4
alarm/devtools-alarm/0003-makechrootpkg-distcc.patch
View file

@ -1,7 +1,7 @@
From a94a490e14cadde174ca0a31fe7ae01323bb6116 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/6] makechrootpkg: distcc
Subject: [PATCH 3/7] makechrootpkg: distcc
---
makechrootpkg.in | 5 ++++-
@ -24,5 +24,5 @@ index 2c4a926..4b86084 100644
_chrootnamcap() {
--
2.8.3
2.9.0

4
alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch
View file

@ -1,7 +1,7 @@
From 986d267949d8111f04954c0e56ab51251fa6b418 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/6] arch-nspawn: arm fix
Subject: [PATCH 4/7] arch-nspawn: arm fix
---
arch-nspawn.in | 2 +-
@ -39,5 +39,5 @@ index 4b86084..39dc498 100644
fi
(( $? != 0 )) && die "Could not download sources."
--
2.8.3
2.9.0

4
alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch
View file

@ -1,7 +1,7 @@
From 32f7c91339f5bb396c10604a3487ca88da406b22 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/6] makechrootpkg: no default logging
Subject: [PATCH 5/7] makechrootpkg: no default logging
---
makechrootpkg.in | 2 +-
@ -21,5 +21,5 @@ index 39dc498..9a69dda 100644
update_first=false
clean_first=false
--
2.8.3
2.9.0

4
alarm/devtools-alarm/0006-archbuild-no-setarch.patch
View file

@ -1,7 +1,7 @@
From fb9af59e9753f358ffb469aa13c0db2980cec300 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/6] archbuild: no setarch
Subject: [PATCH 6/7] archbuild: no setarch
---
archbuild.in | 2 +-
@ -21,5 +21,5 @@ index 9c5d706..a4b5bed 100644
-M "@pkgdatadir@/makepkg-${arch}.conf" \
"${chroots}/${repo}-${arch}/root" \
--
2.8.3
2.9.0

27
alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch Normal file
View file

@ -0,0 +1,27 @@
From 9e66d2ff9e974918683b0286b6d543547faa1dc1 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
---
makechrootpkg.in | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 9a69dda..a018130 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -165,9 +165,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'"
+ 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

19
alarm/devtools-alarm/PKGBUILD
View file

@ -7,7 +7,7 @@
pkgname=devtools-alarm
_pkgname=devtools
pkgver=20160528
pkgrel=1
pkgrel=2
pkgdesc='Tools for Arch Linux ARM package maintainers'
arch=('any')
license=('GPL')
@ -21,14 +21,16 @@ source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
'0003-makechrootpkg-distcc.patch'
'0004-arch-nspawn-arm-fix.patch'
'0005-makechrootpkg-no-default-logging.patch'
'0006-archbuild-no-setarch.patch')
'0006-archbuild-no-setarch.patch'
'0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch')
md5sums=('aa2ec2fd3a377fb5a1e7b0d2e491f99b'
'2dd231cc55cb66dabcd0e9770ff727e9'
'ed6f41393b2441f7e2185331be256921'
'da8409a3b73b345e2d888fe233d19cdb'
'093c6c2801a1d7c79a7384d64c520837'
'3d69e998b3f9e10a75b9806ef9bcaa83'
'52b92a26640a2539cf077eba0a2492ce')
'0e95fab4943ac07968613210386bb3a2'
'7fa66ac96350d20a7ea5796fc3a74551'
'8d070301e36c453a922997c7511326db'
'3ef8b4a7bbc0772c36be29ac27f4e08e'
'1d8710a87530f36d544afb99bad4cb01'
'e745a81238e1dcfc46ae2aec64e59731'
'95cd4a5c70892c6f12424655884f43fb')
prepare() {
cd "${_pkgname}-${pkgver}"
@ -38,6 +40,7 @@ prepare() {
patch -p1 -i ../0004-arch-nspawn-arm-fix.patch
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
}
build() {