diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2017-08-26 21:32:10 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2017-09-06 01:38:10 +0100 |
| commit | 56586eddc25c15196951f3d6576fe28c1c820f2c (patch) | |
| tree | f160d866764178550205e0bc2ee0a2f21b494361 /sys-firmware/gnuk | |
| parent | www-client/arcanist: Switch to https URL (diff) | |
| download | portage-56586eddc25c15196951f3d6576fe28c1c820f2c.tar.xz | |
sys-firmware/gnuk: Version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'sys-firmware/gnuk')
| -rw-r--r-- | sys-firmware/gnuk/files/1.2.3-MINOR-Always-get-version-from-the-VERSION-file.patch | 26 | ||||
| -rw-r--r-- | sys-firmware/gnuk/files/1.2.5-MINOR-Always-get-version-from-the-VERSION-file.patch | 32 | ||||
| -rw-r--r-- | sys-firmware/gnuk/gnuk-1.2.5.ebuild (renamed from sys-firmware/gnuk/gnuk-1.2.3.ebuild) | 1 |
3 files changed, 32 insertions, 27 deletions
diff --git a/sys-firmware/gnuk/files/1.2.3-MINOR-Always-get-version-from-the-VERSION-file.patch b/sys-firmware/gnuk/files/1.2.3-MINOR-Always-get-version-from-the-VERSION-file.patch deleted file mode 100644 index fa224355..00000000 --- a/sys-firmware/gnuk/files/1.2.3-MINOR-Always-get-version-from-the-VERSION-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b3cb038ab4120147a7dd1cdb30fea587942af4db Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sun, 19 Feb 2017 02:18:13 +0000 -Subject: [PATCH] MINOR: Always get version from the VERSION file - ---- - src/configure | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/configure b/src/configure -index 155660f2ceb6..aed5f88dddba 100755 ---- a/src/configure -+++ b/src/configure -@@ -46,11 +46,7 @@ hid_card_change=no - factory_reset=no - - # Revision number --if test -e ../.git; then -- REVISION=`git describe --dirty="-modified"` --else -- REVISION=`cat ../VERSION` --fi -+REVISION=`cat ../VERSION` - - # Process each option - for option; do diff --git a/sys-firmware/gnuk/files/1.2.5-MINOR-Always-get-version-from-the-VERSION-file.patch b/sys-firmware/gnuk/files/1.2.5-MINOR-Always-get-version-from-the-VERSION-file.patch new file mode 100644 index 00000000..84a95484 --- /dev/null +++ b/sys-firmware/gnuk/files/1.2.5-MINOR-Always-get-version-from-the-VERSION-file.patch @@ -0,0 +1,32 @@ +From 8340ef59c15f25515fae1e6d65c4b3792a3db6cf Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sun, 19 Feb 2017 02:18:13 +0000 +Subject: [PATCH] MINOR: Always get version from the VERSION file + +--- + src/configure | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/src/configure b/src/configure +index 18f1bd310066..d258752db295 100755 +--- a/src/configure ++++ b/src/configure +@@ -46,17 +46,7 @@ factory_reset=no + flash_override="" + + # Revision number +-if test -e ../.git; then +- if type git >/dev/null 2>&1; then +- REVISION=$(git describe --dirty="-modified") +- else +- # echo 'No git available, please install git' +- GIT_REVISION=$(sed -e 's/^\(.......\).*$/g\1/' "../.git/$(sed -e 's/^ref: //' ../.git/HEAD)") +- REVISION=$(cat ../VERSION)-$GIT_REVISION +- fi +-else +- REVISION=$(cat ../VERSION) +-fi ++REVISION=$(cat ../VERSION) + + # Process each option + for option; do diff --git a/sys-firmware/gnuk/gnuk-1.2.3.ebuild b/sys-firmware/gnuk/gnuk-1.2.5.ebuild index 33ec2103..ae705f92 100644 --- a/sys-firmware/gnuk/gnuk-1.2.3.ebuild +++ b/sys-firmware/gnuk/gnuk-1.2.5.ebuild @@ -52,7 +52,6 @@ src_prepare () { src_configure() { cd "${S}/src" ./configure \ - --verbose \ --target=FST_01 \ --vidpid=234b:0000 \ --enable-certdo \ |