Browse Source

silence build warnings when no git is present

Change-Id: I387f5db9d7174c63af716d082fb5397e685da19d
changes/40/23540/6
Richard Fuchs 7 years ago
parent
commit
4e6f2dc5f7
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      kernel-module/Makefile
  2. +2
    -2
      lib/lib.Makefile

+ 2
- 2
kernel-module/Makefile View File

@ -9,12 +9,12 @@ ifeq ($(RTPENGINE_VERSION),)
ifneq ($(DPKG_PRSCHNGLG),)
DPKG_PRSCHNGLG=$(shell dpkg-parsechangelog -l$(DEB_CHANGELOG) | awk '/^Version: / {print $$2}')
endif
GIT_BR_COMMIT=git-$(shell cd $(M) && git rev-parse --abbrev-ref --symbolic-full-name HEAD)-$(shell cd $(M) && git rev-parse --short HEAD)
GIT_BR_COMMIT=git-$(shell cd $(M) && git rev-parse --abbrev-ref --symbolic-full-name HEAD 2> /dev/null)-$(shell cd $(M) && git rev-parse --short HEAD 2> /dev/null)
ifneq ($(DPKG_PRSCHNGLG),)
RTPENGINE_VERSION+=$(DPKG_PRSCHNGLG)
endif
ifneq ($(GIT_BR_COMMIT),)
ifneq ($(GIT_BR_COMMIT),git--)
RTPENGINE_VERSION+=$(GIT_BR_COMMIT)
endif


+ 2
- 2
lib/lib.Makefile View File

@ -10,12 +10,12 @@ ifeq ($(RTPENGINE_VERSION),)
ifneq ($(DPKG_PRSCHNGLG),)
DPKG_PRSCHNGLG=$(shell dpkg-parsechangelog -l$(RTPENGINE_ROOT_DIR)/debian/changelog | awk '/^Version: / {print $$2}')
endif
GIT_BR_COMMIT=git-$(shell git rev-parse --abbrev-ref --symbolic-full-name HEAD)-$(shell git rev-parse --short HEAD)
GIT_BR_COMMIT=git-$(shell git rev-parse --abbrev-ref --symbolic-full-name HEAD 2> /dev/null)-$(shell git rev-parse --short HEAD 2> /dev/null)
ifneq ($(DPKG_PRSCHNGLG),)
RTPENGINE_VERSION+=$(DPKG_PRSCHNGLG)
endif
ifneq ($(GIT_BR_COMMIT),)
ifneq ($(GIT_BR_COMMIT),git--)
RTPENGINE_VERSION+=$(GIT_BR_COMMIT)
endif


Loading…
Cancel
Save