Bug Fixes for M2 Rc2
cover Bug Fixes for M2 Rc2
Richard,
This address the bash, xcb missing from libx11, locale issue and the lack of space due to zypper eating space.
Sau!
The following changes since commit f1fc6d084b079dea21ff1a30b815496452042490:
pulseaudio: add 0.9.23 (2011-07-07 13:44:36 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (8):
rootfs_rpm: Add 50Meg to image size for zypper image.bbclass: add LINGUAS_INSTALL to depends list
gnome-doc-utils: Add RDEPENDS on bash
quilt: Add RDEPENDS on bash
console-tools: Add RDEPENDS on bash
usbutils: Add RDEPENDS on bash
eglibc: Add RDEPENDS on bash
libx11: enable xcb support
meta/classes/image.bbclass | 2 +- meta/classes/image_types.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 5 +++++ meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 +++-- .../console-tools/console-tools_0.3.2.bb | 3 ++- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-devtools/quilt/quilt.inc | 2 ++ meta/recipes-devtools/quilt/quilt_0.48.bb | 2 +- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 ++ meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 11 ++++++++--- 14 files changed, 30 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.3.4
PATCH 1/8 rootfs_rpm: Add 50Meg to image size for zypper
[YOCTO #1171]
Add /var space for zypper due to its space usage for db maintence
--- meta/classes/image_types.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-)
meta/classes/image_types.bbclass +1 -1
@@ -13,7 +13,7 @@ def get_imagecmds(d): runimagecmd () { # Image generation code for image type ${type} - ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; OFMT = "%.0f" ; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` + ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE} + ${ZYPPER_VAR_DB_SPACE}; OFMT = "%.0f" ; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` ${cmd} cd ${DEPLOY_DIR_IMAGE}/ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
meta/classes/rootfs_rpm.bbclass +5 -0
@@ -3,6 +3,10 @@ # ROOTFS_PKGMANAGE = "rpm zypper" + +# Add 50Meg of extra space for zypper database space +ZYPPER_VAR_DB_SPACE = "51200" + # Postinstalls on device are handled within this class at present ROOTFS_PKGMANAGE_BOOTSTRAP = ""
@@ -101,6 +105,7 @@ EOF export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + ${ROOTFS_POSTINSTALL_COMMAND} mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/
Signature · 1 line
1.7.3.4
Re: [PATCH 1/8] rootfs_rpm: Add 50Meg to image size for zypper
Quoted 3 lines · Saul Wold
[YOCTO #1171]
Add /var space for zypper due to its space usage for db maintence
This hasn't been tested for opkg/deb and is missing something like:
ZYPPER_VAR_DB_SPACE ??= 0
I'd suggest we just change this to append " + 51200" to IMAGE_ROOTFS_EXTRA_SPACE. I'd also like this only to happen when we're actually installing zypper so the minimal images are unaffected...
Cheers,
Richard
Quoted 42 lines
Signed-off-by Saul Wold <[email protected]>--- meta/classes/image_types.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-)meta/classes/image_types.bbclass +1
-1@@ -13,7 +13,7 @@ def get_imagecmds(d): runimagecmd () { # Image generation code for image type ${type} - ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; OFMT = "%.0f" ; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` + ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE} + ${ZYPPER_VAR_DB_SPACE}; OFMT = "%.0f" ; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` ${cmd} cd ${DEPLOY_DIR_IMAGE}/ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}meta/classes/rootfs_rpm.bbclass +5
-0@@ -3,6 +3,10 @@ # ROOTFS_PKGMANAGE = "rpm zypper" + +# Add 50Meg of extra space for zypper database space +ZYPPER_VAR_DB_SPACE = "51200" + # Postinstalls on device are handled within this class at present ROOTFS_PKGMANAGE_BOOTSTRAP = ""@@ -101,6 +105,7 @@ EOF export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + ${ROOTFS_POSTINSTALL_COMMAND} mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/
Re: [PATCH 1/8] rootfs_rpm: Add 50Meg to image size for zypper
Quoted 5 lines · Richard Purdie
Quoted 3 lines · Saul Wold
[YOCTO #1171]
Add /var space for zypper due to its space usage for db maintence
Quoted 8 lines
This hasn't been tested for opkg/deb and is missing something like:
ZYPPER_VAR_DB_SPACE??= 0I'd suggest we just change this to append " + 51200" to
IMAGE_ROOTFS_EXTRA_SPACE. I'd also like this only to happen when we're actually installing zypper so the minimal images are unaffected...
I can do the + 51200, but I have not figured out how to do the check for zypper, maybe it's something straight forward, but I am not finding a way to do it easily.
Sau!
Quoted 58 lines
Cheers,
Richard
Quoted 35 lines
Signed-off-by Saul Wold<[email protected]>--- meta/classes/image_types.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-)meta/classes/image_types.bbclass +1
-1@@ -13,7 +13,7 @@ def get_imagecmds(d): runimagecmd () { # Image generation code for image type ${type} - ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; OFMT = "%.0f" ; print (size> ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` + ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE} + ${ZYPPER_VAR_DB_SPACE}; OFMT = "%.0f" ; print (size> ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` ${cmd} cd ${DEPLOY_DIR_IMAGE}/ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}meta/classes/rootfs_rpm.bbclass +4
-0@@ -3,6 +3,10 @@ # ROOTFS_PKGMANAGE = "rpm zypper" + +# Add 50Meg of extra space for zypper database space +ZYPPER_VAR_DB_SPACE = "51200" + # Postinstalls on device are handled within this class at present ROOTFS_PKGMANAGE_BOOTSTRAP = ""meta/classes/rootfs_rpm.bbclass EOF · line 111
Quoted 7 lines
meta/classes/rootfs_rpm.bbclass +1
-0@@ -101,6 +105,7 @@ EOF export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + ${ROOTFS_POSTINSTALL_COMMAND} mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 1/8] rootfs_rpm: Add 50Meg to image size for zypper
Quoted 10 lines · Saul Wold
Quoted 9 lines · Richard Purdie
Quoted 3 lines · Saul Wold
[YOCTO #1171]
Add /var space for zypper due to its space usage for db maintence
This hasn't been tested for opkg/deb and is missing something like:
ZYPPER_VAR_DB_SPACE??= 0
Quoted 7 lines
Quoted 4 lines
I'd suggest we just change this to append " + 51200" to
IMAGE_ROOTFS_EXTRA_SPACE. I'd also like this only to happen when we're actually installing zypper so the minimal images are unaffected...I can do the + 51200, but I have not figured out how to do the check for zypper, maybe it's something straight forward, but I am not finding a way to do it easily.
How about something like:
IMAGE_ROOTFS_EXTRA_SPACE += "${@base_contains("PACKAGE_INSTALL", "zypper", " + 51200", "" ,d)}"
?
Not perfect but should basically work for what we need until we find a bettr fix for zypper itself.
Cheers,
Richard
PATCH 2/8 image.bbclass: add LINGUAS_INSTALL to depends list
In reply to Saul Wold[YOCTO #1215]
--- meta/classes/image.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/image.bbclass +1 -1
@@ -5,7 +5,7 @@ inherit imagetest-${IMAGETEST} LICENSE = "MIT" PACKAGES = "" -RDEPENDS += "${IMAGE_INSTALL}" +RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL}" INHIBIT_DEFAULT_DEPS = "1"
Signature · 1 line
1.7.3.4
PATCH 3/8 gnome-doc-utils: Add RDEPENDS on bash
In reply to Saul Wold[YOCTO #1214]
--- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 ++ meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-gnome/gnome/gnome-doc-utils.inc +2 -0
@@ -15,4 +15,6 @@ do_install_append() { FILES_${PN} += "${datadir}/xml*" +RDEPENDS_${PN} = "bash" + BBCLASSEXTEND = "native"
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb +1 -1
@@ -1,7 +1,7 @@ require gnome-doc-utils.inc LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" -PR = "r1" +PR = "r2" SRC_URI += "file://xsltproc_nonet.patch"
Signature · 1 line
1.7.3.4
PATCH 4/8 quilt: Add RDEPENDS on bash
In reply to Saul Wold[YOCTO #1214]
--- meta/recipes-devtools/quilt/quilt.inc | 2 ++ meta/recipes-devtools/quilt/quilt_0.48.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-devtools/quilt/quilt.inc +2 -0
@@ -17,6 +17,8 @@ FILES_guards = "${bindir}/guards" FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}" FILES_guards-doc = "${mandir}/man1/guards.1" +RDEPENDS_${PN} = "bash" + # quilt ignores DESTDIR do_install () { oe_runmake 'BUILD_ROOT=${D}' install
meta/recipes-devtools/quilt/quilt_0.48.bb +1 -1
@@ -2,7 +2,7 @@ require quilt.inc LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -PR = "r1" +PR = "r2" SRC_URI += "file://aclocal.patch \ file://gnu_patch_test_fix_target.patch \ "
Signature · 1 line
1.7.3.4
PATCH 5/8 console-tools: Add RDEPENDS on bash
In reply to Saul Wold[YOCTO #1214]
--- .../console-tools/console-tools_0.3.2.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-core/console-tools/console-tools_0.3.2.bb +2 -1
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" SUMMARY = "Allows you to set-up and manipulate the Linux console." DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://codepage.patch;patch=1 \
@@ -54,3 +54,4 @@ pkg_prerm_${PN} () { update-alternatives --remove fgconsole fgconsole.${PN} } +RDEPENDS_${PN} = "bash"
Signature · 1 line
1.7.3.4
PATCH 6/8 usbutils: Add RDEPENDS on bash
In reply to Saul Wold[YOCTO #1214]
--- meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-bsp/usbutils/usbutils_0.91.bb +3 -2
@@ -7,8 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb zlib" -RDEPENDS_${PN} = "${PN}-ids" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz"
@@ -26,3 +25,5 @@ do_install_append() { PACKAGES += "${PN}-ids" FILES_${PN} += "${datadir}/pkgconfig" FILES_${PN}-ids = "${datadir}/usb*" + +RDEPENDS_${PN} = "${PN}-ids bash"
Signature · 1 line
1.7.3.4
Re: [PATCH 6/8] usbutils: Add RDEPENDS on bash
iirc only the ids package depends on bash, and only to check for wget. Fixing the update script would be better
Op 8 jul. 2011 om 00:31 heeft Saul Wold <[email protected]> het volgende geschreven:
Quoted 35 lines
[YOCTO #1214]
Signed-off-by Saul Wold <[email protected]>---
meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 +++--1 files changed, 3 insertions(+), 2 deletions(-)meta/recipes-bsp/usbutils/usbutils_0.91.bb +0
-0@@ -7,8 +7,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"DEPENDS = "libusb zlib"
meta/recipes-bsp/usbutils/usbutils_0.91.bb +1
-2-RDEPENDS_${PN} = "${PN}-ids" -PR = "r1" +PR = "r2"
SRC_URI= "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz"meta/recipes-bsp/usbutils/usbutils_0.91.bb +0
-0@@ -26,3 +25,5 @@ do_install_append() {PACKAGES += "${PN}-ids"
FILES_${PN} += "${datadir}/pkgconfig"
FILES_${PN}-ids = "${datadir}/usb*"meta/recipes-bsp/usbutils/usbutils_0.91.bb +2
-0+ +RDEPENDS_${PN} = "${PN}-ids bash"Signature · 7 lines
1.7.3.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 6/8] usbutils: Add RDEPENDS on bash
Quoted 1 line · Koen Kooi
iirc only the ids package depends on bash, and only to check for wget. Fixing the update script would be better
Agreed and I'll take a follow up patch on this one.
The fix in itself is correct as the script is wanting bash currently.
Cheers,
Richard
PATCH 7/8 eglibc: Add RDEPENDS on bash
In reply to Saul Wold[YOCTO #1214]
--- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/eglibc/eglibc-package.inc +1 -1
@@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" -EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev"
meta/recipes-core/eglibc/eglibc.inc +1 -1
@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet -#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash" # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
meta/recipes-core/eglibc/eglibc_2.12.bb +1 -1
@@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r18" +PR = "r19" SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
@@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r5" +PR = "r6" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
Signature · 1 line
1.7.3.4
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
Quoted 18 lines · Saul Wold
[YOCTO #1214]
Signed-off-by Saul Wold <[email protected]>---
meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)meta/recipes-core/eglibc/eglibc-package.inc +0
-0@@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
meta/recipes-core/eglibc/eglibc-package.inc FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" · line 72
Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +1
-1-EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash"
While typo fix is ok why do we need dependency on bash ? If it is for ldd then there is already a fix to free it from bashism We should use that
Quoted 50 lines
FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev"
meta/recipes-core/eglibc/eglibc.inc +0
-0@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc.DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet
meta/recipes-core/eglibc/eglibc.inc +1
-1-#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash"# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"meta/recipes-core/eglibc/eglibc_2.12.bb +0
-0@@ -1,7 +1,7 @@require eglibc.inc
DEPENDS += "gperf-native"
meta/recipes-core/eglibc/eglibc_2.12.bb +1
-1-PR = "r18" +PR = "r19"SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +0
-0@@ -4,7 +4,7 @@ SRCREV = "14157"DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"meta/recipes-core/eglibc/eglibc_2.13.bb +1
-1-PR = "r5" +PR = "r6"
PR_append= "+svnr${SRCPV}"EGLIBC_BRANCH="eglibc-2_13"
Signature · 7 lines
1.7.3.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
Quoted 14 lines · Khem Raj
Quoted 10 lines · Saul Wold
[YOCTO #1214]
Signed-off-by Saul Wold<[email protected]>---
meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
Quoted 15 lines
meta/recipes-core/eglibc/eglibc-package.inc FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" · line 72
Quoted 10 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-0@@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"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
-1-EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash"While typo fix is ok why do we need dependency on bash ? If it is for ldd then there is already a fix to free it from bashism We should use that
Actually it's for xtrace and tzselect which are part of eglibc-utils and are scripts that use /bin/bash.
Where's the fix for ldd? I don't think its part of eglibc currently.
Sau!
Quoted 56 lines
Quoted 46 lines
FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev"
meta/recipes-core/eglibc/eglibc.inc +0
-0@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc.DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet
meta/recipes-core/eglibc/eglibc.inc +1
-1-#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash"# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"meta/recipes-core/eglibc/eglibc_2.12.bb +0
-0@@ -1,7 +1,7 @@require eglibc.inc
DEPENDS += "gperf-native"
meta/recipes-core/eglibc/eglibc_2.12.bb +1
-1-PR = "r18" +PR = "r19"SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +0
-0@@ -4,7 +4,7 @@ SRCREV = "14157"DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"meta/recipes-core/eglibc/eglibc_2.13.bb +1
-1-PR = "r5" +PR = "r6"
PR_append= "+svnr${SRCPV}"EGLIBC_BRANCH="eglibc-2_13"
--
1.7.3.4Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
Quoted 31 lines · Saul Wold
Quoted 14 lines · Khem Raj
Quoted 10 lines · Saul Wold
[YOCTO #1214]
Signed-off-by Saul Wold<[email protected]>---
meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-4 files changed, 4 insertions(+), 4 deletions(-)Quoted 16 lines
meta/recipes-core/eglibc/eglibc-package.inc FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" · line 72
Quoted 11 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-0@@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"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
-1-EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash"While typo fix is ok why do we need dependency on bash ? If it is for ldd then there is already a fix to free it from bashism We should use that
Quoted 2 lines
Actually it's for xtrace and tzselect which are part of eglibc-utils and are scripts that use
/bin/bash.
hmm I see, see if it can be unbashed if not then the dep is ok.
Quoted 2 lines
Where's the fix for ldd? I don't think its part of eglibc currently.
0a831e2cd1c27d30cd76ddada9a44a703ab60f41 in oe.dev
Quoted 68 lines
Sau!
Quoted 50 lines
Quoted 50 lines
FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev"
meta/recipes-core/eglibc/eglibc.inc +0
-0@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc.DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet
meta/recipes-core/eglibc/eglibc.inc +1
-1-#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash"# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"meta/recipes-core/eglibc/eglibc_2.12.bb +0
-0@@ -1,7 +1,7 @@require eglibc.inc
DEPENDS += "gperf-native"
meta/recipes-core/eglibc/eglibc_2.12.bb +1
-1-PR = "r18" +PR = "r19"SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +0
-0@@ -4,7 +4,7 @@ SRCREV = "14157"DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"meta/recipes-core/eglibc/eglibc_2.13.bb +1
-1-PR = "r5" +PR = "r6"
PR_append= "+svnr${SRCPV}"EGLIBC_BRANCH="eglibc-2_13"
--
1.7.3.4Quoted 10 lines
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list [email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
Quoted 9 lines · Khem Raj
Quoted 6 lines · Saul Wold
Quoted 3 lines · Khem Raj
While typo fix is ok why do we need dependency on bash ? If it is for ldd then there is already a fix to free it from bashism We should use that
Where's the fix for ldd? I don't think its part of eglibc currently.
0a831e2cd1c27d30cd76ddada9a44a703ab60f41in oe.dev
As we discussed on IRC the other day, that patch is not really a complete fix. All it does is change the #!/bin/bash to #!/bin/sh without addressing the parts of the script that actually use bash-specific syntax. In particular there are quite a lot of places that use the $"string" gettext shorthand.
p.
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
In reply to Saul Wold2011/7/8 Saul Wold <[email protected]>
Quoted 30 lines
[YOCTO #1214]
Signed-off-by Saul Wold <[email protected]>--- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)meta/recipes-core/eglibc/eglibc-package.inc +1
-1@@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" -EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev"meta/recipes-core/eglibc/eglibc.inc +0
-0
meta/recipes-core/eglibc/eglibc.inc siteconfig_do_siteconfig_gencache_prepend = " \ · line 26
Quoted 6 lines
meta/recipes-core/eglibc/eglibc.inc +1
-1@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet -#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash"
Ah ok, now see that this is only for ldd.
In that case the commit message is misleading. (and probably also not conformant with the commit message policy).
Frans
Quoted 40 lines
meta/recipes-core/eglibc/eglibc.inc +0
-0# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
(quoted diff) +0
-0eglibc_2.12.bb
index 85d58fa..fd7b485 100644meta/recipes-core/eglibc/eglibc_2.12.bb +1
-1@@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r18" +PR = "r19" SRCREV = "14158"(quoted diff) +0
-0eglibc_2.13.bb
index 7986131..be65787 100644meta/recipes-core/eglibc/eglibc_2.13.bb +1
-2@@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r5" +PR = "r6" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" --1.7.3.4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
Op 8 jul. 2011 om 07:53 heeft Frans Meulenbroeks <[email protected]> het volgende geschreven:
Quoted 37 lines
2011/7/8 Saul Wold <[email protected]>
[YOCTO #1214]Signed-off-by Saul Wold <[email protected]>--- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)meta/recipes-core/eglibc/eglibc-package.inc +1
-1@@ -69,7 +69,7 @@ FILES_eglibc-utils ="${bindir}/* ${sbindir}/*" FILES_${PN}-dbg +="${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} ="${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} ="libsegfault" -EDEPENDS_eglibc-utils ="libsotruss" +RDEPENDS_eglibc-utils +="libsotruss bash" FILES_eglibc-pcprofile ="${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} ="${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev +="libc-dev"meta/recipes-core/eglibc/eglibc.inc +1
-1@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend =" \ # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS ="virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet -#RDEPENDS_ldd +=" bash" +RDEPENDS_ldd +=" bash"
Quoted 3 lines
Ah ok, now see that this is only for ldd.
In that case the commit message is misleading. (and probably also not conformant with the commit message policy).
there's an ldd-unbash patch in . dev
Quoted 44 lines
Frans
# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} +="${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES ="virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"meta/recipes-core/eglibc/eglibc_2.12.bb +1
-1@@ -1,7 +1,7 @@ require eglibc.inc DEPENDS +="gperf-native" -PR ="r18" +PR ="r19" SRCREV ="14158"meta/recipes-core/eglibc/eglibc_2.13.bb +1
-2@@ -4,7 +4,7 @@ SRCREV ="14157" DEPENDS +="gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR ="r5" +PR ="r6" PR_append ="+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" --1.7.3.4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 7/8] eglibc: Add RDEPENDS on bash
2011/7/8 Koen Kooi <[email protected]>
Quoted 15 lines
Op 8 jul. 2011 om 07:53 heeft Frans Meulenbroeks < [email protected]> het volgende geschreven:
Review
Quoted 3 lines
(quoted diff) +1
-1-#RDEPENDS_ldd +=" bash" +RDEPENDS_ldd +=" bash"Ah ok, now see that this is only for ldd.
In that case the commit message is misleading. (and probably also not conformant with the commit message policy).
Quoted 4 lines
there's an ldd-unbash patch in . dev
Seems to me that that is a better alternative then
Frans
PATCH 8/8 libx11: enable xcb support
In reply to Saul Wold[YOCTO #1196]
--- meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb +8 -3
@@ -5,7 +5,7 @@ LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" PE = "1" -PR = "r1" +PR = "r3" SRC_URI += "file://x11_disable_makekeys.patch \ file://nodolt.patch \
@@ -16,8 +16,13 @@ SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb" -EXTRA_OECONF += "--without-xcb" +DEPENDS_virtclass-native += "bigreqsproto-native xproto-native xextproto-native xtrans-native libxau-native xcmiscproto-native \ + libxdmcp-native xf86bigfontproto-native kbproto-native inputproto-native xproto-native" + +XCB = "--with-xcb" +XCB_virtclass-native = "--without-xcb" +EXTRA_OECONF += "${XCB}" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.3.4
Re: [PATCH 8/8] libx11: enable xcb support
Quoted 3 lines · Saul Wold
[YOCTO #1196]
Signed-off-by Saul Wold <[email protected]>
We seem to be seeing quite a lot of patches recently whose long-form comment consists of a Yocto bug number, S-O-B line and nothing else. That might be fine for the most notorious bugs, where even non-Yocto people would immediately recognise the number, but in general it's a bit tedious to keep having to go to the Yocto bugzilla to find out what the patch is trying to do. Would it be possible to get a slightly more descriptive commit message for future changes?
See also the fine guidelines from our helpful TSC:
http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines
thanks
p.
Re: [PATCH 8/8] libx11: enable xcb support
In reply to Saul WoldQuoted 26 lines · Saul Wold
[YOCTO #1196]
Signed-off-by Saul Wold <[email protected]>--- meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb +2
-2@@ -5,7 +5,7 @@ LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" PE = "1" -PR = "r1" +PR = "r3" SRC_URI += "file://x11_disable_makekeys.patch \ file://nodolt.patch \@@ -16,8 +16,13 @@ SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb"
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" · line 28
Quoted 10 lines
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb +6
-1-EXTRA_OECONF += "--without-xcb" +DEPENDS_virtclass-native += "bigreqsproto-native xproto-native xextproto-native xtrans-native libxau-native xcmiscproto-native \ + libxdmcp-native xf86bigfontproto-native kbproto-native inputproto-native xproto-native" + +XCB = "--with-xcb" +XCB_virtclass-native = "--without-xcb" +EXTRA_OECONF += "${XCB}" BBCLASSEXTEND = "native nativesdk"
FWIW:
few months back I've replied on similar change that --without-xcb is not available in newer libx11 and that it would be better to upgrade to newer libx11 or keep xcb enabled for -native too and add 2 BBCLASSEXTENDS to needed xcb recipes..
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
2011/7/8 Saul Wold <[email protected]>
Quoted 5 lines
Richard,
This address the bash, xcb missing from libx11, locale issue and the lack of space due to zypper eating space.
I don't think all the dependencies on bash are needed.
E.g: eglibc: Add RDEPENDS on bash
eglibc itself does not need bash to be present at runtime (or maybe only in some eglibc configurations).
I am currently happily running an eglibc system with busybox sh without any problem at all.
Footprintwise for embedded systems that is desirable and as such it is quite a common setup.
Frans.
Quoted 49 lines
Sau!
The following changes since commit
f1fc6d084b079dea21ff1a30b815496452042490:pulseaudio: add 0.9.23 (2011-07-07 13:44:36 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/fixhttp://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (8):
rootfs_rpm: Add 50Meg to image size for zypper image.bbclass: addLINGUAS_INSTALLto depends list
gnome-doc-utils: Add RDEPENDS on bash
quilt: Add RDEPENDS on bash
console-tools: Add RDEPENDS on bash
usbutils: Add RDEPENDS on bash
eglibc: Add RDEPENDS on bash
libx11: enable xcb supportmeta/classes/image.bbclass | 2 +- meta/classes/image_types.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 5 +++++ meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 +++-- .../console-tools/console-tools_0.3.2.bb | 3 ++- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-devtools/quilt/quilt.inc | 2 ++ meta/recipes-devtools/quilt/quilt_0.48.bb | 2 +- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 ++ meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 11 ++++++++--- 14 files changed, 30 insertions(+), 14 deletions(-)--
1.7.3.4_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 16 lines · Saul Wold
Richard,
This address the bash, xcb missing from libx11, locale issue and the lack of space due to zypper eating space.
Sau!
The following changes since commit
f1fc6d084b079dea21ff1a30b815496452042490:pulseaudio: add 0.9.23 (2011-07-07 13:44:36 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Quoted 7 lines
Saul Wold (8):
image.bbclass: add
LINGUAS_INSTALLto depends list
gnome-doc-utils: Add RDEPENDS on bash
quilt: Add RDEPENDS on bash
console-tools: Add RDEPENDS on bash
usbutils: Add RDEPENDS on bash
I've taken these (rewording the image.bbclass commit).
Quoted 1 line
rootfs_rpm: Add 50Meg to image size for zypper
This needs tweaking as per the discussion
Quoted 1 line
eglibc: Add RDEPENDS on bash
We should likely take OE's ldd patch here and then this can go in.
Quoted 1 line
libx11: enable xcb support
and this needs a revised commit message.
Cheers,
Richard