[oe-commits] org.oe.dev merge of 'd11de5b2fccb6699a3ba660836048f87dc676a4c'

pb commit oe at amethyst.openembedded.net
Sat Jul 26 16:47:01 UTC 2008


merge of 'd11de5b2fccb6699a3ba660836048f87dc676a4c'
     and 'ee301efdfcf7c1a68f66c22997f3d9b52647f25c'

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: adeeabec80174cc28a509847c43a6193d386e011
ViewMTN: http://monotone.openembedded.org/revision/info/adeeabec80174cc28a509847c43a6193d386e011
Files:
1
packages/gcc/gcc-cross-kernel.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore_cvs.bb
Diffs:

#
# mt diff -rd11de5b2fccb6699a3ba660836048f87dc676a4c -radeeabec80174cc28a509847c43a6193d386e011
#
#
#
# patch "packages/gcc/gcc-cross-kernel.inc"
#  from [20867aba06eab9b6f8398e481391ea9109b3b80e]
#    to [3c5f4ada32dfb18f511b21b25bee2d337693cce0]
#
============================================================
--- packages/gcc/gcc-cross-kernel.inc	20867aba06eab9b6f8398e481391ea9109b3b80e
+++ packages/gcc/gcc-cross-kernel.inc	3c5f4ada32dfb18f511b21b25bee2d337693cce0
@@ -11,6 +11,6 @@ do_stage () {
 
 do_stage () {
 	cd gcc
-	oe_runmake install-common install-headers install-libgcc
+	oe_runmake installdirs install-common install-headers install-libgcc
 	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
 }


#
# mt diff -ree301efdfcf7c1a68f66c22997f3d9b52647f25c -radeeabec80174cc28a509847c43a6193d386e011
#
#
#
# patch "conf/distro/include/moko-autorev.inc"
#  from [7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a]
#    to [37caae48109ecf51cac36b99d1c159bf899e43a0]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [2fd13fc744e766175938eb267aa49d99d9f5c39e]
#    to [1f2ab31eceb6206825c9568b313ab48c224c8863]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
#    to [2585aee85a18623ca3ef7c268f21be835fffc097]
#
============================================================
--- conf/distro/include/moko-autorev.inc	7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a
+++ conf/distro/include/moko-autorev.inc	37caae48109ecf51cac36b99d1c159bf899e43a0
@@ -3,8 +3,8 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
-#SRCREV_pn-illume ?= "${AUTOREV}"
-#SRCREV_pn-illume-theme ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
 SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc	2fd13fc744e766175938eb267aa49d99d9f5c39e
+++ conf/distro/include/sane-srcdates.inc	1f2ab31eceb6206825c9568b313ab48c224c8863
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080716"
+EFL_SRCDATE ?= "20080727"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/efl1/ecore_cvs.bb	db9ceefb6209514dcc2b22c3b7d8e0816820f762
+++ packages/efl1/ecore_cvs.bb	2585aee85a18623ca3ef7c268f21be835fffc097
@@ -1,32 +1,33 @@ require ecore.inc
 require ecore.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
-        --x-includes=${STAGING_INCDIR}/X11 \
-        --x-libraries=${STAGING_LIBDIR} \
-        --enable-simple-x11 \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
 \
-		--enable-ecore-txt \
-        --enable-ecore-config \
-		--disable-ecore-x-xcb \
-		--enable-ecore-x \
-		--enable-ecore-job \
-		--disable-ecore-directfb \
-		--disable-ecore-sdl \
-		--enable-ecore-fb \
-		--enable-ecore-evas \
-		--enable-ecore-evas-x11-16 \
-        --disable-ecore-evas-x11-gl \
-		--enable-ecore-evas-xrender \
-		--disable-ecore-evas-dfb \
-        --disable-ecore-evas-sdl \
-		--disable-openssl \
-		--enable-abstract-sockets \
-		--enable-ecore-con \
-		--enable-ecore-ipc \
-		--enable-ecore-file \
-		--enable-inotify \
-		--disable-poll \
-		--enable-curl \
-		--disable-ecore-desktop \
+  --enable-ecore-txt \
+  --enable-ecore-config \
+  --disable-ecore-x-xcb \
+  --enable-ecore-x \
+  --enable-ecore-job \
+  --disable-ecore-directfb \
+  --disable-ecore-sdl \
+  --enable-ecore-fb \
+  --enable-ecore-evas \
+  --enable-ecore-evas-x11-16 \
+  --enable-ecore-evas-16-x11 \
+  --disable-ecore-evas-x11-gl \
+  --enable-ecore-evas-xrender \
+  --disable-ecore-evas-dfb \
+  --disable-ecore-evas-sdl \
+  --disable-openssl \
+  --enable-abstract-sockets \
+  --enable-ecore-con \
+  --enable-ecore-ipc \
+  --enable-ecore-file \
+  --enable-inotify \
+  --disable-poll \
+  --enable-curl \
+  --disable-ecore-desktop \
 "






More information about the Openembedded-commits mailing list