Patchwork eglibc: Update SRC_URI and fix unpackaged empty dir

login
register
mail settings
Submitter Khem Raj
Date Aug. 21, 2013, 5:45 a.m.
Message ID <1377063923-23922-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/56099/
State Accepted
Commit 81f99896fae94f3340d2bf3cce672afd28b38361
Headers show

Comments

Khem Raj - Aug. 21, 2013, 5:45 a.m.
eglibc 2.18 has now been branched out so point to new
tarballs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/eglibc/cross-localedef-native_2.18.bb | 6 +++---
 meta/recipes-core/eglibc/eglibc-package.inc             | 4 ++++
 meta/recipes-core/eglibc/eglibc_2.18.bb                 | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)
Riku Voipio - Aug. 26, 2013, 9:37 a.m.
Hi,

On 21 August 2013 08:45, Khem Raj <raj.khem@gmail.com> wrote:
> diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
> index a590cce..1a23805 100644
> --- a/meta/recipes-core/eglibc/eglibc-package.inc
> +++ b/meta/recipes-core/eglibc/eglibc-package.inc
> @@ -76,6 +76,10 @@ do_install_append () {
>         rm -f ${D}${sysconfdir}/localtime
>         rm -rf ${D}${localstatedir}
>
> +       # remove empty eglibc dir
> +       if [ -d ${D}${libdir}/eglibc ]; then
> +               rmdir ${D}${libdir}/eglibc
> +       fi
>         oe_multilib_header bits/syscall.h
>
>         if [ -f ${D}${bindir}/mtrace ]; then

This breaks in the case the directory exists and is not empty - which
is the case when you build with eglibc-2.17. In that case there is a
pt_chown binary. pt_chown is deprecated since devpts was invented, and
now removed in 2.18.

Riku
Martin Jansa - Aug. 26, 2013, 9:45 a.m.
On Mon, Aug 26, 2013 at 12:37:18PM +0300, Riku Voipio wrote:
> Hi,
> 
> On 21 August 2013 08:45, Khem Raj <raj.khem@gmail.com> wrote:
> > diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
> > index a590cce..1a23805 100644
> > --- a/meta/recipes-core/eglibc/eglibc-package.inc
> > +++ b/meta/recipes-core/eglibc/eglibc-package.inc
> > @@ -76,6 +76,10 @@ do_install_append () {
> >         rm -f ${D}${sysconfdir}/localtime
> >         rm -rf ${D}${localstatedir}
> >
> > +       # remove empty eglibc dir
> > +       if [ -d ${D}${libdir}/eglibc ]; then
> > +               rmdir ${D}${libdir}/eglibc
> > +       fi
> >         oe_multilib_header bits/syscall.h
> >
> >         if [ -f ${D}${bindir}/mtrace ]; then
> 
> This breaks in the case the directory exists and is not empty - which
> is the case when you build with eglibc-2.17. In that case there is a
> pt_chown binary. pt_chown is deprecated since devpts was invented, and
> now removed in 2.18.

Can we use just
rmdir --ignore-fail-on-non-empty ${D}${libdir}/eglibc
?
Khem Raj - Aug. 26, 2013, 5:31 p.m.
On Aug 26, 2013, at 2:45 AM, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Mon, Aug 26, 2013 at 12:37:18PM +0300, Riku Voipio wrote:
>> Hi,
>> 
>> On 21 August 2013 08:45, Khem Raj <raj.khem@gmail.com> wrote:
>>> diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
>>> index a590cce..1a23805 100644
>>> --- a/meta/recipes-core/eglibc/eglibc-package.inc
>>> +++ b/meta/recipes-core/eglibc/eglibc-package.inc
>>> @@ -76,6 +76,10 @@ do_install_append () {
>>>        rm -f ${D}${sysconfdir}/localtime
>>>        rm -rf ${D}${localstatedir}
>>> 
>>> +       # remove empty eglibc dir
>>> +       if [ -d ${D}${libdir}/eglibc ]; then
>>> +               rmdir ${D}${libdir}/eglibc
>>> +       fi
>>>        oe_multilib_header bits/syscall.h
>>> 
>>>        if [ -f ${D}${bindir}/mtrace ]; then
>> 
>> This breaks in the case the directory exists and is not empty - which
>> is the case when you build with eglibc-2.17. In that case there is a
>> pt_chown binary. pt_chown is deprecated since devpts was invented, and
>> now removed in 2.18.
> 
> Can we use just
> rmdir --ignore-fail-on-non-empty ${D}${libdir}/eglibc
> ?

yes however the reason to not use it in first place was to catch these kind of issues.

> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Patch

diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
index 072b807..62296b5 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
@@ -16,11 +16,11 @@  inherit autotools
 # pick up an eglibc patch
 FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
 
-SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \
+SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \
 	   file://fix_for_centos_5.8.patch;patchdir=.. \
 	  "
-SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb"
-SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1"
+SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
+SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
 
 S = "${WORKDIR}/eglibc-${PV}/localedef"
 
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index a590cce..1a23805 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -76,6 +76,10 @@  do_install_append () {
 	rm -f ${D}${sysconfdir}/localtime
 	rm -rf ${D}${localstatedir}
 
+	# remove empty eglibc dir
+	if [ -d ${D}${libdir}/eglibc ]; then
+		rmdir ${D}${libdir}/eglibc
+	fi
 	oe_multilib_header bits/syscall.h
 
 	if [ -f ${D}${bindir}/mtrace ]; then
diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
index 2e1d380..17b651f 100644
--- a/meta/recipes-core/eglibc/eglibc_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
@@ -2,7 +2,7 @@  require eglibc.inc
 
 DEPENDS += "gperf-native kconfig-frontends-native"
 
-SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \
+SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch \
            file://IO-acquire-lock-fix.patch \
            file://mips-rld-map-check.patch \
@@ -27,8 +27,8 @@  SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \
            file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
            file://fix-tibetian-locales.patch \
           "
-SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb"
-SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1"
+SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
+SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
 
 LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \