[oe-commits] org.oe.dev merge of '80e71d36ec321be9cd506e086c7f71856a768989'

[hrw commit]

merge of '80e71d36ec321be9cd506e086c7f71856a768989'
     and 'ab0d9a488e49d9ec307f6d034845a25a157b066b'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5732828c1a26c7739d598f2266c24b44bb0e065a
ViewMTN: http://monotone.openembedded.org/revision/info/5732828c1a26c7739d598f2266c24b44bb0e065a
Files:
1
packages/uclibc/bfin-uclibc_svn.bb
packages/uclibc/elf2flt_svn.bb
conf/distro/include/sane-srcrevs.inc
conf/distro/include/moko-autorev.inc
Diffs:

#
# mt diff -r80e71d36ec321be9cd506e086c7f71856a768989 -r5732828c1a26c7739d598f2266c24b44bb0e065a
#
# 
# 
# add_file "packages/uclibc/bfin-uclibc_svn.bb"
#  content [1eb6937a681df9e862a1770a754b337f98f02833]
# 
# add_file "packages/uclibc/elf2flt_svn.bb"
#  content [339525a526bf04879f8f94a238602fe87870a1a0]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [138f7af37b97d02e0a976cc682367bcc0754f552]
#    to [8276f0c6e69fdcf546e255dc1764c6d7c2d69326]
# 
============================================================
--- packages/uclibc/bfin-uclibc_svn.bb	1eb6937a681df9e862a1770a754b337f98f02833
+++ packages/uclibc/bfin-uclibc_svn.bb	1eb6937a681df9e862a1770a754b337f98f02833
@@ -0,0 +1,34 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!)  uclibc-cvs takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.29"
+PR = "r0"
+PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+
+require uclibc.inc
+
+PROVIDES_append_bfin = " virtual/${TARGET_PREFIX}libc-for-gcc "
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_HOST = "bfin.*-uclinux"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+
+SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc "
+SRC_URI += "file://uClibc.machine file://uClibc.distro"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+
+S = "${WORKDIR}/uClibc"
+
+LEAD_SONAME = "libc.so"
+
============================================================
--- packages/uclibc/elf2flt_svn.bb	339525a526bf04879f8f94a238602fe87870a1a0
+++ packages/uclibc/elf2flt_svn.bb	339525a526bf04879f8f94a238602fe87870a1a0
@@ -0,0 +1,15 @@
+DESCRIPTION = "Elf2flt is a wrapper around the linker for uclinux platforms"
+DEPENDS = "binutils-cross"
+
+PV = "0.0+svnr${SRCREV}"
+
+inherit autotools cross
+
+SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = " --with-libbfd=${CROSS_DIR}/${TARGET_SYS}/lib/libbfd.a \
+                 --with-libiberty=${CROSS_DIR}/${TARGET_SYS}/lib/libiberty.a \
+                 --with-bfd-include-dir=${CROSS_DIR}/${TARGET_SYS}/include \
+               "
============================================================
--- conf/distro/include/sane-srcrevs.inc	138f7af37b97d02e0a976cc682367bcc0754f552
+++ conf/distro/include/sane-srcrevs.inc	8276f0c6e69fdcf546e255dc1764c6d7c2d69326
@@ -5,12 +5,14 @@
 
 # This will miss recipes that have skippackage set (e.g. uclibc)
 
+SRCREV_pn-bfin-uclibc ?= "1806"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
 SRCREV_pn-eglibc ?= "3468"
 SRCREV_pn-eglibc-initial ?= "3468"
 SRCREV_pn-eglibc-intermediate ?= "3468"
 SRCREV_pn-ezxd ?= "2052"
+SRCREV_pn-elf2flt="1786"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gnuradio ?= "6377"


#
# mt diff -rab0d9a488e49d9ec307f6d034845a25a157b066b -r5732828c1a26c7739d598f2266c24b44bb0e065a
#
# 
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [6240717f26874b7789e1000660e2bebc929ef762]
#    to [5496c2c028496f67b900d973c1b782fe821e93dc]
# 
============================================================
--- conf/distro/include/moko-autorev.inc	6240717f26874b7789e1000660e2bebc929ef762
+++ conf/distro/include/moko-autorev.inc	5496c2c028496f67b900d973c1b782fe821e93dc
@@ -1,3 +1,8 @@
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"