From 5251846023d9099380c4fc1f4a26b8c3ec6841b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sun, 3 Jun 2018 17:46:12 +0000
Subject: [PATCH] ayufan: dev.mk: update ci scripts

Change-Id: I703cd9d4da334d04f22b56a6d13e33e180550f21
---
 .gitlab-ci.yml | 24 +++++++++++++++++++++++-
 dev.mk         | 26 ++++++++++++++------------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dc8d93cc179d7..1dcf823321f28e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,29 @@ build:
   only: [branches]
   script:
     - rm -f ../*.deb
-    - export RELEASE=$(date +%Y%m%d%H%M)
+    - |
+      set -x
+
+      all_pipeline_ids() {
+        for i in $(seq 1 "${2:-10}"); do
+          result=$(curl "https://gitlab.com/$1/pipelines.json?page=$i" |
+            jq -r '.pipelines[].id')
+
+          [[ -z "$result" ]] && return 0
+          echo "$result"
+        done
+
+        echo "all_pipeline_ids: failed to get all ids" 1>&2
+        return 1
+      }
+
+      get_pipeline_iid() {
+        all_pipeline_ids "$1" "$3" | jq -r "select(. <= $2)" | wc -l
+      }
+
+      export RELEASE=$((1000+$(get_pipeline_iid "$CI_PROJECT_PATH" "$CI_PIPELINE_ID")))
+
+      echo "Current release is $RELEASE."
     - ./dev-make kernel-package
     - |
       set -x
diff --git a/dev.mk b/dev.mk
index 5ec07dd8b1c32f..51786087b4bf3e 100644
--- a/dev.mk
+++ b/dev.mk
@@ -1,27 +1,29 @@
-RELEASE ?= 0.1~dev
-KERNEL_EXTRAVERSION ?= -rockchip-ayufan-$(RELEASE)
+RELEASE ?= 1
 KERNEL_DEFCONFIG ?= rockchip_linux_defconfig
 
 BOARD ?= rk3328-rock64
 
-export KDEB_PKGVERSION=$(RELEASE)~ayufan
+KERNEL_RELEASE ?= $(shell $(KERNEL_MAKE) -s kernelversion)
+
+export KDEB_PKGVERSION=$(KERNEL_RELEASE)-$(RELEASE)-ayufan
 
 KERNEL_MAKE ?= make \
-	EXTRAVERSION=$(KERNEL_EXTRAVERSION) \
 	ARCH=arm64 \
 	HOSTCC=aarch64-linux-gnu-gcc \
 	CROSS_COMPILE="ccache aarch64-linux-gnu-"
 
-KERNEL_RELEASE ?= $(shell $(KERNEL_MAKE) -s kernelversion)
-
 .config: arch/arm64/configs/$(KERNEL_DEFCONFIG)
 	$(KERNEL_MAKE) $(KERNEL_DEFCONFIG)
 
+.PHONY: .scmversion
+.scmversion:
+	@echo "-$(RELEASE)-ayufan-g$$(git rev-parse --short HEAD)" > .scmversion
+
 version:
-	@$(KERNEL_MAKE) -s kernelversion
+	@echo "$(KDEB_PKGVERSION)"
 
 .PHONY: info
-info: .config
+info: .config .scmversion
 	@$(KERNEL_MAKE) -s kernelrelease
 
 .PHONY: kernel-menuconfig
@@ -32,20 +34,20 @@ kernel-menuconfig:
 	mv defconfig arch/arm64/configs/$(KERNEL_DEFCONFIG)
 
 .PHONY: kernel-image
-kernel-image: .config
+kernel-image: .config .scmversion
 	$(KERNEL_MAKE) Image dtbs -j$$(nproc)
 
 .PHONY: kernel-modules
-kernel-image-and-modules: .config
+kernel-image-and-modules: .config .scmversion
 	$(KERNEL_MAKE) Image modules dtbs -j$$(nproc)
 	$(KERNEL_MAKE) modules_install INSTALL_MOD_PATH=$(CURDIR)/out/linux_modules
 
 .PHONY: kernel-package
-kernel-package: .config
+kernel-package: .config .scmversion
 	$(KERNEL_MAKE) bindeb-pkg -j$$(nproc)
 
 .PHONY: kernel-update-dts
-kernel-update-dts: .config
+kernel-update-dts: .config .scmversion
 	$(KERNEL_MAKE) dtbs -j$$(nproc)
 	rsync --partial --checksum -rv arch/arm64/boot/dts/rockchip/$(BOARD).dtb root@$(REMOTE_HOST):$(REMOTE_DIR)/boot/efi/dtb