use arch4edu/devtools-arch4edu-extra as source

3 files changed, 66 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3805259f714..a788444d471c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = devtools-qemu
 	pkgdesc = QEMU based cross-build tools for Arch Linux ARM package maintainers
-	pkgver = 14.0298784
+	pkgver = 12.3c44e3c
 	pkgrel = 1
-	url = https://github.com/arch4edu/devtools-qemu
+	url = https://aur.archlinux.org/packages/devtools-qemu
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	depends = archlinuxarm-keyring
 	depends = binfmt-qemu-static
-	depends = devtools-alarm>=20191227
+	depends = devtools
 	depends = qemu-user-static-bin
-	source = git+https://github.com/arch4edu/devtools-qemu.git
+	source = devtools-qemu::git+https://github.com/arch4edu/devtools-arch4edu-extra.git
+	source = archbuild-qemu.patch
 	sha256sums = SKIP
+	sha256sums = 0d8549497ff97e2d11ca73c3d6463e134ce590cb7767b76b3c54eceab19c831e
 
 pkgname = devtools-qemu
 
diff --git a/PKGBUILD b/PKGBUILD
index 3f4e9d2762d9..92cb907f132d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,48 @@
 # Maintainer: Jingbei Li <i@jingbei.li>
 pkgname=devtools-qemu
-pkgver=14.0298784
+pkgver=12.3c44e3c
 pkgrel=1
 pkgdesc='QEMU based cross-build tools for Arch Linux ARM package maintainers'
 arch=('x86_64')
-url='https://github.com/arch4edu/devtools-qemu'
+url='https://aur.archlinux.org/packages/devtools-qemu'
 license=('GPL')
-depends=('archlinuxarm-keyring' 'binfmt-qemu-static' 'devtools-alarm>=20191227' 'qemu-user-static-bin')
+depends=('archlinuxarm-keyring' 'binfmt-qemu-static' 'devtools' 'qemu-user-static-bin')
 makedepends=('git')
-source=("git+${url}.git")
-sha256sums=('SKIP')
+source=("$pkgname::git+https://github.com/arch4edu/devtools-arch4edu-extra.git"
+	"archbuild-qemu.patch"
+)
+sha256sums=('SKIP'
+            '0d8549497ff97e2d11ca73c3d6463e134ce590cb7767b76b3c54eceab19c831e')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  echo "$(git rev-list --count master).$(git rev-parse --short master)"
+	cd "$srcdir/$pkgname"
+	echo "$(git rev-list --count master).$(git rev-parse --short master)"
 }
 
 build() {
-  cd $srcdir/$pkgname
+	cd $srcdir/$pkgname
 
-  cp /usr/bin/archbuild qemu_archbuild
-  patch qemu_archbuild < qemu.patch
+	cp /usr/bin/archbuild archbuild-qemu
+	patch archbuild-qemu < $srcdir/archbuild-qemu.patch
 
-  for i in armv6h armv7h aarch64
-  do
-    cp /usr/share/devtools/pacman-extra.conf pacman-extra-$i.conf
-    cp /usr/share/devtools/makepkg-x86_64.conf makepkg-$i.conf
-    patch pacman-extra-$i.conf < pacman-extra-$i.conf.patch
-    patch makepkg-$i.conf < makepkg-$i.conf.patch
-  done
+	for i in armv6h armv7h aarch64
+	do
+		sed -i '/^Include/s/$/.alarm/' pacman-extra-$i.conf
+	done
 }
 
 package() {
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/share/devtools
+	mkdir -p $pkgdir/usr/bin
+	mkdir -p $pkgdir/usr/share/devtools
+	mkdir -p $pkgdir/etc/pacman.d
 
-  cp $srcdir/$pkgname/qemu_archbuild $pkgdir/usr/bin
-  cp $srcdir/$pkgname/mirrorlist $pkgdir/usr/share/devtools/qemu_mirrorlist
-  cp $srcdir/$pkgname/qemu_archbuild.sh $pkgdir/usr/share/devtools/qemu_archbuild.sh
+	cp $srcdir/$pkgname/archbuild-qemu $pkgdir/usr/bin
+	cp $srcdir/$pkgname/mirrorlist $pkgdir/etc/pacman.d/mirrorlist.alarm
 
-  for i in armv6h armv7h aarch64
-  do
-    cp $srcdir/$pkgname/pacman-extra-$i.conf $pkgdir/usr/share/devtools/
-    cp $srcdir/$pkgname/makepkg-$i.conf $pkgdir/usr/share/devtools/
-    ln -sf /usr/bin/qemu_archbuild $pkgdir/usr/bin/extra-$i-build
-  done
+	for i in armv6h armv7h aarch64
+	do
+		cp $srcdir/$pkgname/pacman-extra-$i.conf $pkgdir/usr/share/devtools/
+		cp $srcdir/$pkgname/makepkg-$i.conf $pkgdir/usr/share/devtools/
+		ln -sf /usr/bin/archbuild-qemu $pkgdir/usr/bin/extra-$i-build
+	done
 }
diff --git a/archbuild-qemu.patch b/archbuild-qemu.patch
new file mode 100644
index 000000000000..3b36918a653f
--- /dev/null
+++ b/archbuild-qemu.patch
@@ -0,0 +1,32 @@
+--- /usr/bin/archbuild	2020-06-24 22:55:10.000000000 +0800
++++ archbuild-qemu	2020-06-25 14:56:17.318483978 +0800
+@@ -263,6 +263,11 @@
+ 	tag="${cmd%-build}"
+ 	repo=${tag%-*}
+ 	arch=${tag##*-}
++	if [[ "x${arch}" = "xaarch64" ]]; then
++		qemu_static='/usr/bin/qemu-aarch64-static'
++	else
++		qemu_static='/usr/bin/qemu-arm-static'
++	fi
+ fi
+ chroots='/var/lib/archbuild'
+ clean_first=false
+@@ -321,6 +326,8 @@
+ 		-C "${pacman_config}" \
+ 		-M "${makepkg_config}" \
+ 		-c "${cachedir}" \
++		-f "$qemu_static" \
++		-f '/etc/pacman.d/mirrorlist.alarm' \
+ 		"${chroots}/${repo}-${arch}/root" \
+ 		"${base_packages[@]}" || abort
+ else
+@@ -328,6 +335,8 @@
+ 	arch-nspawn \
+ 		-C "${pacman_config}" \
+ 		-M "${makepkg_config}" \
++		-f "$qemu_static" \
++		-f '/etc/pacman.d/mirrorlist.alarm' \
+ 		"${chroots}/${repo}-${arch}/root" \
+ 		pacman -Syuu --noconfirm || abort
+ fi