From d78ebd07633e61fac1a0f699edb3529d9f25456a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 16 Jun 2016 21:56:14 +0200 Subject: base-files: don't provide resolv.conf avoid clash with systemd provided resolv.conf Collected errors: * check_data_file_clashes: Package systemd wants to install file ../resolv.conf But that file is already provided by package base-files Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- recipes-core/base-files/base-files_3.0.14.bbappend | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index 539a117..613f9c6 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,7 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:" - -do_install_append () { - echo "search toradex.net" > ${D}${sysconfdir}/resolv.conf - echo "nameserver 8.8.8.8" >> ${D}${sysconfdir}/resolv.conf - echo "nameserver 8.8.4.4" >> ${D}${sysconfdir}/resolv.conf -} -- cgit v1.2.3