From 144a744a7defa0f2905dece49ef63286f070cd27 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 5 Mar 2018 15:20:13 +0100 Subject: [PATCH 1/2] Initial packaging. --- .SRCINFO | 13 +++++++++++++ .gitignore | 4 ++++ PKGBUILD | 24 ++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..ad70211 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,13 @@ +pkgbase = munin-template-munstrap-git + pkgdesc = Bootstrap based template for munin-html + pkgver = r3632.c9157be3 + pkgrel = 1 + url = https://github.com/munin-monitoring/contrib/tree/master/templates/munstrap + arch = any + license = GPL2 + makedepends = git + source = munin-template-munstrap::git+https://github.com/munin-monitoring/contrib.git + md5sums = SKIP + +pkgname = munin-template-munstrap-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f71c635 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +* +!.gitignore +!PKGBUILD +!.SRCINFO diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..17df0de --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Bert Peters +pkgname=munin-template-munstrap-git +pkgver=r3632.c9157be3 +pkgrel=1 +pkgdesc="Bootstrap based template for munin-html" +arch=('any') +url="https://github.com/munin-monitoring/contrib/tree/master/templates/munstrap" +license=('GPL2') +makedepends=('git') +source=("${pkgname%-git}::git+https://github.com/munin-monitoring/contrib.git") +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/${pkgname%-git}" + # Git, no tags available + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +package() { + local destdir="$pkgdir/usr/share/munin/templates/munstrap" + cd "$srcdir/${pkgname%-git}" + install -d "$destdir" + cp -r templates/munstrap/{templates,static} "$destdir" +} From 759fd52b303955383dae57208ac0f0002052e30f Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Wed, 28 Nov 2018 11:38:59 +0100 Subject: [PATCH 2/2] Change versioning scheme. Versions now only include commits that affect the template, rather than all of them, to prevent spurious rebuilds. However, this also means that we need an epoch, since the version number drastically decreased. Thanks to Eli Schwarz, for recommending this over IRC. --- .SRCINFO | 3 ++- PKGBUILD | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ad70211..872d0de 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,8 @@ pkgbase = munin-template-munstrap-git pkgdesc = Bootstrap based template for munin-html - pkgver = r3632.c9157be3 + pkgver = r25.c3431051 pkgrel = 1 + epoch = 1 url = https://github.com/munin-monitoring/contrib/tree/master/templates/munstrap arch = any license = GPL2 diff --git a/PKGBUILD b/PKGBUILD index 17df0de..0d49b1f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,9 @@ # Maintainer: Bert Peters pkgname=munin-template-munstrap-git -pkgver=r3632.c9157be3 +pkgver=r25.c3431051 +# Changed versioning scheme to prevent rebuilds +# Thanks to eschwarz for recommending +epoch=1 pkgrel=1 pkgdesc="Bootstrap based template for munin-html" arch=('any') @@ -11,9 +14,10 @@ source=("${pkgname%-git}::git+https://github.com/munin-monitoring/contrib.git") md5sums=('SKIP') pkgver() { + local subdir="templates/munstrap" cd "$srcdir/${pkgname%-git}" # Git, no tags available - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "r%s.%s" "$(git rev-list --count HEAD "$subdir")" "$(git log -n 1 --pretty=format:%h -- "$subdir")" } package() {