From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com ([134.134.136.24]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Tld5D-0004u4-Ip for openembedded-core@lists.openembedded.org; Thu, 20 Dec 2012 11:10:32 +0100 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 20 Dec 2012 01:54:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,322,1355126400"; d="scan'208";a="236880637" Received: from lpalcu-linux ([10.237.105.165]) by orsmga001.jf.intel.com with ESMTP; 20 Dec 2012 01:55:39 -0800 Date: Thu, 20 Dec 2012 11:55:39 +0200 From: Laurentiu Palcu To: openembedded-core@lists.openembedded.org Message-ID: <20121220095537.GA31053@lpalcu-linux> References: <1355933032-25392-1-git-send-email-laurentiu.palcu@intel.com> MIME-Version: 1.0 In-Reply-To: <1355933032-25392-1-git-send-email-laurentiu.palcu@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [PATCH] pango: have postinstalls run at do_rootfs time X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 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: Thu, 20 Dec 2012 10:10:34 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Dec 19, 2012 at 06:03:52PM +0200, Laurentiu Palcu wrote: Ignore this patch, it is the same as the previous one.... I really have no idea why this mail appeared on the mailing list, hours after I sent the original patch. Weird... Probably a 'git send-mail' issue. Thanks, Laurentiu > Since pango-native is built anyway and all the modules are in the native > sysroot, create the cache file by scanning those files instead of the > target files. The latter will fail because the shared objects wouldn't > be from the same ELF class. > > [YOCTO #3600] > > Signed-off-by: Laurentiu Palcu > --- > meta/recipes-graphics/pango/pango.inc | 26 ++++++++++++++++++++++---- > 1 file changed, 22 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc > index 839c00d..81c2a7e 100644 > --- a/meta/recipes-graphics/pango/pango.inc > +++ b/meta/recipes-graphics/pango/pango.inc > @@ -10,7 +10,7 @@ SECTION = "libs" > LICENSE = "LGPLv2.0+" > > X11DEPENDS = "virtual/libx11 libxft" > -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils" > +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native" > > PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" > PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" > @@ -44,13 +44,31 @@ LEAD_SONAME = "libpango-1.0*" > LIBV = "1.6.0" > > postinst_prologue() { > +if ! [ -e $D${sysconfdir}/pango ] ; then > + mkdir -p $D${sysconfdir}/pango > +fi > + > if [ "x$D" != "x" ]; then > - exit 1 > +pango-querymodules $(ls -d -1 $D${libdir}/pango/${LIBV}/modules/*.so|\ > + sed -e "s:$D:$NATIVE_ROOT:g") >\ > + $D${sysconfdir}/pango/${MLPREFIX}pango.modules \ > + 2>$D${sysconfdir}/pango/${MLPREFIX}pango.err > + > +# pango-querymodules always returns 0, so we need to check if pango.err has > +# anything in it > +if [ -s $D${sysconfdir}/pango/${MLPREFIX}pango.err ]; then > + rm $D${sysconfdir}/pango/${MLPREFIX}pango.err > + exit 1 > fi > > -if ! [ -e $D${sysconfdir}/pango ] ; then > - mkdir -p $D${sysconfdir}/pango > +sed -i -e "s:$NATIVE_ROOT::g" $D${sysconfdir}/pango/${MLPREFIX}pango.modules > + > +# remove the empty pango.err > +rm $D${sysconfdir}/pango/${MLPREFIX}pango.err > + > +exit 0 > fi > + > } > > do_install_append () { > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core