Don't use VERSION as it collides with kernel

Nislaco · Apr 29, 2017 · 110bdff · 110bdff
1 parent e8ab83d
commit 110bdff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -20,7 +20,6 @@ node('docker && linux-build') {
 
       environment.inside("--privileged -u 0:0") {
         withEnv([
-          "VERSION=$VERSION",
           'USE_CCACHE=true',
         ]) {
             stage 'Prepare'
@@ -35,7 +34,7 @@ node('docker && linux-build') {
             sh '''#!/bin/bash
               set +xe
               export CCACHE_DIR=$WORKSPACE/ccache
-              make VERSION="$BUILD_ID" RELEASE="$BUILD_NUMBER"
+              make DATE="$DATE" RELEASE="$BUILD_NUMBER"
             '''
         }
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
-export VERSION ?= dev
-export DATE ?= $(VERSION)
+export DATE ?= dev
 export RELEASE ?= 1
 LOCALVERSION ?= ayufan-$(RELEASE)
 LINUX_BRANCH ?= my-hacks-1.2
@@ -43,25 +42,25 @@ boot-tools/.git:
 
 boot-tools: boot-tools/.git
 
-linux-pine64-$(VERSION).tar.xz: linux/arch/arm64/boot/Image boot-tools kernel/initrd.gz
+linux-pine64-$(DATE).tar.xz: linux/arch/arm64/boot/Image boot-tools kernel/initrd.gz
 	cd kernel && bash ./make_kernel_tarball.sh $(shell dirname $(shell readlink -f "$@"))
 
-kernel-tarball: linux-pine64-$(VERSION).tar.xz
+kernel-tarball: linux-pine64-$(DATE).tar.xz
 
-simple-image-pinebook.img: linux-pine64-$(VERSION).tar.xz boot-tools
+simple-image-pinebook-$(DATE).img: linux-pine64-$(DATE).tar.xz boot-tools
 	cd simpleimage && \
 		export boot0=../boot-tools/build/boot0_pinebook.bin && \
 		export uboot=../boot-tools/build/u-boot-sun50iw1p1-secure-with-pinebook-dtb.bin && \
-		bash ./make_simpleimage.sh $(shell readlink -f "$@") 100 $(shell readlink -f linux-pine64-$(VERSION).tar.xz)
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 100 $(shell readlink -f linux-pine64-$(DATE).tar.xz)
 
 %.img.xz: %.img
 	xz -3 $<
 
-xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img: simple-image-pinebook.img.xz linux-pine64-$(VERSION).tar.xz boot-tools
+xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img: simple-image-pinebook-$(DATE).img.xz linux-pine64-$(DATE).tar.xz boot-tools
 	sudo MODEL=pinebook DATE=$(DATE) bash \
 		./build-pine64-image.sh \
 		$(shell readlink -f simple-image-pinebook.img.xz) \
-		$(shell readlink -f linux-pine64-$(VERSION).tar.xz) \
+		$(shell readlink -f linux-pine64-$(DATE).tar.xz) \
 		xenial \
 		$(RELEASE)