.gitignore

@@ -1,3 +0,0 @@
-arch/*/pkg/
-arch/*/src/
-arch/*/*.pkg.tar.*

arch/coreboot-configurator/.gitignore

@@ -1 +1,3 @@
+pkg
+src
 coreboot-configurator*

arch/coreboot-configurator/PKGBUILD

@@ -1,33 +1,30 @@
 # Maintainer: Alexander Rosenberg <zanderpkg at pm dot me>
 
-_pkgname=coreboot-configurator
-pkgname=$_pkgname-git
-pkgver=11.0.gb27400d
+pkgname=coreboot-configurator
+pkgver=51
 pkgrel=1
 pkgdesc="A simple GUI to change settings in coreboot's CBFS, via the nvramtool utility."
 url='https://github.com/StarLabsLtd/coreboot-configurator'
 arch=('x86_64')
-provides=("$_pkgname")
 license=('GPL2')
-makedepends=('ninja' 'meson' 'git')
-depends=('nvramtool' 'yaml-cpp' 'qt5-base')
+depends=('coreboot-utils-git' 'yaml-cpp' 'meson' 'qt5-base' 'ninja')
 source=('git+https://github.com/StarLabsLtd/coreboot-configurator.git')
 sha256sums=('SKIP')
 
 pkgver(){
-  cd "$_pkgname"
-  git describe --tags --long | sed 's#-#.#g'
+  cd "$pkgname"
+  git rev-list --count HEAD
 }
 
 build() {
-    cd "$_pkgname"
+    cd "$pkgname"
 
     meson setup build/
     ninja -C build all
 }
 
 package() {
-    cd "$_pkgname"
+    cd "$pkgname"
 
     export DESTDIR="$pkgdir"
     ninja -C build install

arch/nvramtool-git/.gitignore

@@ -1 +0,0 @@
-coreboot/

arch/nvramtool-git/PKGBUILD

@@ -1,27 +0,0 @@
-# Maintainer: Alexander Rosenberg <zanderpkg at pm dot me>
-
-_pkgname='nvramtool'
-pkgname=$_pkgname-git
-pkgver=4.20.77.ga398b31108
-pkgrel=1
-pkgdesc='Coreboot cli utility for modifying NVRAM'
-url='https://coreboot.org'
-arch=('x86_64')
-license=('GPL2')
-provides=('nvramtool')
-makedepends=('git')
-source=('git+https://github.com/coreboot/coreboot.git')
-sha256sums=('SKIP')
-
-pkgver(){
-  cd "coreboot"
-  git describe --tags --long | sed 's#-#.#g'
-}
-
-build() {
-    make -C 'coreboot/util/nvramtool'
-}
-
-package() {
-    install -Dt "$pkgdir/usr/bin/" "coreboot/util/nvramtool/nvramtool"
-}