From 202b1ae771ebebb6b962714aaf085dea7f5abf3e Mon Sep 17 00:00:00 2001
From: Martin Ejdestig <mejdestig@luxoft.com>
Date: Fri, 10 May 2019 13:34:04 +0200
Subject: [PATCH] Rename image from pulsar-image to meta-ivi-image

There is no suitable code name for the 15.0.0 release. Use a more generic
image name.

Signed-off-by: Martin Ejdestig <mejdestig@luxoft.com>
---
 README.build                                                  | 2 +-
 README.md                                                     | 3 +--
 meta-ivi/conf/conf-notes.txt                                  | 2 +-
 meta-ivi/conf/distro/poky-ivi-systemd.conf                    | 4 ++--
 .../images/{pulsar-image.bb => meta-ivi-image.bb}             | 2 +-
 scripts/ci-build.sh                                           | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename meta-ivi/recipes-yocto-ivi/images/{pulsar-image.bb => meta-ivi-image.bb} (86%)

diff --git a/README.build b/README.build
index 65264112..4240cb50 100644
--- a/README.build
+++ b/README.build
@@ -11,7 +11,7 @@ export TEMPLATECONF=PATH_TO_META_IVI/meta-ivi/meta-ivi/conf
    > $ source poky/oe-init-build-env
 
 3. Build a s/w image including GENIVI 13.0 (Orion) components
-   > $ bitbake pulsar-image
+   > $ bitbake meta-ivi-image
 
 4. Run the emulator:
    > for qemu vexpressa9:  
diff --git a/README.md b/README.md
index 1516e6aa..420230f3 100644
--- a/README.md
+++ b/README.md
@@ -112,8 +112,7 @@ URI: git://git.yoctoproject.org/meta-gplv2
 > revision: aabc30f3bd03f97326fb8596910b94639fea7575
 
 Using the above git SHAs and the master meta-ivi branch,
- bitbaking pulsar-image is known to work
- (the pulsar-image build should be aligned with GENIVI 14.0).
+ bitbaking meta-ivi-image is known to work.
 
 For creating a specific GENIVI compliant image version, please make sure you
 git checkout the related meta-ivi branch and follow the build instructions
diff --git a/meta-ivi/conf/conf-notes.txt b/meta-ivi/conf/conf-notes.txt
index 907a4307..ef88431d 100644
--- a/meta-ivi/conf/conf-notes.txt
+++ b/meta-ivi/conf/conf-notes.txt
@@ -1,4 +1,4 @@
 Common targets are:
-    pulsar-image
+    meta-ivi-image
     ivi-image
 
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 994743aa..e69c5db8 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -2,8 +2,8 @@ require conf/distro/poky.conf
 
 DISTRO = "poky-ivi-systemd"
 DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)"
-DISTRO_VERSION = "14.0.0"
-DISTRO_CODENAME = "pulsar"
+DISTRO_VERSION = "15.0.0"
+DISTRO_CODENAME = "meta-ivi"
 
 MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>"
 
diff --git a/meta-ivi/recipes-yocto-ivi/images/pulsar-image.bb b/meta-ivi/recipes-yocto-ivi/images/meta-ivi-image.bb
similarity index 86%
rename from meta-ivi/recipes-yocto-ivi/images/pulsar-image.bb
rename to meta-ivi/recipes-yocto-ivi/images/meta-ivi-image.bb
index 1aa6a0cd..78d5203c 100644
--- a/meta-ivi/recipes-yocto-ivi/images/pulsar-image.bb
+++ b/meta-ivi/recipes-yocto-ivi/images/meta-ivi-image.bb
@@ -1,5 +1,5 @@
 # Base this image on generic IVI image
 require recipes-yocto-ivi/images/ivi-image.bb
 
-PV = "14.0.0"
+PV = "15.0.0"
 
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index f8525708..0943da08 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -595,7 +595,7 @@ fi
 # of the SDK parts.
 
 if [[ "$BUILD_SDK" != "true" ]]; then
-  bitbake pulsar-image
+  bitbake meta-ivi-image
 fi
 
 if [[ "$BUILD_TEST_IMAGE" == "true" ]]; then
@@ -605,7 +605,7 @@ fi
 
 if [[ "$BUILD_SDK" == "true" ]]; then
   # (Anticipating a future sdk image:)
-  bitbake pulsar-image-sdk
+  bitbake meta-ivi-image-sdk
 fi
 
 cd "$BASEDIR"