mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
5f3c96c285
Move the revision info to the VERSION_CODE variable and default VERSION_NUMBER
to CURRENT for master branch builds.
Also introduce a new menuconfig option CONFIG_VERSION_CODE which allows users
to override the revision value put into VERSION_CODE and adjust the template
files used by the base-files package to accomodate for the changed semantics.
While we're at it, also adjust the various URLs to match the current web site.
After this commit, the relevent files will look like the examples given below:
# cat /etc/openwrt_version
r2398+1
# cat /etc/openwrt_release
DISTRIB_ID='LEDE'
DISTRIB_RELEASE='CURRENT'
DISTRIB_REVISION='r2398+1'
DISTRIB_CODENAME='reboot'
DISTRIB_TARGET='x86/64'
DISTRIB_DESCRIPTION='LEDE Reboot CURRENT r2398+1'
DISTRIB_TAINTS='no-all override'
# cat /usr/lib/os-release
NAME="LEDE"
VERSION="CURRENT, Reboot"
ID="lede"
ID_LIKE="lede openwrt"
PRETTY_NAME="LEDE Reboot CURRENT"
VERSION_ID="current"
HOME_URL="http://lede-project.org/"
BUG_URL="http://bugs.lede-project.org/"
SUPPORT_URL="http://forum.lede-project.org/"
BUILD_ID="r2398+1"
LEDE_BOARD="x86/64"
LEDE_TAINTS="no-all override"
LEDE_DEVICE_MANUFACTURER="LEDE"
LEDE_DEVICE_MANUFACTURER_URL="http://lede-project.org/"
LEDE_DEVICE_PRODUCT="Generic"
LEDE_DEVICE_REVISION="v0"
LEDE_RELEASE="LEDE Reboot CURRENT r2398+1"
On a release branch, those files would look like:
# cat /etc/openwrt_version
r2399
# cat /etc/openwrt_release
DISTRIB_ID='LEDE'
DISTRIB_RELEASE='16.12-CURRENT'
DISTRIB_REVISION='r2399'
DISTRIB_CODENAME='test_release'
DISTRIB_TARGET='x86/64'
DISTRIB_DESCRIPTION='LEDE Test Release 16.12-CURRENT r2399'
DISTRIB_TAINTS='no-all override'
# cat /usr/lib/os-release
NAME="LEDE"
VERSION="16.12-CURRENT, Test Release"
ID="lede"
ID_LIKE="lede openwrt"
PRETTY_NAME="LEDE Test Release 16.12-CURRENT"
VERSION_ID="16.12-current"
HOME_URL="http://lede-project.org/"
BUG_URL="http://bugs.lede-project.org/"
SUPPORT_URL="http://forum.lede-project.org/"
BUILD_ID="r2399"
LEDE_BOARD="x86/64"
LEDE_TAINTS="no-all override"
LEDE_DEVICE_MANUFACTURER="LEDE"
LEDE_DEVICE_MANUFACTURER_URL="http://lede-project.org/"
LEDE_DEVICE_PRODUCT="Generic"
LEDE_DEVICE_REVISION="v0"
LEDE_RELEASE="LEDE Test Release 16.12-CURRENT r2399"
On a release tag, those files would look like:
# cat /etc/openwrt_version
r2500
# cat /etc/openwrt_release
DISTRIB_ID='LEDE'
DISTRIB_RELEASE='17.02.1'
DISTRIB_REVISION='r2500'
DISTRIB_CODENAME='mighty_unicorn'
DISTRIB_TARGET='x86/64'
DISTRIB_DESCRIPTION='LEDE Mighty Unicorn 17.02.1 r2500'
DISTRIB_TAINTS='no-all override'
# cat /usr/lib/os-release
NAME="LEDE"
VERSION="17.02.1, Mighty Unicorn"
ID="lede"
ID_LIKE="lede openwrt"
PRETTY_NAME="LEDE Mighty Unicorn 17.02.1"
VERSION_ID="17.02.1"
HOME_URL="http://lede-project.org/"
BUG_URL="http://bugs.lede-project.org/"
SUPPORT_URL="http://forum.lede-project.org/"
BUILD_ID="r2500"
LEDE_BOARD="x86/64"
LEDE_TAINTS="no-all override"
LEDE_DEVICE_MANUFACTURER="LEDE"
LEDE_DEVICE_MANUFACTURER_URL="http://lede-project.org/"
LEDE_DEVICE_PRODUCT="Generic"
LEDE_DEVICE_REVISION="v0"
LEDE_RELEASE="LEDE Mighty Unicorn 17.02.1 r2500"
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Acked-by: Felix Fietkau <nbd@nbd.name>
113 lines
3.8 KiB
Makefile
113 lines
3.8 KiB
Makefile
#
|
|
# Copyright (C) 2012-2015 OpenWrt.org
|
|
# Copyright (C) 2016 LEDE Project
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
# Substituted by SDK, do not remove
|
|
# REVISION:=x
|
|
# SOURCE_DATE_EPOCH:=x
|
|
|
|
RELEASE:=Reboot
|
|
|
|
PKG_CONFIG_DEPENDS += \
|
|
CONFIG_VERSION_BUG_URL \
|
|
CONFIG_VERSION_NUMBER \
|
|
CONFIG_VERSION_CODE \
|
|
CONFIG_VERSION_NICK \
|
|
CONFIG_VERSION_REPO \
|
|
CONFIG_VERSION_DIST \
|
|
CONFIG_VERSION_MANUFACTURER \
|
|
CONFIG_VERSION_MANUFACTURER_URL \
|
|
CONFIG_VERSION_PRODUCT \
|
|
CONFIG_VERSION_SUPPORT_URL \
|
|
CONFIG_VERSION_HWREV \
|
|
|
|
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),CURRENT)
|
|
|
|
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_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
|
|
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
|
|
|
|
VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
|
|
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)
|
|
VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
|
|
|
|
VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
|
|
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)
|
|
|
|
VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
|
|
VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/)
|
|
|
|
VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
|
|
VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
|
|
|
|
VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
|
|
VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
|
|
|
|
VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
|
|
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
|
|
|
|
VERSION_HWREV:=$(call qstrip_escape,$(CONFIG_VERSION_HWREV))
|
|
VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0)
|
|
|
|
define taint2sym
|
|
$(CONFIG_$(firstword $(subst :, ,$(subst +,,$(subst -,,$(1))))))
|
|
endef
|
|
|
|
define taint2name
|
|
$(lastword $(subst :, ,$(1)))
|
|
endef
|
|
|
|
VERSION_TAINT_SPECS := \
|
|
-ALL_KMODS:no-all \
|
|
-IPV6:no-ipv6 \
|
|
+USE_GLIBC:glibc \
|
|
+USE_MKLIBS:mklibs \
|
|
+BUSYBOX_CUSTOM:busybox \
|
|
+OVERRIDE_PKGS:override \
|
|
|
|
VERSION_TAINTS := $(strip $(foreach taint,$(VERSION_TAINT_SPECS), \
|
|
$(if $(findstring +,$(taint)), \
|
|
$(if $(call taint2sym,$(taint)),$(call taint2name,$(taint))), \
|
|
$(if $(call taint2sym,$(taint)),,$(call taint2name,$(taint))) \
|
|
)))
|
|
|
|
PKG_CONFIG_DEPENDS += $(foreach taint,$(VERSION_TAINT_SPECS),$(call taint2sym,$(taint)))
|
|
|
|
VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
|
|
-e 's,%V,$(VERSION_NUMBER),g' \
|
|
-e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
|
|
-e 's,%C,$(VERSION_CODE),g' \
|
|
-e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \
|
|
-e 's,%N,$(VERSION_NICK),g' \
|
|
-e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \
|
|
-e 's,%D,$(VERSION_DIST),g' \
|
|
-e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
|
|
-e 's,%R,$(REVISION),g' \
|
|
-e 's,%T,$(BOARD),g' \
|
|
-e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
|
|
-e 's,%A,$(ARCH_PACKAGES),g' \
|
|
-e 's,%t,$(VERSION_TAINTS),g' \
|
|
-e 's,%M,$(VERSION_MANUFACTURER),g' \
|
|
-e 's,%m,$(VERSION_MANUFACTURER_URL),g' \
|
|
-e 's,%b,$(VERSION_BUG_URL),g' \
|
|
-e 's,%s,$(VERSION_SUPPORT_URL),g' \
|
|
-e 's,%P,$(VERSION_PRODUCT),g' \
|
|
-e 's,%h,$(VERSION_HWREV),g'
|
|
|
|
VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED))
|