summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-08-11 12:44:07 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-10-20 12:51:52 (GMT)
commite6e5c79918d0dcefa96da2eb36c7582e62834d9c (patch)
tree161e2dfd3c0ccf22507c570254b3415376bf4492
parentf699437f727e96fb7cdf1e39c9808d6765f182e0 (diff)
downloadmeta-yogurt-e6e5c79918d0dcefa96da2eb36c7582e62834d9c.zip
meta-yogurt-e6e5c79918d0dcefa96da2eb36c7582e62834d9c.tar.bz2
layer: new versioning setup
We now set the bsp version string by using the DISTRO_VERSION variable. With every release we commit the bsp version to conf/distro/yogurt.conf. For KSP work you can define a version append: DISTRO_VERSION_append = "-KSPXXXX-yyyy-mm-dd" in your layer.conf. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/distro/yogurt.conf6
-rw-r--r--recipes-bsp/barebox/barebox-ipl_%.bbappend1
-rw-r--r--recipes-bsp/barebox/barebox_%.bbappend1
-rw-r--r--recipes-kernel/linux/linux-mainline_%.bbappend1
-rw-r--r--recipes-kernel/linux/linux-ti_%.bbappend1
5 files changed, 8 insertions, 2 deletions
diff --git a/conf/distro/yogurt.conf b/conf/distro/yogurt.conf
index 5b1f883..54362d8 100644
--- a/conf/distro/yogurt.conf
+++ b/conf/distro/yogurt.conf
@@ -1,7 +1,9 @@
DISTRO = "yogurt"
DISTRO_NAME = "Yogurt (Phytec Example Distribution)"
-DISTRO_VERSION = "${BSP_VERSION}"
-DISTRO_CODENAME = "dizzy"
+DISTRO_VERSION ??= "UNASSIGNED"
+DISTRO_VERSION_mx6 = "i.MX6-PD15.3-rc"
+DISTRO_VERSION_ti33x = "AM335x-PD15.2-rc"
+DISTRO_CODENAME = "fido"
SDK_VENDOR = "-yogurtsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
diff --git a/recipes-bsp/barebox/barebox-ipl_%.bbappend b/recipes-bsp/barebox/barebox-ipl_%.bbappend
new file mode 100644
index 0000000..6d9e000
--- /dev/null
+++ b/recipes-bsp/barebox/barebox-ipl_%.bbappend
@@ -0,0 +1 @@
+BAREBOX_LOCALVERSION = "-${DISTRO_VERSION}"
diff --git a/recipes-bsp/barebox/barebox_%.bbappend b/recipes-bsp/barebox/barebox_%.bbappend
new file mode 100644
index 0000000..6d9e000
--- /dev/null
+++ b/recipes-bsp/barebox/barebox_%.bbappend
@@ -0,0 +1 @@
+BAREBOX_LOCALVERSION = "-${DISTRO_VERSION}"
diff --git a/recipes-kernel/linux/linux-mainline_%.bbappend b/recipes-kernel/linux/linux-mainline_%.bbappend
new file mode 100644
index 0000000..d73e7e6
--- /dev/null
+++ b/recipes-kernel/linux/linux-mainline_%.bbappend
@@ -0,0 +1 @@
+LINUX_VERSION_EXTENSION = "-${DISTRO_VERSION}"
diff --git a/recipes-kernel/linux/linux-ti_%.bbappend b/recipes-kernel/linux/linux-ti_%.bbappend
new file mode 100644
index 0000000..d73e7e6
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti_%.bbappend
@@ -0,0 +1 @@
+LINUX_VERSION_EXTENSION = "-${DISTRO_VERSION}"