1 files changed, 15 insertions, 4 deletions

diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
index 5897e40489..3ae624d6b4 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
@@ -11,7 +11,11 @@ AUTHOR = "Thomas Hood"
 HOMEPAGE = "http://packages.debian.org/resolvconf"
 RDEPENDS_${PN} = "bash"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz \
+           file://fix-path-for-busybox.patch \
+           file://99_resolvconf \
+          "
+
 
 SRC_URI[md5sum] = "2f190d3bb8960b69157f63590c262e93"
 SRC_URI[sha256sum] = "2e72e6884e9105cbf57101ab0f11e768717b6f76b7f5100c6a2a0cc69bb3d4a0"
@@ -24,13 +28,13 @@ do_compile () {
 
 do_install () {
         install -d ${D}${sysconfdir}/default/volatiles
-        echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \
-             > ${D}${sysconfdir}/default/volatiles/99_resolvconf
-        if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -m 0644 ${WORKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
                 install -d ${D}${sysconfdir}/tmpfiles.d
                 echo "d /run/${BPN}/interface - - - -" \
                      > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
         fi
+        install -d ${D}${base_libdir}/${BPN}
         install -d ${D}${sysconfdir}/${BPN}
         ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
         install -d ${D}${sysconfdir} ${D}${base_sbindir}
@@ -38,6 +42,11 @@ do_install () {
         cp -pPR etc/* ${D}${sysconfdir}/
         chown -R root:root ${D}${sysconfdir}/
         install -m 0755 bin/resolvconf ${D}${base_sbindir}/
+        install -m 0755 bin/list-records ${D}${base_libdir}/${BPN}
+        install -d ${D}/${sysconfdir}/network/if-up.d
+        install -m 0755 debian/resolvconf.000resolvconf.if-up ${D}/${sysconfdir}/network/if-up.d/000resolvconf
+        install -d ${D}/${sysconfdir}/network/if-down.d
+        install -m 0755 debian/resolvconf.resolvconf.if-down ${D}/${sysconfdir}/network/if-down.d/resolvconf
         install -m 0644 README ${D}${docdir}/${P}/
         install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
 }
@@ -51,3 +60,5 @@ pkg_postinst_${PN} () {
                 fi
         fi
 }
+
+FILES_${PN} += "${base_libdir}/${BPN}"