[oe-commits] org.oe.dev merge of '545c0e37f05fb065b7d1cf9794137b60fa5113f7'
utx commit
oe at amethyst.openembedded.net
Sun May 18 21:58:27 UTC 2008
merge of '545c0e37f05fb065b7d1cf9794137b60fa5113f7'
and '7143762e383df9fc9356ff275341deee72ec1a85'
Author: utx at openembedded.org
Branch: org.openembedded.dev
Revision: 5ffcacd9125004bbcb65a5f2d933272d313bee84
ViewMTN: http://monotone.openembedded.org/revision/info/5ffcacd9125004bbcb65a5f2d933272d313bee84
Files:
1
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
contrib/marketing
contrib/marketing/oe-flyer.pdf
contrib/marketing/oe-poster.pdf
classes/image.bbclass
mtn:manual_merge
true
Diffs:
#
# mt diff -r545c0e37f05fb065b7d1cf9794137b60fa5113f7 -r5ffcacd9125004bbcb65a5f2d933272d313bee84
#
#
#
# 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
#
# mt diff -r7143762e383df9fc9356ff275341deee72ec1a85 -r5ffcacd9125004bbcb65a5f2d933272d313bee84
#
#
#
# add_dir "contrib/marketing"
#
# add_file "contrib/marketing/oe-flyer.pdf"
# content [b963e650a847d1f3d4d567e056167985a51efc0d]
#
# add_file "contrib/marketing/oe-poster.pdf"
# content [68a7e59df4fe6e80f6ee801fac05b9add2157de5]
#
# patch "classes/image.bbclass"
# from [e1da20bc3a6143fb41abbfe3d0a7070416bdde17]
# to [4ce2b3c777b457b63352a87b70b325fc84e10644]
#
# set "contrib/marketing/oe-flyer.pdf"
# attr "mtn:manual_merge"
# value "true"
#
# set "contrib/marketing/oe-poster.pdf"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# contrib/marketing/oe-flyer.pdf is binary
============================================================
# contrib/marketing/oe-poster.pdf is binary
============================================================
--- classes/image.bbclass e1da20bc3a6143fb41abbfe3d0a7070416bdde17
+++ classes/image.bbclass 4ce2b3c777b457b63352a87b70b325fc84e10644
@@ -32,6 +32,8 @@ python () {
for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
deps += " %s:do_populate_staging" % dep
bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
+
+ runtime_mapping_rename("PACKAGE_INSTALL", d)
}
#
@@ -66,6 +68,7 @@ do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
+do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock"
do_build[nostamp] = "1"
# Must call real_do_rootfs() from inside here, rather than as a separate
More information about the Openembedded-commits
mailing list