From 7c234cb8efc9d4f76f9cb45fb97ae9529db4166f Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 24 May 2017 18:01:34 -0500
Subject: Add mlinux-version back into the core build

---
 conf/distro/mlinux.conf                    |  2 +-
 recipes-core/mlinux/mlinux-version.bb      | 22 ++++++++++++++++++++++
 recipes-core/mlinux/mlinux-version.bb.orig | 22 ----------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 recipes-core/mlinux/mlinux-version.bb
 delete mode 100644 recipes-core/mlinux/mlinux-version.bb.orig

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index a47f931..9e54052 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -30,7 +30,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages to add to images
-#DISTRO_EXTRA_RDEPENDS += "mlinux-version"
+DISTRO_EXTRA_RDEPENDS += "mlinux-version"
 
 # add mlinux source mirror
 INHERIT += "mlinux-mirrors"
diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb
new file mode 100644
index 0000000..f2debe1
--- /dev/null
+++ b/recipes-core/mlinux/mlinux-version.bb
@@ -0,0 +1,22 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit mlinux_metadata_scm
+
+# always parse this file so PV can change automatically
+__BB_DONT_CACHE = "1"
+
+PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
+PR = "r2"
+PE = "1"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+	mkdir -p ${D}${sysconfdir}
+	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
+	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
+	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
+	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
+}
diff --git a/recipes-core/mlinux/mlinux-version.bb.orig b/recipes-core/mlinux/mlinux-version.bb.orig
deleted file mode 100644
index f2debe1..0000000
--- a/recipes-core/mlinux/mlinux-version.bb.orig
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit mlinux_metadata_scm
-
-# always parse this file so PV can change automatically
-__BB_DONT_CACHE = "1"
-
-PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
-PR = "r2"
-PE = "1"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-	mkdir -p ${D}${sysconfdir}
-	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
-	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
-	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
-	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
-}
-- 
cgit v1.2.3