From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mail.openembedded.org (Postfix) with ESMTP id 533F160DD7 for ; Fri, 21 Nov 2014 19:14:42 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 21 Nov 2014 11:13:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="419930762" Received: from unknown (HELO [10.255.13.72]) ([10.255.13.72]) by FMSMGA003.fm.intel.com with ESMTP; 21 Nov 2014 11:04:14 -0800 Message-ID: <546F8EE9.3050809@linux.intel.com> Date: Fri, 21 Nov 2014 11:13:45 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: openembedded-core@lists.openembedded.org References: <868dbb6d9d7b3548930ad89143f1895908fe91f3.1416590209.git.sgw@linux.intel.com> In-Reply-To: <868dbb6d9d7b3548930ad89143f1895908fe91f3.1416590209.git.sgw@linux.intel.com> Subject: Re: [PATCH 7/7] resolvconf: add fixes for busybox and make it work X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 19:14:46 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 11/21/2014 09:20 AM, Saul Wold wrote: > 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. > > Since we are installing and using resolvconf, make sure it's enabled. > Well I found another issue with static (no dhcp), I will send a v2 of this patch the other stuff should be fine. Sau! > [YOCTO #5361] > > Signed-off-by: Saul Wold > --- > .../resolvconf/resolvconf/99_resolvconf | 4 ++++ > .../resolvconf/resolvconf/fix-path-for-busybox.patch | 20 ++++++++++++++++++++ > .../resolvconf/resolvconf_1.76.bb | 13 ++++++++++--- > 3 files changed, 34 insertions(+), 3 deletions(-) > create mode 100644 meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf > create mode 100644 meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch > > diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf > new file mode 100644 > index 0000000..3790d77 > --- /dev/null > +++ b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf > @@ -0,0 +1,4 @@ > +d root root 0755 /var/run/resolvconf/interface none > +f root root 0644 /etc/resolvconf/run/resolv.conf none > +f root root 0644 /etc/resolvconf/run/enable-updates none > +l 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 0000000..1aead07 > --- /dev/null > +++ b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch > @@ -0,0 +1,20 @@ > + > +busybox installs readlink into /usr/bin, so ensure /usr/bin > +is in the path. > + > +Upstream-Status: Submitted > +Signed-off-by: Saul Wold > + > +Index: resolvconf-1.76/etc/resolvconf/update.d/libc > +=================================================================== > +--- resolvconf-1.76.orig/etc/resolvconf/update.d/libc > ++++ resolvconf-1.76/etc/resolvconf/update.d/libc > +@@ -16,7 +16,7 @@ > + # > + > + set -e > +-PATH=/sbin:/bin > ++PATH=/sbin:/bin:/usr/bin > + > + [ -x /lib/resolvconf/list-records ] || exit 1 > + > diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb > index eb29a2a..4dd4a30 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,7 @@ 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 -m 0644 README ${D}${docdir}/${P}/ > install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ > } > @@ -51,3 +56,5 @@ pkg_postinst_${PN} () { > fi > fi > } > + > +FILES_${PN} += "${base_libdir}/${BPN}" >