rootfs space issue along with eglibc and libx11

PATCH Applied Saul Wold 2 participants 6 messages Jul 8, 2011

lore

Share & tools

lore

Saul Wold

author

2011-07-08 17:33 UTC #0 lore raw

v2 cover rootfs space issue along with eglibc and libx11

Richard,

This is v2 of my patch set with updated commit messages and reworked changes. I grabbed the oe-dev change for ldd bashims, but still included the RDEPENDS for others until the maintainers update the scripts.

Thanks
Sau!

The following changes since commit 93ce74a299832ca7f24b4ce1b951abffa0232612:

libc-common.bbclass: Fix typo (2011-07-08 18:08:26 +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 (4):
rootfs_rpm: Add 50M to IMAGE_ROOTFS_EXTRA_SPACE for zypper /var space
eglibc: unbash ldd (from oe.dev)
eglibc: add RDEPENDS for bash on eglibc-utils
libx11: enable xcb support

 meta/classes/rootfs_rpm.bbclass                |    5 +++++
 meta/recipes-core/eglibc/eglibc-package.inc    |    2 +-
 meta/recipes-core/eglibc/eglibc.inc            |    3 +--
 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb |   11 ++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-08 17:33 UTC #1 lore raw

PATCH v2 1/4 rootfs_rpm: Add 50M to IMAGE_ROOTFS_EXTRA_SPACE for zypper /var space

[YOCTO #1171]

This is a temporary fix to address the fact that zypper's db configuation uses a large amount of /var space. When the correct'ed zypper config can be applied, this fix can be removed. The zypper bug for yocto is 1174
http://bugzilla.pokylinux.org/show_bug.cgi?id=1174

Signed-off-by Saul Wold <[email protected]>

---
 meta/classes/rootfs_rpm.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

meta/classes/rootfs_rpm.bbclass +5 -0

index 3a11858..3cdcbd5 100644
@@ -3,6 +3,10 @@
 #
 
 ROOTFS_PKGMANAGE = "rpm zypper"
+
+# Add 50Meg of extra space for zypper database space
+IMAGE_ROOTFS_EXTRA_SPACE_append = "${@base_contains("PACKAGE_INSTALL", "zypper", " + 51200", "" ,d)}"
+
 # 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

Saul Wold

author

2011-07-08 17:33 UTC #2 lore raw

PATCH v2 2/4 eglibc: unbash ldd (from oe.dev)

In reply to Saul Wold

(From oe-dev rev: 0a831e2cd1c27d30cd76ddada9a44a703ab60f41)

* replace shebang of ldd by /bin/sh, so ldd doesn't depend on bash anymore. Tested with busybox sh.
* added to do_configure_prepend because do_patch is only a python function

Signed-off-by Thomas Zimmermann <[email protected]>

Signed-off-by Khem Raj <[email protected]>

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/eglibc/eglibc.inc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

meta/recipes-core/eglibc/eglibc.inc +1 -2

index 74afb9d..1b2e630 100644
@@ -21,8 +21,6 @@ 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"
 # 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"

@@ -47,5 +45,6 @@ PACKAGES = "glibc catchsegv sln nscd ldd glibc-utils glibc-dev glibc-doc libsegf
 
 OE_FEATURES = "${@features_to_eglibc_settings(d)}"
 do_configure_prepend() {
+	sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
 	echo '${OE_FEATURES}' > ${B}/option-groups.config
 }

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-08 17:33 UTC #3 lore raw

PATCH v2 3/4 eglibc: add RDEPENDS for bash on eglibc-utils

In reply to Saul Wold

[YOCTO #1214]

The eglibc-utils contains 2 scripts (tzselect and xtrace) that use bash, so add an RDEPENDS to eglibc-utils.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/eglibc/eglibc-package.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-core/eglibc/eglibc-package.inc +1 -1

index 1c6626c..f0fac76 100644
@@ -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"

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-08 17:33 UTC #4 lore raw

PATCH v2 4/4 libx11: enable xcb support

In reply to Saul Wold

[YOCTO #1196]

XCB support is needed in libx1l, it has been enabled in libx11-trim for sometime and was not in full version. The usage here is for LSB testing, which uses full libx11.

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 +8 -3

index 3e046a1..04d4a97 100644
@@ -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

Richard Purdie

Applied

2011-07-08 22:07 UTC #5 lore raw

In reply to Saul Wold

Quoted 18 lines · Saul Wold

Richard,
This is v2 of my patch set with updated commit messages and reworked changes. I grabbed the oe-dev change for ldd bashims, but still included the RDEPENDS for others until the maintainers update the scripts.
Thanks
Sau!
The following changes since commit 93ce74a299832ca7f24b4ce1b951abffa0232612:
libc-common.bbclass: Fix typo (2011-07-08 18:08:26 +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

Quoted 5 lines

Saul Wold (4):
rootfs_rpm: Add 50M to IMAGE_ROOTFS_EXTRA_SPACE for zypper /var space
eglibc: unbash ldd (from oe.dev)
eglibc: add RDEPENDS for bash on eglibc-utils
libx11: enable xcb support

Merged, thanks but I did remove the blank line in the rootfs_rpm patch :)

Cheers,

Richard