From 326b2247fbee78fca13726994e6ee5e27a3e464c Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Thu, 8 Nov 2018 23:26:23 +0100
Subject: [PATCH] Fix /etc/version

BugzID: 54169
---
 classes/externalgitsrc.bbclass                       | 1 -
 conf/distro/netmodule-linux.conf                     | 2 ++
 recipes-core/images/netmodule-linux-image-dev.bb     | 1 -
 recipes-core/images/netmodule-linux-image-minimal.bb | 3 +--
 recipes-core/images/netmodule-linux-image.bb         | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/classes/externalgitsrc.bbclass b/classes/externalgitsrc.bbclass
index 08a7023..e95558b 100644
--- a/classes/externalgitsrc.bbclass
+++ b/classes/externalgitsrc.bbclass
@@ -11,6 +11,5 @@ def get_externalsrc_rev(d):
                                   shell=True).strip()
     
     rev = rev.decode("utf-8") 
-    bb.note("got externsrc SRCPV: %s" % (rev))
     return rev
 
diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf
index 092e3e4..9a7daf2 100644
--- a/conf/distro/netmodule-linux.conf
+++ b/conf/distro/netmodule-linux.conf
@@ -90,3 +90,5 @@ PACKAGECONFIG_append_pn-nodejs = "openssl"
 
 # Should not be here but is required when parsing recipes with meta-updater layer
 OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot"
+
+INHERIT += "externalgitsrc"
diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb
index fcba339..aea253e 100644
--- a/recipes-core/images/netmodule-linux-image-dev.bb
+++ b/recipes-core/images/netmodule-linux-image-dev.bb
@@ -50,4 +50,3 @@ IMAGE_INSTALL_append = " \
                 devmem2 \
                 "
 
-BUILDNAME .= "-dev"
diff --git a/recipes-core/images/netmodule-linux-image-minimal.bb b/recipes-core/images/netmodule-linux-image-minimal.bb
index a9ab427..eeadd35 100644
--- a/recipes-core/images/netmodule-linux-image-minimal.bb
+++ b/recipes-core/images/netmodule-linux-image-minimal.bb
@@ -27,6 +27,5 @@ IMAGE_INSTALL = " \
 
 LICENSE = "BSD"
 
-INHERIT += "externalgitsrc"
-BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};netmodule-linux-image-minimal"
+BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
 
diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 8e8a774..a982bf4 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -119,8 +119,7 @@ IMAGE_PREPROCESS_COMMAND_sota += " moveRPMDatabase;"
 
 IMAGE_BOOT_FILES = "MLO u-boot.img"
 
-INHERIT += "externalgitsrc"
-BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};netmodule-linux-image"
+BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
 
 # Change the location of /var/lib/rpm to /usr/lib/rpm.
 # This makes the rpm package index consistent with installed packages.