summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-24 07:37:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:18:52 +0000
commit10710d7a9253d80fb40cda72ec8c17751c93d66e (patch)
tree2fcd923b4492a4e9914305cfabe3591d859f3e04 /meta
parent527574602a98077d021b6091bd543e8b18a22349 (diff)
downloadpoky-10710d7a9253d80fb40cda72ec8c17751c93d66e.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] (From OE-Core rev: 853e8d2c7aff6dddc1d555af22f54c4ecef13df1) (From OE-Core rev: 10a1ae28ecee10695efb6a5bc08de4f04e0acac1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf4
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch19
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb17
3 files changed, 37 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
new file mode 100644
index 0000000000..3790d774a7
--- /dev/null
+++ b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
@@ -0,0 +1,4 @@
1d root root 0755 /var/run/resolvconf/interface none
2f root root 0644 /etc/resolvconf/run/resolv.conf none
3f root root 0644 /etc/resolvconf/run/enable-updates none
4l root root 0644 /etc/resolv.conf /etc/resolvconf/run/resolv.conf
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
new file mode 100644
index 0000000000..fc4605e94d
--- /dev/null
+++ b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
@@ -0,0 +1,19 @@
1
2busybox installs readlink into /usr/bin, so ensure /usr/bin
3is in the path.
4
5Upstream-Status: Submitted
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: resolvconf-1.76/etc/resolvconf/update.d/libc
9===================================================================
10--- resolvconf-1.76.orig/etc/resolvconf/update.d/libc
11+++ resolvconf-1.76/etc/resolvconf/update.d/libc
12@@ -16,7 +16,7 @@
13 #
14
15 set -e
16-PATH=/sbin:/bin
17+PATH=/sbin:/bin:/usr/bin
18
19 [ -x /lib/resolvconf/list-records ] || exit 1
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb
index 7310c837e9..ee171c065e 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb
@@ -11,7 +11,11 @@ AUTHOR = "Thomas Hood"
11HOMEPAGE = "http://packages.debian.org/resolvconf" 11HOMEPAGE = "http://packages.debian.org/resolvconf"
12RDEPENDS_${PN} = "bash" 12RDEPENDS_${PN} = "bash"
13 13
14SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz" 14SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \
15 file://fix-path-for-busybox.patch \
16 file://99_resolvconf \
17 "
18
15 19
16SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56" 20SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56"
17SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e" 21SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e"
@@ -24,13 +28,13 @@ do_compile () {
24 28
25do_install () { 29do_install () {
26 install -d ${D}${sysconfdir}/default/volatiles 30 install -d ${D}${sysconfdir}/default/volatiles
27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \ 31 install -m 0644 ${WORKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles
28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf
29 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 32 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${sysconfdir}/tmpfiles.d 33 install -d ${D}${sysconfdir}/tmpfiles.d
31 echo "d /run/${BPN}/interface - - - -" \ 34 echo "d /run/${BPN}/interface - - - -" \
32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf 35 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
33 fi 36 fi
37 install -d ${D}${base_libdir}/${BPN}
34 install -d ${D}${sysconfdir}/${BPN} 38 install -d ${D}${sysconfdir}/${BPN}
35 ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run 39 ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
36 install -d ${D}${sysconfdir} ${D}${base_sbindir} 40 install -d ${D}${sysconfdir} ${D}${base_sbindir}
@@ -38,6 +42,11 @@ do_install () {
38 cp -pPR etc/* ${D}${sysconfdir}/ 42 cp -pPR etc/* ${D}${sysconfdir}/
39 chown -R root:root ${D}${sysconfdir}/ 43 chown -R root:root ${D}${sysconfdir}/
40 install -m 0755 bin/resolvconf ${D}${base_sbindir}/ 44 install -m 0755 bin/resolvconf ${D}${base_sbindir}/
45 install -m 0755 bin/list-records ${D}${base_libdir}/${BPN}
46 install -d ${D}/${sysconfdir}/network/if-up.d
47 install -m 0755 debian/resolvconf.000resolvconf.if-up ${D}/${sysconfdir}/network/if-up.d/000resolvconf
48 install -d ${D}/${sysconfdir}/network/if-down.d
49 install -m 0755 debian/resolvconf.resolvconf.if-down ${D}/${sysconfdir}/network/if-down.d/resolvconf
41 install -m 0644 README ${D}${docdir}/${P}/ 50 install -m 0644 README ${D}${docdir}/${P}/
42 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ 51 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
43} 52}
@@ -51,3 +60,5 @@ pkg_postinst_${PN} () {
51 fi 60 fi
52 fi 61 fi
53} 62}
63
64FILES_${PN} += "${base_libdir}/${BPN}"