diff options
| author | surya | 2019-01-24 13:55:35 -0500 |
|---|---|---|
| committer | surya | 2019-01-24 13:55:35 -0500 |
| commit | e06dac67a7ef12490f46a667f7177e4a97b8b5bb (patch) | |
| tree | 4bdcefb4e1446511dcc25a9bd8140298893b9fe9 | |
| parent | 6b1c3c14586d4a236cd28c9c94a90305b5718c81 (diff) | |
| download | aur-e06dac67a7ef12490f46a667f7177e4a97b8b5bb.tar.gz | |
makefile
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | README.md | 6 |
4 files changed, 29 insertions, 15 deletions
@@ -1,12 +1,13 @@ -# Generated by Keybase build automation pkgbase = keybase-git pkgdesc = the Keybase Go client, filesystem, and GUI - pkgver = 1.0.27+15115.8169d666e + pkgver = 3.0.0 pkgrel = 1 url = https://keybase.io install = keybase.install arch = i686 arch = x86_64 + arch = armv7h + arch = aarch64 license = BSD makedepends = go makedepends = yarn @@ -17,6 +18,7 @@ pkgbase = keybase-git depends = gconf depends = libxss depends = gtk2 + depends = lsof conflicts = keybase conflicts = keybase-release conflicts = keybase-bin diff --git a/Makefile b/Makefile new file mode 100644 index 000000000000..20f455bb79f8 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +build: + makepkg --printsrcinfo > .SRCINFO + +check-srcinfo-diff: + bash -c 'diff .SRCINFO <(makepkg --printsrcinfo)' + +push: check-srcinfo-diff + git push origin master + +push-aur: check-srcinfo-diff + git remote set-url --add aur https://aur.archlinux.org/keybase-git.git/ + git push aur master @@ -1,20 +1,17 @@ -# Maintainer: Jack O'Connor <oconnor663@gmail.com> - -# NOTE: This PKGBUILD is generated and pushed by Keybase's release automation. -# Any changes made in aur.archlinux.org git repos will get overwritten. See -# https://github.com/keybase/client/tree/master/packaging/linux/arch. +# Maintainer: Keybase <code@keybase.io> pkgname=keybase-git pkgdesc='the Keybase Go client, filesystem, and GUI' license=('BSD') url='https://keybase.io' -pkgver=1.0.27+15115.8169d666e +pkgver=3.0.0 pkgver() { "$srcdir/client/packaging/linux/arch/keybase_git_version.sh" } pkgrel=1 -arch=('i686' 'x86_64') -depends=(fuse gconf libxss gtk2) # don't change this without changing the SRCINFO template too +arch=('i686' 'x86_64' 'armv7h' 'aarch64') +depends=(fuse gconf libxss gtk2 lsof) # don't change this without changing the SRCINFO template too, + # and the keybase-bin files in keybase/client/packaging/linux/arch makedepends=(go yarn npm git rsync) # keybase-release is a deprecated AUR package conflicts=(keybase keybase-release keybase-bin) @@ -30,6 +27,8 @@ build() { export KEYBASE_SKIP_64_BIT=1 elif [ "$CARCH" = "x86_64" ] ; then export KEYBASE_SKIP_32_BIT=1 + elif [ "$CARCH" = "aarch64" ] || [ "$CARCH" = "armv7h" ] ; then + export KEYBASE_BUILD_ARM_ONLY=1 else echo "Unknown arch: $CARCH" exit 1 @@ -43,10 +42,11 @@ package() { deb_arch="i386" elif [ "$CARCH" = "x86_64" ] ; then deb_arch="amd64" + elif [ "$CARCH" = "aarch64" ] || [ "$CARCH" = "armv7h" ] ; then + deb_arch="arm64" else echo "Unknown arch: $CARCH" exit 1 fi - - cp -r "$srcdir/build_dir/binaries/$deb_arch"/* "$pkgdir" + sh -c "cp -r $srcdir/build_dir/binaries/$deb_arch/* $pkgdir" } diff --git a/README.md b/README.md index 387abdc80dfb..d81e6c84023b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ +Before committing, you must rebuild .SRCINFO: ```bash -git clone git@github.com:keybase/keybase-git.git -git remote add aur https://aur.archlinux.org/keybase-git.git/ +make build ``` To push to AUR, configure SSH creds and ```bash -git push aur master +make push-aur ``` |