Merge branch 'main' of git.zander.im:Zander671/build-scripts

.gitignore

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

arch/coreboot-configurator-git/.gitignore

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

arch/coreboot-configurator-git/PKGBUILD

@@ -1,30 +1,33 @@
 # Maintainer: Alexander Rosenberg <zanderpkg at pm dot me>
 
-pkgname=coreboot-configurator
+_pkgname=coreboot-configurator
-pkgver=51
+pkgname=$_pkgname-git
+pkgver=11.0.gb27400d
 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')
-depends=('coreboot-utils-git' 'yaml-cpp' 'meson' 'qt5-base' 'ninja')
+makedepends=('ninja' 'meson' 'git')
+depends=('nvramtool' 'yaml-cpp' 'qt5-base')
 source=('git+https://github.com/StarLabsLtd/coreboot-configurator.git')
 sha256sums=('SKIP')
 
 pkgver(){
-  cd "$pkgname"
+  cd "$_pkgname"
-  git rev-list --count HEAD
+  git describe --tags --long | sed 's#-#.#g'
 }
 
 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

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

arch/nvramtool-git/PKGBUILD

@@ -0,0 +1,27 @@
+# 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"
+}