summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Knopf2018-01-10 20:36:03 -0500
committerPaul Knopf2018-01-10 20:36:03 -0500
commit39d7e585d03ddf07a30493acc2d9fa2efb4daf6e (patch)
treea93a4fc017a5c8fa1f94a26d270119b2c48b671e
parent7ff4753751491f138242c376c337a53df3879c08 (diff)
downloadaur-39d7e585d03ddf07a30493acc2d9fa2efb4daf6e.tar.gz
Not requiring docker for building.
-rw-r--r--.SRCINFO4
-rwxr-xr-xPKGBUILD14
-rwxr-xr-xgitversion6
3 files changed, 15 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b66509cffa7..664692cecdf9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = darch-alpha-git
pkgdesc = A utility to that uses Docker to build stateless Arch images that can be booted bare-metal.
- pkgver = 0.12.0.eb5d366706bea59c687bf892fc88293da823dd90
+ pkgver = 1.0.0.eb5d366706bea59c687bf892fc88293da823dd90
pkgrel = 1
url = https://github.com/pauldotknopf/darch
arch = x86_64
license = MIT
- makedepends = docker jq
+ makedepends = jq go
depends = docker
source = darch::git+https://github.com/pauldotknopf/darch.git#branch=develop
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9b03aed14b20..72a59b6f5ff5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Paul Knopf <pauldotknopf@gmail.com>
pkgname=darch-alpha-git
pkgrel=1
-pkgver=0.12.0.eb5d366706bea59c687bf892fc88293da823dd90
+pkgver=1.0.0.eb5d366706bea59c687bf892fc88293da823dd90
epoch=
pkgdesc="A utility to that uses Docker to build stateless Arch images that can be booted bare-metal."
arch=('x86_64')
url="https://github.com/pauldotknopf/darch"
license=('MIT')
groups=()
-depends=("docker")
-makedepends=('docker jq')
+depends=('docker')
+makedepends=('jq go')
checkdepends=()
optdepends=()
provides=()
@@ -25,10 +25,10 @@ noextract=()
validpgpkeys=()
pkgver() {
- local gitversion_output=`$srcdir/darch/gitversion`
- #echo "$gitversion_output"
- #echo "0.12.0-sdf"
- echo $(echo "$gitversion_output" | jq '.MajorMinorPatch' --raw-output).$(echo "$gitversion_output" | jq '.Sha' --raw-output)
+ rm "$srcdir/darch/gitversion"
+ cp "$startdir/gitversion" "$srcdir/darch/gitversion"
+ local git_sha=`git --git-dir $srcdir/darch/.git rev-parse HEAD`
+ echo "1.0.0.$git_sha"
}
build() {
diff --git a/gitversion b/gitversion
new file mode 100755
index 000000000000..7245d06d2aa8
--- /dev/null
+++ b/gitversion
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+#SHA=`git --git-dir $DIRNAME/.git rev-parse HEAD `
+
+echo '{"SemVer":"1.0.0"}' \ No newline at end of file