From 2eedbf21ac62b5e15f5ba896b1e8b7125c8052de Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 18 Feb 2015 14:25:08 +0100 Subject: build: Check if called from git repo when generating GIT_VERSION Signed-off-by: Tobias Klauser --- Makefile | 7 ++++++- llmnr-query.c | 4 ++-- llmnrd.c | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 84cd2cf..3e4205d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ # Copyright (C) 2014-2015 Tobias Klauser VERSION = 0.1-rc1 -GIT_VERSION = `git describe --always` # llmnrd binary D_P = llmnrd @@ -21,6 +20,12 @@ INSTALL = install CFLAGS ?= -W -Wall -O2 LDFLAGS ?= +ifeq ($(shell git rev-parse > /dev/null 2>&1; echo $$?), 0) + GIT_VERSION = "(git id $(shell git describe --always))" +else + GIT_VERSION = +endif + CFLAGS += -DVERSION_STRING=\"v$(VERSION)\" -DGIT_VERSION=\"$(GIT_VERSION)\" ifeq ($(DEBUG), 1) diff --git a/llmnr-query.c b/llmnr-query.c index 3635a53..a1fac67 100644 --- a/llmnr-query.c +++ b/llmnr-query.c @@ -61,9 +61,9 @@ static void __noreturn usage_and_exit(int status) static void __noreturn version_and_exit(void) { - fprintf(stdout, "llmnr-query %s (git id %s)\n" + fprintf(stdout, "llmnr-query %s %s\n" "Copyright (C) 2015 Tobias Klauser \n" - "Licensed unter the GNU General Public License, version 2\n", + "Licensed under the GNU General Public License, version 2\n", VERSION_STRING, GIT_VERSION); exit(EXIT_SUCCESS); } diff --git a/llmnrd.c b/llmnrd.c index ab3a003..ff70ff8 100644 --- a/llmnrd.c +++ b/llmnrd.c @@ -62,9 +62,9 @@ static void __noreturn usage_and_exit(int status) static void __noreturn version_and_exit(void) { - fprintf(stdout, "llmnrd %s (git id %s)\n" + fprintf(stdout, "llmnrd %s %s\n" "Copyright (C) 2014-2015 Tobias Klauser \n" - "Licensed unter the GNU General Public License, version 2\n", + "Licensed under the GNU General Public License, version 2\n", VERSION_STRING, GIT_VERSION); exit(EXIT_SUCCESS); } -- cgit v1.2.3-54-g00ecf vate-remove&id=8b7fac50ab7f2668c43795c135025c472922a344'>diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/rxrpc/input.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.cmove&id=39c1573748166b348117d6bf161ceffce90e734f'>f766298511a9978e79f69d84e94e6b1ce8259429
parent3ad0e83cf86bcaeb6ca3c37060a3ce866b25fb42 (diff)
parent984d7a1ec67ce3a46324fa4bcb4c745bbc266cf2 (diff)
Merge tag 'powerpc-4.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "Fixes marked for stable: - Set missing wakeup bit in LPCR on POWER9 - Fix the early OPAL console wrappers - Fixup kernel read only mapping Fixes for code merged this cycle: - Fix missing CRCs, add more asm-prototypes.h declarations" * tag 'powerpc-4.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/mm: Fixup kernel read only mapping powerpc/boot: Fix the early OPAL console wrappers powerpc: Fix missing CRCs, add more asm-prototypes.h declarations powerpc: Set missing wakeup bit in LPCR on POWER9
Diffstat