From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [207.164.182.72] (helo=smtp.cbnco.com) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1Mibh9-00072V-Ki for openembedded-devel@lists.openembedded.org; Wed, 02 Sep 2009 00:19:24 +0200 Received: from localhost (localhost [127.0.0.1]) by smtp.cbnco.com (Postfix) with ESMTP id 6733E5560BA for ; Tue, 1 Sep 2009 18:00:35 -0400 (EDT) Received: from smtp.cbnco.com ([127.0.0.1]) by localhost (mail.cbnco.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02896-01 for ; Tue, 1 Sep 2009 18:00:35 -0400 (EDT) Received: from [172.20.22.83] (auriga-dmzgw.cbnco.com [207.164.182.65]) by smtp.cbnco.com (Postfix) with ESMTPSA id 172E3507F91 for ; Tue, 1 Sep 2009 18:00:35 -0400 (EDT) Message-ID: <4A9D9982.4080902@cbnco.com> Date: Tue, 01 Sep 2009 18:00:34 -0400 From: Michael Smith User-Agent: Thunderbird 2.0.0.23 (X11/20090812) MIME-Version: 1.0 To: openembedded-devel@lists.openembedded.org References: <1250175641-4869-1-git-send-email-msmith@cbnco.com> <1250175641-4869-2-git-send-email-msmith@cbnco.com> <1250175641-4869-3-git-send-email-msmith@cbnco.com> In-Reply-To: <1250175641-4869-3-git-send-email-msmith@cbnco.com> X-Virus-Scanned: amavisd-new at cbnco.com Subject: Re: [PATCH 3/4] udev 141: fix packaging on x86_64 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2009 22:19:36 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, Could someone with prefix = /usr give this a quick build test before I check it in? http://patchwork.openembedded.org/patch/940/ Thanks, Mike Michael Smith wrote: > udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} > is ${prefix}/lib64. This means some paths need to be hardcoded to "/lib" > instead of "${base_libdir}". > > Signed-off-by: Michael Smith > --- > recipes/udev/udev_141.bb | 15 ++++++++++----- > 1 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb > index 3f42564..13b3808 100644 > --- a/recipes/udev/udev_141.bb > +++ b/recipes/udev/udev_141.bb > @@ -6,7 +6,7 @@ LICENSE = "GPL" > # Untested > DEFAULT_PREFERENCE = "-1" > > -PR = "r11" > +PR = "r12" > > # needed for init.d script > RDEPENDS_${PN} += "udev-utils" > @@ -51,8 +51,10 @@ RPROVIDES_${PN} = "hotplug" > FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" > FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" > > -FILES_${PN} += "${libdir}/udev/* ${base_libdir}/udev/*" > -FILES_${PN}-dbg += "${base_libdir}/udev/.debug" > +# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} > +# is ${prefix}/lib64 > +FILES_${PN} += "/lib/udev/* /lib/udev/*" > +FILES_${PN}-dbg += "/lib/udev/.debug" > > do_install () { > install -d ${D}${usrsbindir} \ > @@ -64,8 +66,11 @@ do_install () { > install -d ${D}${sysconfdir}/default > install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev > > - mv ${D}${base_libdir}/udev/rules.d ${D}${sysconfdir}/udev/ > - ln -sf ${sysconfdir}/udev/rules.d ${D}${base_libdir}/udev/ > + # Move udev rules from $(udev_prefix)/lib to /etc. > + # This is hardcoded to $(udev_prefix)/lib/udev/rules.d in the > + # Makefile, even if libdir is lib64. > + mv ${D}/lib/udev/rules.d ${D}${sysconfdir}/udev/ > + ln -sf ${sysconfdir}/udev/rules.d ${D}/lib/udev/ > > cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ > cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/