diff options
| author | Christopher A. Williamson | 2018-04-08 19:44:14 +0100 |
|---|---|---|
| committer | Christopher A. Williamson | 2018-04-08 19:44:14 +0100 |
| commit | eec03e8008fcb14a9e5ab37216fa6be1cbc98a7a (patch) | |
| tree | 36c5c6cfb6b383c31ab9444b635ecd1c32c9ba77 | |
| parent | 987128256e2cbf9c5c2f922e1df8b7b5f6ed4923 (diff) | |
| download | aur-eec03e8008fcb14a9e5ab37216fa6be1cbc98a7a.tar.gz | |
fixed pkgver() function
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 10 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-jwrdegoede-git - pkgver = git - pkgrel = 8 + pkgver = 0 + pkgrel = 10 url = https://www.kernel.org/ arch = x86_64 license = GPL2 @@ -10,8 +10,8 @@ pkgbase = linux-jwrdegoede-git makedepends = inetutils makedepends = bc makedepends = libelf - replaces = linux-jwrdegoede - replaces = gpd-pocket-linux-jwrdegoede + conflicts = linux-jwrdegoede + conflicts = gpd-pocket-linux-jwrdegoede options = !strip source = 60-linux.hook source = 90-linux.hook diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 85de9cf93344..000000000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src @@ -6,11 +6,11 @@ pkgbase=linux-jwrdegoede-git _srcname=linux-sunxi _repourl=https://github.com/jwrdegoede/${_srcname}.git -pkgver=git -pkgrel=8 +pkgver=0 +pkgrel=10 arch=('x86_64') url='https://www.kernel.org/' -replaces=('linux-jwrdegoede' 'gpd-pocket-linux-jwrdegoede') +conflicts=('linux-jwrdegoede' 'gpd-pocket-linux-jwrdegoede') license=('GPL2') makedepends=('git' 'xmlto' 'kmod' 'inetutils' 'bc' 'libelf') options=('!strip') @@ -37,9 +37,9 @@ pkgver() { cd ${_srcname} # produce version string - local ver=($(head -n5 Makefile | awk -F'=' '{print $2}' | sed 's/\n//g')) + local ver=($(head -n4 Makefile | awk '/=/ {print $3}')) local commit=$(git rev-parse --short HEAD) - printf "%s" "${ver[0]}.${ver[1]}.${ver[2]}${ver[3]/-/}.${commit}" + printf "%s" "${ver[1]}.${ver[2]}.${ver[3]}.${commit}" } prepare() { @@ -51,7 +51,7 @@ prepare() { cd ${_srcname} # change localversion - sed -i 's/CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION="-jwrdegoede-git"/' .config + sed -i 's/CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION="-jwrdegoede"/' .config # disable tux logo sed -i 's/CONFIG_LOGO=.*/# CONFIG_LOGO is not set/' .config |