diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-11-24 07:37:52 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-03 12:22:40 +0000 |
| commit | 853e8d2c7aff6dddc1d555af22f54c4ecef13df1 (patch) | |
| tree | 9e071bc199554e8fdfbf2e8ab835bcfb95484a4c /meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb | |
| parent | 73f418ce10a801f0befc06ffe54864563aea986c (diff) | |
| download | openembedded-core-contrib-853e8d2c7aff6dddc1d555af22f54c4ecef13df1.tar.gz | |
resolvconf: add fixes for busybox and make it work
resolvconf was missing a script and needed readlink which was in
/usr/bin. Also the /etc/resolv.conf was not being correctly linked
to /etc/resolvconf/run/resolv.conf, which is fixed by the volaties
change which is now a file as opposed to created in do_install.
Ensure that the correct scripts for ifup/ifdown get installed and that
resolvconf is correctly enabled at startup
[YOCTO #5361]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb')
| -rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb index eb29a2a06a..20a2c19328 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.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.xz" +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \ + file://fix-path-for-busybox.patch \ + file://99_resolvconf \ + " + SRC_URI[md5sum] = "d78ce30ea068999cd3e0523300b27255" SRC_URI[sha256sum] = "c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573" @@ -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 + 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}" |