From 74e7acf21276ec4ee4b13698a9363f64d7092680 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Mon, 22 Jan 2018 19:52:44 -0500 Subject: [PATCH] Start v1.5 branch and add 4.9.x series kernel (w/o upstream patches) --- feeds.conf.default | 2 +- include/kernel-version.mk | 3 +++ include/version.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/feeds.conf.default b/feeds.conf.default index 3089940cc3..101ea9cbe0 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1 +1 @@ -src-git packages https://gogs.librecmc.org/libreCMC/package-feed.git;v1.4 +src-git packages https://gogs.librecmc.org/libreCMC/package-feed.git;v1.5 diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 40f69a27b3..66865406bd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,8 +3,11 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.4 = .108 +LINUX_VERSION-4.9 = .77 LINUX_KERNEL_HASH-4.4.108 = aaf270b84e7b55e7cad0777a6d17515b9afa681d320178364d66926acebd8cb3 +LINUX_KERNEL_HASH-4.9.77 = a3471ef456672b1e7ebcd454596634bd6bc338e7c4c87116155fda30ab1559d1 + ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) endif diff --git a/include/version.mk b/include/version.mk index dc5321117c..31b3e412c7 100644 --- a/include/version.mk +++ b/include/version.mk @@ -31,13 +31,13 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.4.2) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.5-next) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) -VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) +VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),Dropstart-STEP) VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://librecmc.org/librecmc/downloads/snapshots/%v) -- 2.25.1