From e46757c86654986a1bb37562e3651e1ee0df030c Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 16 Jan 2015 16:48:26 +0100
Subject: [PATCH] meta-digi: remove os-release from base-files

Yocto 1.7 Dizzy added support for os-release file in a new recipe, so
we need to remove it from our base-files bbappend in order to avoid
conflicts between both packages.

https://jira.digi.com/browse/DEL-1390

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/recipes-core/base-files/base-files/os-release | 6 ------
 .../recipes-core/base-files/base-files_3.0.14.bbappend      | 6 ------
 .../recipes-core/packagegroups/packagegroup-dey-core.bb     | 1 +
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-core/base-files/base-files/os-release

diff --git a/meta-digi-dey/recipes-core/base-files/base-files/os-release b/meta-digi-dey/recipes-core/base-files/base-files/os-release
deleted file mode 100644
index 37818d105..000000000
--- a/meta-digi-dey/recipes-core/base-files/base-files/os-release
+++ /dev/null
@@ -1,6 +0,0 @@
-NAME="##DISTRO_NAME##"
-VERSION="##DISTRO_VERSION##"
-ID=##DISTRO##
-ID_LIKE=yocto
-VERSION_ID="##DISTRO_VERSION##"
-PRETTY_NAME="##DISTRO_NAME## ##DISTRO_VERSION##"
diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
index 66870aca9..d12e41024 100644
--- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -3,18 +3,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
-    file://os-release \
     file://sysctl.conf \
 "
 
 SRC_URI_append_ccimx6 = " file://resize-ext4fs.sh"
 
 do_install_append() {
-	install -m 0644 ${WORKDIR}/os-release ${D}${sysconfdir}/
-	sed -i  -e 's,##DISTRO##,${DISTRO},g' \
-		-e 's,##DISTRO_NAME##,${DISTRO_NAME},g' \
-		-e 's,##DISTRO_VERSION##,${DISTRO_VERSION},g' \
-		${D}${sysconfdir}/os-release
 	install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/
 }
 
diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
index e97787718..ffc8e12b5 100644
--- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
+++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
@@ -40,6 +40,7 @@ RDEPENDS_${PN} = "\
     init-ifupdown \
     modutils-initscripts \
     netbase \
+    os-release \
     usbutils \
     ${VIRTUAL-RUNTIME_dev_manager} \
     ${VIRTUAL-RUNTIME_init_manager} \