[oe-commits] org.oe.dev merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
mickeyl commit
oe at amethyst.openembedded.net
Mon May 19 00:23:40 UTC 2008
merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
and 'd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6279441596d7826ca811822cd78f2118f9eb57e2
ViewMTN: http://monotone.openembedded.org/revision/info/6279441596d7826ca811822cd78f2118f9eb57e2
Files:
1
packages/efl1/epsilon
packages/efl1/epsilon/fix_alignment_error.patch
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
packages/efl1/edbus_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/wwwoffle
packages/wwwoffle/files
packages/wwwoffle/files/wwwoffle.if-down
packages/wwwoffle/files/wwwoffle.if-up
packages/wwwoffle/files/wwwoffle.init
packages/wwwoffle/wwwoffle_2.9c.bb
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-hx2000
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-qemuarm
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp-2.6.24/defconfig-zylonite
Diffs:
#
# mt diff -r5ffcacd9125004bbcb65a5f2d933272d313bee84 -r6279441596d7826ca811822cd78f2118f9eb57e2
#
#
#
# delete "packages/efl1/epsilon"
#
# delete "packages/efl1/epsilon/fix_alignment_error.patch"
#
# patch "conf/distro/include/moko-autorev.inc"
# from [cf51729787fd2fd25f76ebaf652e629b2c27a8b4]
# to [89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
# to [a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
# to [7f6f010883128a2dc595086674f08caa1bf29d74]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
# to [83ada598b7cf56e16b6d9c1101d88249c5112649]
#
============================================================
--- conf/distro/include/moko-autorev.inc cf51729787fd2fd25f76ebaf652e629b2c27a8b4
+++ conf/distro/include/moko-autorev.inc 89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed
@@ -1,4 +1,3 @@
-EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
SRCREV_pn-assassin ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc e993ffd4e275abdc019bd768b83fe75481e9f12a
+++ conf/distro/include/sane-srcdates.inc a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba
@@ -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 ?= "20080428"
+EFL_SRCDATE ?= "20080518"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -80,6 +80,7 @@ SRCDATE_evolve ?= "${EFL_SRCDATE}"
SRCDATE_engrave ?= "${EFL_SRCDATE}"
SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
SRCDATE_evolve ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
SRCDATE_imlib2 ?= "${EFL_SRCDATE}"
============================================================
--- packages/efl1/edbus_cvs.bb ecd6cb444aeac48cd019c31f15055fb2cca6157a
+++ packages/efl1/edbus_cvs.bb 7f6f010883128a2dc595086674f08caa1bf29d74
@@ -6,9 +6,10 @@ inherit efl
inherit efl
-SRC_URI = "${E_CVS};module=e17/libs/e_dbus \
- http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \
- "
+SRC_URI = "\
+ ${E_CVS};module=e17/libs/e_dbus \
+ http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330;maxdate=20080501 \
+"
S = "${WORKDIR}/e_dbus"
EXTRA_OECONF = "--enable-build-test-gui"
============================================================
--- packages/efl1/epsilon_cvs.bb 06a4ccc0ac1208566731c847fc2ac20246de3ec5
+++ packages/efl1/epsilon_cvs.bb 83ada598b7cf56e16b6d9c1101d88249c5112649
@@ -8,8 +8,6 @@ inherit efl
inherit efl
-SRC_URI += "file://fix_alignment_error.patch;patch=1"
-
# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
EXTRA_OECONF = "--disable-xine"
#
# mt diff -rd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c -r6279441596d7826ca811822cd78f2118f9eb57e2
#
#
#
# add_dir "packages/wwwoffle"
#
# add_dir "packages/wwwoffle/files"
#
# add_file "packages/wwwoffle/files/wwwoffle.if-down"
# content [e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9]
#
# add_file "packages/wwwoffle/files/wwwoffle.if-up"
# content [df3f0c05b29192684fce6d5734a28ca7c6681c66]
#
# add_file "packages/wwwoffle/files/wwwoffle.init"
# content [3648bf9fdc09412336b5bf1671b1d16da01d54e9]
#
# add_file "packages/wwwoffle/wwwoffle_2.9c.bb"
# content [d9fd9a242f353e3916f1d36829b96f70732c14df]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
# from [d714658790b6d290f5220e92a762c59d1755f521]
# to [33d8cc0f8a30277b834a2c1da09fb6ece1d098a5]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-bootcdx86"
# from [ff935bd0c61befdc4d68c43b5c60ef4cb05c4753]
# to [f9ecd99888aa68cb846f0d56cee5bca5371c9d4b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
# from [df65683d9a629e20e3adaf2ca96f9b5e7b77710b]
# to [b45f438b494270a020d8feec2d5110707bde21f1]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-hx2000"
# from [673369cff9f4de86044b4e3e7d0a32f40f7ddb1f]
# to [957a7113b116599f4ae7309f217801c829f7211b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
# from [19043385a06385c41f9d8be31ee1b42171e5d4e5]
# to [c66e00f8061a663ee80edff2c737bc0266f3df43]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemuarm"
# from [5cc1a20209d9bfde5ad851a89437c08c721815c5]
# to [e74d23a59f5aad6fe732ed3b3e3b1a0b16d03ebc]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemux86"
# from [680641c4ecbfa3499fbdd079095535f629587647]
# to [3c92e257aaa1496dfd2123064691c6dd459e62b9]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [1c089b38d34a93c68659ef90bec902bbbcf436ae]
# to [58c5d3463be6ec2d735fef9b44f8c1be7c658075]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
# from [9309f0f56b45754f03ad35209dcb54e4cfb7df83]
# to [8f0bf8a513bad928394f2e4ff80b6284302f6685]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-zylonite"
# from [01f7a0f6b6bb0cbdd5daa28ff680349a8d8cddbb]
# to [d6bbc8912bcc1fc8d6774c5c7211f49f73ebf102]
#
============================================================
--- packages/wwwoffle/files/wwwoffle.if-down e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9
+++ packages/wwwoffle/files/wwwoffle.if-down e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/wwwoffle -offline &
+exit
============================================================
--- packages/wwwoffle/files/wwwoffle.if-up df3f0c05b29192684fce6d5734a28ca7c6681c66
+++ packages/wwwoffle/files/wwwoffle.if-up df3f0c05b29192684fce6d5734a28ca7c6681c66
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# We want to run wwwoffle only for selected interfaces:
+# Maybe better would be checking of the default route.
+case "$IFACE" in
+ wlan*)
+ ;;
+ eth*)
+ ;;
+ usb*)
+ ;;
+ ppp*)
+ ;;
+ *)
+ exit 0
+ ;;
+esac
+
+# wwwoffle caches old network configuration and it may cause resolve failures
+/usr/bin/wwwoffle -kill
+/usr/sbin/wwwoffled >/dev/null 2>&1
+
+/usr/bin/wwwoffle -online
+
+# Don't fetch over ppp*, which is typically expensive dial-up.
+#Â Comment out, if you want to fetch pre-ordered pages over GPRS, dial-up or so.
+case "$IFACE" in
+ ppp*)
+ exit 0
+ ;;
+esac
+
+# Fetch may take longer time. Run it in background
+( /usr/bin/wwwoffle -fetch ) &
+
+exit
============================================================
--- packages/wwwoffle/files/wwwoffle.init 3648bf9fdc09412336b5bf1671b1d16da01d54e9
+++ packages/wwwoffle/files/wwwoffle.init 3648bf9fdc09412336b5bf1671b1d16da01d54e9
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+start)
+ /usr/sbin/wwwoffled
+ ;;
+restart)
+ /usr/bin/wwwoffle -kill
+ /usr/sbin/wwwoffled >/dev/null 2>&1
+ ;;
+reload|force-reload)
+ /usr/bin/wwwoffle -config
+ ;;
+stop)
+ /usr/bin/wwwoffle -kill
+ ;;
+*)
+ echo "Usage: /etc/init.d/wwwoffle {start|stop|restart|reload|force-reload}"
+ exit 1
+esac
+
+exit 0
============================================================
--- packages/wwwoffle/wwwoffle_2.9c.bb d9fd9a242f353e3916f1d36829b96f70732c14df
+++ packages/wwwoffle/wwwoffle_2.9c.bb d9fd9a242f353e3916f1d36829b96f70732c14df
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+PRIORITY = "standard"
+DESCRIPTION = "World Wide Web Offline Explorer"
+DEPENDS = ""
+
+SRC_URI = "http://www.gedanken.demon.co.uk/download-wwwoffle/${PN}-${PV}.tgz \
+ file://wwwoffle.init \
+ file://wwwoffle.if-up \
+ file://wwwoffle.if-down"
+
+INITSCRIPT_NAME = "${PN}"
+
+inherit autotools gettext update-rc.d
+
+EXTRA_OEMAKE = "docdir=${datadir}/doc"
+
+do_configure() {
+ pwd
+ mv aclocal.m4 acinclude.m4
+ autotools_do_configure
+}
+
+do_install_append() {
+ install -d ${D}/${sysconfdir}/network/if-up.d
+ install -m 755 ${WORKDIR}/wwwoffle.if-up ${D}/${sysconfdir}/network/if-up.d/wwwoffle
+ install -d ${D}/${sysconfdir}/network/if-down.d
+ install -m 755 ${WORKDIR}/wwwoffle.if-down ${D}/${sysconfdir}/network/if-down.d/wwwoffle
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/wwwoffle.init ${D}/${sysconfdir}/init.d/wwwoffle
+}
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-akita d714658790b6d290f5220e92a762c59d1755f521
+++ packages/linux/linux-rp-2.6.24/defconfig-akita 33d8cc0f8a30277b834a2c1da09fb6ece1d098a5
@@ -1254,7 +1254,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 ff935bd0c61befdc4d68c43b5c60ef4cb05c4753
+++ packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 f9ecd99888aa68cb846f0d56cee5bca5371c9d4b
@@ -1612,7 +1612,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-c7x0 df65683d9a629e20e3adaf2ca96f9b5e7b77710b
+++ packages/linux/linux-rp-2.6.24/defconfig-c7x0 b45f438b494270a020d8feec2d5110707bde21f1
@@ -1259,7 +1259,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-hx2000 673369cff9f4de86044b4e3e7d0a32f40f7ddb1f
+++ packages/linux/linux-rp-2.6.24/defconfig-hx2000 957a7113b116599f4ae7309f217801c829f7211b
@@ -1249,7 +1249,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-poodle 19043385a06385c41f9d8be31ee1b42171e5d4e5
+++ packages/linux/linux-rp-2.6.24/defconfig-poodle c66e00f8061a663ee80edff2c737bc0266f3df43
@@ -1265,7 +1265,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-qemuarm 5cc1a20209d9bfde5ad851a89437c08c721815c5
+++ packages/linux/linux-rp-2.6.24/defconfig-qemuarm e74d23a59f5aad6fe732ed3b3e3b1a0b16d03ebc
@@ -1155,7 +1155,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-qemux86 680641c4ecbfa3499fbdd079095535f629587647
+++ packages/linux/linux-rp-2.6.24/defconfig-qemux86 3c92e257aaa1496dfd2123064691c6dd459e62b9
@@ -1657,7 +1657,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-spitz 1c089b38d34a93c68659ef90bec902bbbcf436ae
+++ packages/linux/linux-rp-2.6.24/defconfig-spitz 58c5d3463be6ec2d735fef9b44f8c1be7c658075
@@ -1255,7 +1255,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-tosa 9309f0f56b45754f03ad35209dcb54e4cfb7df83
+++ packages/linux/linux-rp-2.6.24/defconfig-tosa 8f0bf8a513bad928394f2e4ff80b6284302f6685
@@ -1274,7 +1274,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-zylonite 01f7a0f6b6bb0cbdd5daa28ff680349a8d8cddbb
+++ packages/linux/linux-rp-2.6.24/defconfig-zylonite d6bbc8912bcc1fc8d6774c5c7211f49f73ebf102
@@ -1257,7 +1257,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
More information about the Openembedded-commits
mailing list