Skip to contentSkip to conversation

2nd pass of external-csl-toolchain improvements

PATCH In review Christopher Larson 2 participants 6 messages Feb 6, 2012 – Feb 10, 2012

lore
Share & tools
lore

Christopher Larson

author
#0 lore raw

cover 2nd pass of external-csl-toolchain improvements

From: Christopher Larson <[email protected]>

The following changes since commit 18d9fcfc4bc4b01f73e89f3b988c9d3d543c7705:

libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:28 +0000)

are available in the git repository at:
https://github.com/kergoth/oe-core external-toolchain-fixes

Christopher Larson (4):
external-csl-toolchain: set PKG/PKGV for staticdev
external-csl-toolchain: fix mtd-user.h issue
external-csl-toolchain: correct binary packaging
external-csl-toolchain: split out gdbserver packages

 meta/recipes-core/meta/external-csl-toolchain.bb |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

Christopher Larson (4):
external-csl-toolchain: set PKG/PKGV for staticdev
external-csl-toolchain: fix mtd-user.h issue
external-csl-toolchain: correct binary packaging
external-csl-toolchain: split out gdbserver packages

 meta/recipes-core/meta/external-csl-toolchain.bb |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/4 external-csl-toolchain: set PKG/PKGV for staticdev

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-core/meta/external-csl-toolchain.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-core/meta/external-csl-toolchain.bb +2 -0
index c9f35c4..7dd8da2 100644
@@ -89,6 +89,7 @@ INSANE_SKIP_gdbserver = "1"
 
 PKG_${PN} = "eglibc"
 PKG_${PN}-dev = "eglibc-dev"
+PKG_${PN}-staticdev = "eglibc-staticdev"
 PKG_${PN}-doc = "eglibc-doc"
 PKG_${PN}-dbg = "eglibc-dbg"
 PKG_${PN}-pic = "eglibc-pic"

@@ -100,6 +101,7 @@ PKG_${PN}-pcprofile = "eglibc-pcprofile"
 
 PKGV_${PN} = "${CSL_VER_LIBC}"
 PKGV_${PN}-dev = "${CSL_VER_LIBC}"
+PKGV_${PN}-staticdev = "${CSL_VER_LIBC}"
 PKGV_${PN}-doc = "${CSL_VER_LIBC}"
 PKGV_${PN}-dbg = "${CSL_VER_LIBC}"
 PKGV_${PN}-pic = "${CSL_VER_LIBC}"
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/4 external-csl-toolchain: fix mtd-user.h issue

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

The use of __packed, which isn't defined in userspace, caused busybox build failures.

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-core/meta/external-csl-toolchain.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-core/meta/external-csl-toolchain.bb +1 -0
index 7dd8da2..e81559a 100644
@@ -60,6 +60,7 @@ do_install() {
 	rm -r ${D}${datadir}/zoneinfo
 	rm -r ${D}${libdir}/bin
 
+	sed -i -e 's/__packed/__attribute__ ((packed))/' ${D}${includedir}/mtd/ubi-user.h
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so
 }
Signature · 1 line
1.7.7
author
#3 lore raw

PATCH 3/4 external-csl-toolchain: correct binary packaging

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

CS puts optimized executables in usr/lib/bin, not usr/bin.

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-core/meta/external-csl-toolchain.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-core/meta/external-csl-toolchain.bb +6 -1
index e81559a..5b4134e 100644
@@ -58,7 +58,12 @@ do_install() {
 
 	rm ${D}${sysconfdir}/rpc
 	rm -r ${D}${datadir}/zoneinfo
-	rm -r ${D}${libdir}/bin
+
+	mv ${D}${libdir}/bin/* ${D}${bindir}/
+	if [ -e ${D}${libdir}/bin/.debug ]; then
+		install -d ${D}${bindir}/.debug
+		mv ${D}${libdir}/bin/.debug/* ${D}${bindir}/.debug/
+	fi
 
 	sed -i -e 's/__packed/__attribute__ ((packed))/' ${D}${includedir}/mtd/ubi-user.h
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
Signature · 1 line
1.7.7
author
#4 lore raw

PATCH 4/4 external-csl-toolchain: split out gdbserver packages

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-core/meta/external-csl-toolchain.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-core/meta/external-csl-toolchain.bb +6 -2
index 5b4134e..d15578b 100644
@@ -64,6 +64,7 @@ do_install() {
 		install -d ${D}${bindir}/.debug
 		mv ${D}${libdir}/bin/.debug/* ${D}${bindir}/.debug/
 	fi
+	ln -s ../../bin/gdbserver ${D}${libdir}/bin/sysroot-gdbserver
 
 	sed -i -e 's/__packed/__attribute__ ((packed))/' ${D}${includedir}/mtd/ubi-user.h
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so

@@ -87,7 +88,7 @@ external_toolchain_sysroot_adjust() {
        fi
 }
 
-PACKAGES =+ "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers linux-libc-headers-dev"
+PACKAGES =+ "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers linux-libc-headers-dev gdbserver gdbserver-dbg"
 
 INSANE_SKIP_libgcc = "1"
 INSANE_SKIP_libstdc++ = "1"

@@ -127,7 +128,8 @@ PKGV_libstdc++ = "${CSL_VER_GCC}"
 PKGV_libstdc++-dev = "${CSL_VER_GCC}"
 PKGV_linux-libc-headers = "${CSL_VER_KERNEL}"
 PKGV_linux-libc-headers-dev = "${CSL_VER_KERNEL}"
-PKGV_gdbserver = "${CSL_VER_GDBSERVER}"
+PKGV_gdbserver = "${CSL_VER_GDB}"
+PKGV_gdbserver-dbg = "${CSL_VER_GDB}"
 
 FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
 FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"

@@ -146,3 +148,5 @@ FILES_linux-libc-headers = "${includedir}/asm* \
 	${includedir}/sound \
 	${includedir}/video \
 "
+FILES_gdbserver = "${bindir}/gdbserver ${libdir}/bin/sysroot-gdbserver"
+FILES_gdbserver-dbg = "${bindir}/.debug/gdbserver"
Signature · 1 line
1.7.7
#5 lore raw
In reply to Christopher Larson
Quoted 18 lines · Christopher Larson

From: Christopher Larson<[email protected]>

The following changes since commit 18d9fcfc4bc4b01f73e89f3b988c9d3d543c7705:

libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:28 +0000)

are available in the git repository at:
https://github.com/kergoth/oe-core external-toolchain-fixes

Christopher Larson (4):
external-csl-toolchain: set PKG/PKGV for staticdev
external-csl-toolchain: fix mtd-user.h issue
external-csl-toolchain: correct binary packaging
external-csl-toolchain: split out gdbserver packages

  meta/recipes-core/meta/external-csl-toolchain.bb |   18 +++++++++++++++---
  1 files changed, 15 insertions(+), 3 deletions(-)
Quoted 9 lines

Christopher Larson (4):
external-csl-toolchain: set PKG/PKGV for staticdev
external-csl-toolchain: fix mtd-user.h issue
external-csl-toolchain: correct binary packaging
external-csl-toolchain: split out gdbserver packages

  meta/recipes-core/meta/external-csl-toolchain.bb |   18 +++++++++++++++---
  1 files changed, 15 insertions(+), 3 deletions(-)

Merged all of these to OE-core

Thanks
Sau!