[oe-commits] org.oe.dev merge of '0ff008433fa51cf7039bcbbf1ad8f7ca56f1598c'

[oe commit]

merge of '0ff008433fa51cf7039bcbbf1ad8f7ca56f1598c'
     and '228a037630b37b507f3933f6eb058c47f559fb75'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 973a50477e3d0fbb540a2b070ee4666459aceb53
ViewMTN: http://monotone.openembedded.org/revision.psp?id=973a50477e3d0fbb540a2b070ee4666459aceb53
Files:
1
packages/openmoko2/libmokojournal2_svn.bb
packages/glibc/glibc_2.6.bb
Diffs:

#
# mt diff -r0ff008433fa51cf7039bcbbf1ad8f7ca56f1598c -r973a50477e3d0fbb540a2b070ee4666459aceb53
#
# 
# 
# patch "packages/openmoko2/libmokojournal2_svn.bb"
#  from [6251090262ba51c4d512b8224a2034e606137c8c]
#    to [b541bf1dc97e0d821a14b471c2dda846d8f49d77]
# 
============================================================
--- packages/openmoko2/libmokojournal2_svn.bb	6251090262ba51c4d512b8224a2034e606137c8c
+++ packages/openmoko2/libmokojournal2_svn.bb	b541bf1dc97e0d821a14b471c2dda846d8f49d77
@@ -1,9 +1,9 @@ PV = "0.1.0+svn${SVNREV}"
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
 
-inherit openmoko2
+inherit openmoko2 lib_package
 
 do_stage() {
         autotools_stage_all


#
# mt diff -r228a037630b37b507f3933f6eb058c47f559fb75 -r973a50477e3d0fbb540a2b070ee4666459aceb53
#
# 
# 
# patch "packages/glibc/glibc_2.6.bb"
#  from [40ce06520a4af3a8602e69c014855bb6bf0d2cf7]
#    to [46d87654a2c402275e3e9fb45fcd94cb8311edc8]
# 
============================================================
--- packages/glibc/glibc_2.6.bb	40ce06520a4af3a8602e69c014855bb6bf0d2cf7
+++ packages/glibc/glibc_2.6.bb	46d87654a2c402275e3e9fb45fcd94cb8311edc8
@@ -70,10 +70,7 @@ SRC_URI_append_sh4 = " file://no-z-defs.
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \
-                          file://ppc-soft-fp-20070115.patch;patch=1 \
-                          file://ppc-ld-nofpu-20070104.patch;patch=1 \
-                          file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \
+SRC_URI_append_powerpc= " \
                           file://powerpc-sqrt-hack.diff;patch=1""
 
 S = "${WORKDIR}/glibc-${PV}"