summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2019-08-23 13:51:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:22 +0100
commitb054f8d3ba1dd20988ed928ab309d5664447afc1 (patch)
tree5bc50db7c25504b033ab076e8c7b9f6f8c6fb127
parentba6898d1b2e9b037f02a2cf17298e754aa4968ef (diff)
downloadpoky-b054f8d3ba1dd20988ed928ab309d5664447afc1.tar.gz
base-files: nsswitch.conf is glibc specific
(From OE-Core rev: e9f751a6fd6a4fc1cfac74202e1b71291aade705) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4b4027f18d..2b1f217ddb 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -129,7 +129,6 @@ do_install () {
129 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells 129 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
130 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile 130 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
131 install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc 131 install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
132 install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
133 install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf 132 install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
134 install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd 133 install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
135 134
@@ -142,6 +141,10 @@ do_install () {
142 fi 141 fi
143} 142}
144 143
144do_install_append_libc-glibc () {
145 install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
146}
147
145DISTRO_VERSION[vardepsexclude] += "DATE" 148DISTRO_VERSION[vardepsexclude] += "DATE"
146do_install_basefilesissue () { 149do_install_basefilesissue () {
147 install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} 150 install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}