nixpkgs/pkgs/servers/foundationdb/patches/fix-scm-version.patch
Austin Seipp a13a0c8de4
foundationdb: refactor vsmake patch application
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:10 -05:00

43 lines
1.4 KiB
Diff

diff --git a/build/scver.mk b/build/scver.mk
index bdae8be..7539864 100644
--- a/build/scver.mk
+++ b/build/scver.mk
@@ -98,33 +98,10 @@ endif
GITPRESENT := $(wildcard $(FDBDIR)/.git)
HGPRESENT := $(wildcard $(FDBDIR)/.hg)
-# Use Git, if not missing
-ifneq ($(GITPRESENT),)
- SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null)
- ifneq ($(SCVER),)
- VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD)
- SOURCE_CONTROL := GIT
- SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD)
- else
-$(error Missing git executable on $(PLATFORM) )
- endif
-# Otherwise, use Mercurial
-else
- # Otherwise, use Mercurial, if not missing
- ifneq ($(HGPRESENT),)
- SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null)
- ifdef SCVER
- VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n)
- SOURCE_CONTROL := MERCURIAL
- SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch)
- else
-$(error Missing hg executable on $(PLATFORM))
- endif
- else
- FDBFILES := (shell ls -la $(FDBDIR))
-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES))
- endif
-endif
+# NixOS-specific non-VCS packaging, filled out by the nix build
+SOURCE_CONTROL := GIT
+VERSION_ID := @NIXOS_FDB_VERSION_ID@
+SCBRANCH := @NIXOS_FDB_SCBRANCH@
# Set the RELEASE variable based on the KVRELEASE variable.
ifeq ($(KVRELEASE),1)