summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2022-06-23 18:59:46 +0800
committerJingbei Li2022-06-23 18:59:46 +0800
commitf6d5623dbabfe679076c06f380a4eb81a63ee00b (patch)
treebb71c692d01836e41c7371ad5158b87b0e7f3ae4
parent8d4cd6b56595472693fbde8db927b87fafc4d9b8 (diff)
downloadaur-f6d5623dbabfe679076c06f380a4eb81a63ee00b.tar.gz
updated
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a788444d471c..86b8cae2f9ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,11 +9,10 @@ pkgbase = devtools-qemu
depends = archlinuxarm-keyring
depends = binfmt-qemu-static
depends = devtools
- depends = qemu-user-static-bin
+ depends = qemu-user-static
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 92cb907f132d..60d7275b0b12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc='QEMU based cross-build tools for Arch Linux ARM package maintainers'
arch=('x86_64')
url='https://aur.archlinux.org/packages/devtools-qemu'
license=('GPL')
-depends=('archlinuxarm-keyring' 'binfmt-qemu-static' 'devtools' 'qemu-user-static-bin')
+depends=('archlinuxarm-keyring' 'binfmt-qemu-static' 'devtools' 'qemu-user-static')
makedepends=('git')
source=("$pkgname::git+https://github.com/arch4edu/devtools-arch4edu-extra.git"
"archbuild-qemu.patch"
@@ -16,7 +16,7 @@ sha256sums=('SKIP'
pkgver() {
cd "$srcdir/$pkgname"
- echo "$(git rev-list --count master).$(git rev-parse --short master)"
+ echo "$(pacman -Q devtools | cut -d' ' -f2 | cut -d- -f1).$(git rev-list --count master).$(git rev-parse --short master)"
}
build() {
@@ -25,7 +25,7 @@ build() {
cp /usr/bin/archbuild archbuild-qemu
patch archbuild-qemu < $srcdir/archbuild-qemu.patch
- for i in armv6h armv7h aarch64
+ for i in armv7h aarch64
do
sed -i '/^Include/s/$/.alarm/' pacman-extra-$i.conf
done
@@ -39,7 +39,7 @@ package() {
cp $srcdir/$pkgname/archbuild-qemu $pkgdir/usr/bin
cp $srcdir/$pkgname/mirrorlist $pkgdir/etc/pacman.d/mirrorlist.alarm
- for i in armv6h armv7h aarch64
+ for i in armv7h aarch64
do
cp $srcdir/$pkgname/pacman-extra-$i.conf $pkgdir/usr/share/devtools/
cp $srcdir/$pkgname/makepkg-$i.conf $pkgdir/usr/share/devtools/