From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by mail.openembedded.org (Postfix) with ESMTP id C07C779204 for ; Thu, 27 Sep 2018 09:04:02 +0000 (UTC) Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-01.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g5SDL-0003Kp-1H from Awais_Belal@mentor.com ; Thu, 27 Sep 2018 02:04:03 -0700 Received: from SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) by svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 27 Sep 2018 10:03:59 +0100 Received: from SVR-IES-MBX-03.mgc.mentorg.com ([fe80::1072:fb6e:87f1:ed17]) by SVR-IES-MBX-03.mgc.mentorg.com ([fe80::1072:fb6e:87f1:ed17%22]) with mapi id 15.00.1320.000; Thu, 27 Sep 2018 10:03:59 +0100 From: "Belal, Awais" To: "Burton, Ross" Thread-Topic: [OE-core] [PATCH] glibc-package.inc: correct intention for deleting /usr/lib as needed Thread-Index: AQHUTzrReK7EozvamEuUEKOJij+4eaT49cQAgABA2pj///uEAIABjh1lgAkjRIw= Date: Thu, 27 Sep 2018 09:03:59 +0000 Message-ID: <1538039039046.3259@mentor.com> References: <1537266969204.31967@mentor.com> <9a58ea4be84c4f0eb2c34680a9345186@SVR-IES-MBX-03.mgc.mentorg.com>, , <1537536706360.96813@mentor.com> In-Reply-To: <1537536706360.96813@mentor.com> Accept-Language: en-US, en-IE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [137.202.0.90] MIME-Version: 1.0 Cc: OE-core Subject: Re: [PATCH] glibc-package.inc: correct intention for deleting /usr/lib as needed 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: Thu, 27 Sep 2018 09:04:02 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi Ross,=0A= =0A= When do you think this would go in?=0A= =0A= BR,=0A= Awais=0A= =0A= ________________________________________=0A= From: openembedded-core-bounces@lists.openembedded.org on behalf of Belal, Awais=0A= Sent: Friday, September 21, 2018 6:31 PM=0A= To: Burton, Ross=0A= Cc: OE-core=0A= Subject: Re: [OE-core] [PATCH] glibc-package.inc: correct intention for del= eting /usr/lib as needed=0A= =0A= >> That's better than HTML!=0A= Attached.=0A= =0A= BR,=0A= Awais=0A= =0A= ________________________________________=0A= From: Burton, Ross =0A= Sent: Thursday, September 20, 2018 7:46 PM=0A= To: Belal, Awais=0A= Cc: OE-core=0A= Subject: Re: [OE-core] [PATCH] glibc-package.inc: correct intention for del= eting /usr/lib as needed=0A= =0A= That's better than HTML!=0A= On Thu, 20 Sep 2018 at 15:04, Belal, Awais wrote:= =0A= >=0A= > Hi Ross,=0A= >=0A= > >> Can you resend using git-send-email, as this patch is encoded in HTML.= =0A= > My SMTP server is acting up these days, should I simply resend the patch = here as an attachment?=0A= >=0A= > BR,=0A= > Awais=0A= >=0A= > ________________________________________=0A= > From: Burton, Ross [ross.burton@intel.com]=0A= > Sent: Thursday, September 20, 2018 4:10 PM=0A= > To: Belal, Awais=0A= > Cc: OE-core=0A= > Subject: Re: [OE-core] [PATCH] glibc-package.inc: correct intention for d= eleting /usr/lib as needed=0A= >=0A= > Can you resend using git-send-email, as this patch is encoded in HTML.=0A= >=0A= > Ross=0A= > On Tue, 18 Sep 2018 at 11:53, Belal, Awais wrote= :=0A= > >=0A= > > In case the baselib is lib64 we would want to delete /usr/lib=0A= > > after removing the /usr/lib/locale dir and the implementation=0A= > > wanted to do that earlier as well but the fault was checking=0A= > > an already removed dir (/usr/lib/locale) before trying to=0A= > > remove /usr/lib as that check would always fail.=0A= > > Now we simply try to delete /usr/lib after deleting=0A= > > /usr/lib/locale to make sure it deletes cleanly and is empty=0A= > > at the time of deletion.=0A= > >=0A= > > Signed-off-by: Awais Belal =0A= > > ---=0A= > > meta/recipes-core/glibc/glibc-package.inc | 9 ++++-----=0A= > > 1 file changed, 4 insertions(+), 5 deletions(-)=0A= > >=0A= > > diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-c= ore/glibc/glibc-package.inc=0A= > > index 9ea41b7..22a59d2 100644=0A= > > --- a/meta/recipes-core/glibc/glibc-package.inc=0A= > > +++ b/meta/recipes-core/glibc/glibc-package.inc=0A= > > @@ -207,11 +207,10 @@ do_poststash_install_cleanup () {=0A= > > rm -rf ${D}/${localedir}=0A= > > rm -rf ${D}${datadir}/locale=0A= > > if [ "${libdir}" !=3D "${exec_prefix}/lib" ]; then=0A= > > - if [ -d ${D}${exec_prefix}/lib/locale ] ; then=0A= > > - rm -rf ${D}${exec_prefix}/lib/locale=0A= > > - # error out if directory isn't empty=0A= > > - rm -f ${D}${exec_prefix}/lib=0A= > > - fi=0A= > > + # error out if directory isn't empty=0A= > > + # this dir should only contain locale dir=0A= > > + # which has been deleted in the previous step=0A= > > + rmdir ${D}${exec_prefix}/lib=0A= > > fi=0A= > > }=0A= > > addtask do_poststash_install_cleanup after do_stash_locale do_install = before do_populate_sysroot do_package=0A= > > --=0A= > > 2.7.4=0A= > >=0A= > >=0A= > > --=0A= > > _______________________________________________=0A= > > Openembedded-core mailing list=0A= > > Openembedded-core@lists.openembedded.org=0A= > > http://lists.openembedded.org/mailman/listinfo/openembedded-core=0A=