summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rwxr-xr-xPKGBUILD33
-rwxr-xr-xgitversion6
3 files changed, 30 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68f0f28530af..e7b4a8ebdc63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,18 @@
pkgbase = darch-alpha-git
- pkgdesc = A utility to that uses Docker to build stateless Arch images that can be booted bare-metal.
- pkgver = 1.0.0.10a50c38ee2064bdc96f101cb6cb02169ecb2bf1
+ pkgdesc = A utility to that uses containerd to build stateless operating system images that can be booted bare-metal.
+ pkgver = 05557ee31a34414087a0e38db389e15118e462b4
pkgrel = 1
- url = https://github.com/pauldotknopf/darch
+ url = https://github.com/godarch/darch
arch = x86_64
license = MIT
- makedepends = jq go
- depends = docker
- source = darch::git+https://github.com/pauldotknopf/darch.git#branch=develop
+ makedepends = go
+ depends = libseccomp
+ provides = containerd,
+ provides = runc
+ conflicts = containerd,
+ conflicts = runc,
+ conflicts = darch
+ source = git+https://github.com/godarch/darch.git#branch=develop
md5sums = SKIP
pkgname = darch-alpha-git
diff --git a/PKGBUILD b/PKGBUILD
index a7fb55ee383f..54c6f4984974 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,47 @@
# Maintainer: Paul Knopf <pauldotknopf@gmail.com>
pkgname=darch-alpha-git
pkgrel=1
-pkgver=1.0.0.10a50c38ee2064bdc96f101cb6cb02169ecb2bf1
+pkgver=05557ee31a34414087a0e38db389e15118e462b4
epoch=
-pkgdesc="A utility to that uses Docker to build stateless Arch images that can be booted bare-metal."
+pkgdesc="A utility to that uses containerd to build stateless operating system images that can be booted bare-metal."
arch=('x86_64')
-url="https://github.com/pauldotknopf/darch"
+url="https://github.com/godarch/darch"
license=('MIT')
groups=()
-depends=('docker')
-makedepends=('jq go')
+depends=('libseccomp')
+makedepends=('go')
checkdepends=()
optdepends=()
-provides=()
-conflicts=()
+provides=('containerd', 'runc')
+conflicts=('containerd', 'runc', 'darch')
replaces=()
backup=()
options=()
install=
changelog=
-source=("darch::git+https://github.com/pauldotknopf/darch.git#branch=develop")
+source=("git+https://github.com/godarch/darch.git#branch=develop")
md5sums=('SKIP')
noextract=()
validpgpkeys=()
+_gourl=github.com/google/codesearch
pkgver() {
- 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"
+ echo "$git_sha"
}
build() {
- cd "$srcdir/darch"
- make package
+ rm -rf "$srcdir/src/github.com/godarch"
+ mkdir -p "$srcdir/src/github.com/godarch"
+ mv "$srcdir/darch" "$srcdir/src/github.com/godarch"
+ export GOPATH="$srcdir"
+ export GOBIN="$srcdir/bin"
+ export PATH=$PATH:$GOBIN
+ cd "$srcdir/src/github.com/godarch/darch"
+ make ci BUNDLE_RUNTIME="yes"
}
package() {
local arch=`go env GOARCH`
- tar -xzpf "$srcdir/darch/bin/darch-$arch.tar.gz" -C "$pkgdir"
+ tar -xzpf "$srcdir/src/github.com/godarch/darch/output/darch-$arch-with-runtime.tar.gz" -C "$pkgdir"
}
diff --git a/gitversion b/gitversion
deleted file mode 100755
index 7245d06d2aa8..000000000000
--- a/gitversion
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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