From 5dce6b7646db0142a83d5a54b723b1cbe715259e Mon Sep 17 00:00:00 2001
From: Moorthy <36617743+moorthy-bs@users.noreply.github.com>
Date: Wed, 23 Dec 2020 11:00:30 +0530
Subject: [PATCH] glibc - nativesdk prepare_recipe_sysroot error fix

on eSDK population, nativesdk of libnsl2 and glibc both install
yppasswd.x and yppasswd.h files which causes conflict while
preparing recipe sysroot of nativesdk-libnss-nis and nativesdk-python 3.8

The fix resolves below error
ERROR: nativesdk-libnss-nis-3.1+gitAUTOINC+062f31999b-r0 do_prepare_recipe_sysroot:
The file /opt/rdk/2.0/sysroots/x86_64-rdksdk-linux/usr/include/rpcsvc/yppasswd.x is installed by both nativesdk-libnsl2 and nativesdk-glibc, aborting
ERROR: nativesdk-libnss-nis-3.1+gitAUTOINC+062f31999b-r0 do_prepare_recipe_sysroot:
The file /opt/rdk/2.0/sysroots/x86_64-rdksdk-linux/usr/include/rpcsvc/yppasswd.h is installed by both nativesdk-libnsl2 and nativesdk-glibc, aborting
---
 meta/recipes-core/glibc/glibc-package.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 7854f2a1563..64c621e9e0a 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -139,6 +139,12 @@ do_install_append_class-target() {
 	fi
 
 }
+
+# provided by libnsl2
+do_install_append_class-nativesdk() {
+    rm -f ${D}${includedir}/rpcsvc/yppasswd.*
+}
+
 do_install_append_aarch64 () {
 	do_install_armmultilib
 }