upgpkg: buildah-git 1.21.0.r64.g814868e7-1

upgpkg: buildah-git 1.21.0.r64.g814868e7-1

upgpkg: buildah-git 1.21.0.r64.g814868e7-1

feat(buildah): :bookmark: Release 1.21.0.r64.g814868e7

3 files changed, 51 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4df2001d398f..96f914d847c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,34 @@
 pkgbase = buildah-git
-	pkgdesc = A tool which facilitates building OCI images
-	pkgver = r1330.391a5bea
+	pkgdesc = A tool which facilitates building OCI images (git)
+	pkgver = 1.21.0.r64.g814868e7
 	pkgrel = 1
-	url = https://github.com/containers/buildah
-	arch = x86_64
-	arch = i686
+	url = https://github.com/containers/buildah.git
+	arch = any
 	license = Apache
 	makedepends = go
+	makedepends = go-md2man
 	makedepends = git
 	makedepends = bash-bats
 	makedepends = btrfs-progs
-	makedepends = device-mapper
-	makedepends = gpgme
 	makedepends = libassuan
 	makedepends = bzip2
 	makedepends = go-md2man
 	makedepends = runc
 	makedepends = skopeo
-	makedepends = libselinux
+	makedepends = systemd
+	makedepends = containers-common
+	depends = crun
+	depends = skopeo
+	depends = slirp4netns
 	provides = buildah
 	conflicts = buildah
-	source = git://github.com/containers/buildah.git
+	source = git+https://github.com/containers/buildah.git
 	sha256sums = SKIP
 
 pkgname = buildah-git
-
+	depends = crun
+	depends = skopeo
+	depends = slirp4netns
+	depends = libseccomp.so
+	depends = libdevmapper.so
+	depends = libgpgme.so
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0e07c0fad9c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+src
+pkg
+buildah/
diff --git a/PKGBUILD b/PKGBUILD
index 363500d28ccb..4016094745e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,46 @@
-# Maintainer: Morten Linderud <morten@linderud.pw>
+# Maintainer: samarthj <dev@samarthj.com>
+# Contributor: Morten Linderud <morten@linderud.pw>
 
 pkgname=buildah-git
 _pkgname=buildah
-pkgver=r1330.391a5bea
+pkgver=1.21.0.r64.g814868e7
 pkgrel=1
-pkgdesc="A tool which facilitates building OCI images"
-arch=('x86_64' 'i686')
-url="https://github.com/containers/buildah"
-license=('Apache')
-makedepends=('go' 'git' 'bash-bats' 
-             'btrfs-progs' 'device-mapper' 
-             'gpgme' 'libassuan' 'bzip2' 
-             'go-md2man' 'runc' 'skopeo'
-             'libselinux')
-provides=("buildah")
-conflicts=("buildah")
-source=("git://github.com/containers/buildah.git")
+pkgdesc="A tool which facilitates building OCI images (git)"
+arch=('any')
+depends=(crun skopeo slirp4netns)
+makedepends=('go' 'go-md2man' 'git' 'bash-bats'
+  'btrfs-progs' 'libassuan' 'bzip2'
+  'go-md2man' 'runc' 'skopeo'
+  'systemd' 'containers-common')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+url="https://github.com/containers/$_pkgname.git"
+license=(Apache)
+source=("git+$url")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${_pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  rm -rf "${srcdir}/src"
-  mkdir -p "${srcdir}"/src/github.com/containers
-  ln -sf "${srcdir}/${_pkgname}" "${srcdir}/src/github.com/containers/buildah"
+  ver=$(git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+  echo ${ver#v}
 }
 
 build() {
-  export GOPATH="${srcdir}"
-  cd "${GOPATH}/src/github.com/containers/buildah"
-  make PREFIX=/usr
+  export SECURITYTAGS='seccomp apparmor'
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath"
+
+  cd $_pkgname
+  make EXTRA_LDFLAGS='-s -w -linkmode=external'
 }
 
 package() {
-  cd "${_pkgname}"
-  make -C "${srcdir}/${_pkgname}" DESTDIR="$pkgdir" PREFIX=usr install
+  depends+=('libseccomp.so' 'libdevmapper.so' 'libgpgme.so')
+
+  cd $_pkgname
+  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-# vim:set ts=2 sw=2 et: