Skip to contentSkip to conversation

eglibc: Handle QA warnings in nativesdk (denzil)

PATCH In review Rich Dubielzig 4 participants 5 messages Mar 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eglibc: Handle QA warnings in nativesdk (denzil)

/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not being properly handled by the do_package task in eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf is being included in the -utils subpackage.

---
 meta/recipes-core/eglibc/eglibc-package.inc |    3 ++-
 meta/recipes-core/eglibc/eglibc_2.15.bb     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/eglibc/eglibc-package.inc +2 -1
index 3298dea..d51d943 100644
@@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \
 FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
 FILES_${PN}-mtrace = "${bindir}/mtrace"
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
 FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
 FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv"
 RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
@@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 eglibc_package_preprocess () {
 	rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
 	rm -rf ${PKGD}/${libdir}/locale
+	rm -rf ${PKGD}/var
 }
 
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
index fe93b4b..b4bf692 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r11"
+PR = "r12"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
Signature · 1 line
1.7.1
#1 lore raw
Quoted 10 lines · Rich Dubielzig

/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not being properly handled by the do_package task in eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf is being included in the -utils subpackage.

---

meta/recipes-core/eglibc/eglibc-package.inc |    3 ++-
meta/recipes-core/eglibc/eglibc_2.15.bb     |    2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

Could you rebase it on master please ?

Quoted 42 lines
meta/recipes-core/eglibc/eglibc-package.inc +0 -0
index 3298dea..d51d943 100644
@@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \

FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_${PN}-mtrace = "${bindir}/mtrace"

meta/recipes-core/eglibc/eglibc-package.inc +1 -1
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"

FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"

meta/recipes-core/eglibc/eglibc-package.inc +1 -0
@@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 eglibc_package_preprocess () {
 	rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
 	rm -rf ${PKGD}/${libdir}/locale
+	rm -rf ${PKGD}/var
 }
 
meta/recipes-core/eglibc/eglibc_2.15.bb +0 -0
index fe93b4b..b4bf692 100644
@@ -3,7 +3,7 @@ require eglibc.inc

SRCREV = "17386"

DEPENDS += "gperf-native"

meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
-PR = "r11"
+PR = "r12"

PR_append = "+svnr${SRCPV}"

EGLIBC_BRANCH="eglibc-2_15"

Signature · 7 lines
1.7.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
#2 lore raw
Quoted 26 lines · Khem Raj
Quoted 10 lines · Rich Dubielzig

/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not being properly handled by the do_package task in eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf is being included in the -utils subpackage.

---

meta/recipes-core/eglibc/eglibc-package.inc |    3 ++-
meta/recipes-core/eglibc/eglibc_2.15.bb     |    2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

Could you rebase it on master please ?

Quoted 11 lines
meta/recipes-core/eglibc/eglibc-package.inc +0 -0
index 3298dea..d51d943 100644
@@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \

FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_${PN}-mtrace = "${bindir}/mtrace"

meta/recipes-core/eglibc/eglibc-package.inc +1 -1
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
Quoted 8 lines

meta/recipes-core/eglibc/eglibc-package.inc PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" · line 124

Quoted 8 lines

FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"

meta/recipes-core/eglibc/eglibc-package.inc +1 -0
@@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 eglibc_package_preprocess () {
 	rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
 	rm -rf ${PKGD}/${libdir}/locale
+	rm -rf ${PKGD}/var

Isn't this ${localstatesir} ?

And as Khem said, fixes need to be considered for master first, or at least mention this is fixed in master if it is...

Cheers,

Richard

#3 lore raw

From: Richard Purdie [[email protected]]
Sent: Friday, March 08, 2013 2:15 PM
To: Khem Raj
Cc: Dubielzig, Rich; [email protected]
Subject: Re: [OE-core] [PATCH] eglibc: Handle QA warnings in nativesdk (denzil)

Quoted 26 lines · Khem Raj
Quoted 10 lines · Rich Dubielzig

/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not being properly handled by the do_package task in eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf is being included in the -utils subpackage.

---

meta/recipes-core/eglibc/eglibc-package.inc |    3 ++-
meta/recipes-core/eglibc/eglibc_2.15.bb     |    2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

Could you rebase it on master please ?

Quoted 11 lines
meta/recipes-core/eglibc/eglibc-package.inc +0 -0
index 3298dea..d51d943 100644
@@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \

FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_${PN}-mtrace = "${bindir}/mtrace"

meta/recipes-core/eglibc/eglibc-package.inc +1 -1
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
Quoted 8 lines

meta/recipes-core/eglibc/eglibc-package.inc PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" · line 124

Quoted 8 lines

FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"

meta/recipes-core/eglibc/eglibc-package.inc +1 -0
@@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 eglibc_package_preprocess () {
    rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
    rm -rf ${PKGD}/${libdir}/locale
+   rm -rf ${PKGD}/var

Isn't this ${localstatesir} ?

And as Khem said, fixes need to be considered for master first, or at least mention this is fixed in master if it is...

Cheers,

Richard

________________________________________

In the current system a /var directory always gets created within the root of the image/ directory under the eglibc-nativesdk build, not as a subtree of the opt/ install path. ${localstatedir} points to a var/ directory that resides within the SDK path.

I will try a patch that rebases off of master.

-Rich

#4 lore raw
In reply to Rich Dubielzig

meta/recipes-core/eglibc/eglibc-package.inc FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ · line 53

Quoted 2 lines · Rich Dubielzig
meta/recipes-core/eglibc/eglibc-package.inc +1 -1
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"

Is that really correct? There seem to be several slightly dubious things about this patch:

1. In the version of oe-core I'm looking at, both ldconfig and ld.so.conf go into ${PN} if USE_LDCONFIG=1, which is the default. (Arguably this ought really to be a DISTRO_FEATURE nowadays.) So, adding them unconditionally to PN-utils seems like it is confusing at best.

2. ld.so.conf isn't a utility and it isn't entirely obvious that it belongs in PN-utils at all.

3. Your commit message didn't mention the change to ldconfig, and also didn't give any details of what exactly the QA warnings were that it was fixing.

thanks

p.