[oe-commits] org.oe.dev merge of '6e4ac932ee4d9b1bde2451c96896ac5c4ae396e1'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Sep 8 10:24:57 UTC 2007
merge of '6e4ac932ee4d9b1bde2451c96896ac5c4ae396e1'
and 'b6d3200d932c1e277015164a4e83ea009d96872f'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e4201f3c5efef702c8a5f6804a394e9e3304e1cc
ViewMTN: http://monotone.openembedded.org/revision/info/e4201f3c5efef702c8a5f6804a394e9e3304e1cc
Files:
1
packages/ezx/opentapi
packages/ezx/opentapi/opentapi.init
packages/ezx/opentapi_svn.bb
packages/tcpdump/tcpdump_3.9.3.bb
packages/tcpdump/tcpdump_3.9.7.bb
classes/base.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/include/motorola-ezx-base.inc
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus_1.0.2.bb
packages/ezx/ezxd_svn.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb
packages/xorg-xserver/xserver-kdrive-common.inc
Diffs:
#
# mt diff -r6e4ac932ee4d9b1bde2451c96896ac5c4ae396e1 -re4201f3c5efef702c8a5f6804a394e9e3304e1cc
#
#
#
# delete "packages/ezx/opentapi"
#
# delete "packages/ezx/opentapi/opentapi.init"
#
# delete "packages/ezx/opentapi_svn.bb"
#
# rename "packages/tcpdump/tcpdump_3.9.3.bb"
# to "packages/tcpdump/tcpdump_3.9.7.bb"
#
# patch "classes/base.bbclass"
# from [c46582cf3af337f4c4c1769a3cc4f456f429f294]
# to [7a3b6633b42df8f8bc1dfd4e57a66773f8d0cde3]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a91d71aa246c9939199aabe9bafe087f0b860a4d]
# to [7952ad133c0859c06c215c8350b98178c9377660]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [bbd7b8e194e0918a04e49cb8ee02f02c74759272]
# to [903227c36f248c1d3d4bfb467933f6a7c740ffe2]
#
# patch "packages/dbus/dbus-1.0.2/dbus-1.init"
# from [bc3a39440ac2899bf95874522964413b2f7b584a]
# to [4dc37cbdcc8bbcdd8432d6104bddd92535f362d1]
#
# patch "packages/dbus/dbus_1.0.2.bb"
# from [3c61bea1f5b14d729a812b56d55a0a6be9b36a38]
# to [a8ce6355ed3da04736b057936a57f1aeed630228]
#
# patch "packages/ezx/ezxd_svn.bb"
# from [0880c77dccd414d74dc2169f07a2b6e4b94e395c]
# to [a08a258ddc81759474347263c79a743e0fff813d]
#
# patch "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
# from [723d1b6c688e08393bf534cca33166bd1a05b210]
# to [de2ca95fee1a9e1a0da365806638041673abed70]
#
# patch "packages/tcpdump/tcpdump_3.9.7.bb"
# from [6155511c925cd01881357a3d5f6729dfd24254fd]
# to [de2e8ad319450b0714e8ca594e5aad8768645f99]
#
============================================================
--- classes/base.bbclass c46582cf3af337f4c4c1769a3cc4f456f429f294
+++ classes/base.bbclass 7a3b6633b42df8f8bc1dfd4e57a66773f8d0cde3
@@ -487,9 +487,9 @@ python base_do_fetch() {
try:
if not base_chk_file(parser, pn, pv,uri, localpath, d):
if type != "file":
- bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
else:
- bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
except Exception:
raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
}
============================================================
--- conf/distro/include/sane-srcrevs.inc a91d71aa246c9939199aabe9bafe087f0b860a4d
+++ conf/distro/include/sane-srcrevs.inc 7952ad133c0859c06c215c8350b98178c9377660
@@ -68,7 +68,6 @@ SRCREV_pn-openmoko-today2-folders="2680"
SRCREV_pn-openmoko-today="2556"
SRCREV_pn-openmoko-today2="2919"
SRCREV_pn-openmoko-today2-folders="2680"
-SRCREV_pn-opentapi="2012"
SRCREV_pn-sphyrna="43"
SRCREV_pn-webkit-gtk="webcore"
SRCREV_pn-xoo="1623"
============================================================
--- conf/machine/include/motorola-ezx-base.inc bbd7b8e194e0918a04e49cb8ee02f02c74759272
+++ conf/machine/include/motorola-ezx-base.inc 903227c36f248c1d3d4bfb467933f6a7c740ffe2
@@ -15,7 +15,7 @@ MACHINE_FEATURES = "kernel26 touchscreen
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
@@ -27,7 +27,7 @@ EXTRA_IMAGEDEPENDS += "ezx-boot-usb-nati
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-# Opentapi needs to be started very early so we need the mux devices in static /dev
+# Ezxd needs to be started very early so we need the mux devices in static /dev
IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
files/device_table-ezx.txt"
============================================================
--- packages/dbus/dbus-1.0.2/dbus-1.init bc3a39440ac2899bf95874522964413b2f7b584a
+++ packages/dbus/dbus-1.0.2/dbus-1.init 4dc37cbdcc8bbcdd8432d6104bddd92535f362d1
@@ -62,7 +62,7 @@ shut_it_down()
shut_it_down()
{
if [ -d $EVENTDIR ]; then
- run-parts --reverse --arg=stop $EVENTDIR
+ run-parts --arg=stop $EVENTDIR
fi
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
============================================================
--- packages/dbus/dbus_1.0.2.bb 3c61bea1f5b14d729a812b56d55a0a6be9b36a38
+++ packages/dbus/dbus_1.0.2.bb a8ce6355ed3da04736b057936a57f1aeed630228
@@ -1,5 +1,5 @@ SRC_URI += " file://fix-waitpid.patch;pa
require dbus.inc
SRC_URI += " file://fix-waitpid.patch;patch=1"
+PR = "r3"
-PR = "r2"
============================================================
--- packages/ezx/ezxd_svn.bb 0880c77dccd414d74dc2169f07a2b6e4b94e395c
+++ packages/ezx/ezxd_svn.bb a08a258ddc81759474347263c79a743e0fff813d
@@ -15,9 +15,6 @@ INITSCRIPT_PARAMS = "start 00 S ."
INITSCRIPT_NAME = "ezxd"
INITSCRIPT_PARAMS = "start 00 S ."
-RREPLACES = "opentapi"
-
-
S = "${WORKDIR}/${PN}"
do_install() {
@@ -26,7 +23,7 @@ do_install() {
install -d ${D}${libdir}/ezxd
install -m 755 *.so ${D}${libdir}/ezxd
-
+
install -d ${D}${sysconfdir}/init.d
install -m 0600 ezxd.conf ${D}${sysconfdir}/
install -m 0755 ${WORKDIR}/ezxd.init ${D}${sysconfdir}/init.d/ezxd
============================================================
--- packages/images/angstrom-minimal-image-with-mtd-utils.bb 723d1b6c688e08393bf534cca33166bd1a05b210
+++ packages/images/angstrom-minimal-image-with-mtd-utils.bb de2ca95fee1a9e1a0da365806638041673abed70
@@ -1,9 +1,9 @@ require angstrom-minimal-image.bb
# this image was created for use with the compulab cm-x270 platform
# for creating a small initramfs image in NOR flash that can be used
# to program the NAND flash.
require angstrom-minimal-image.bb
-RDEPENDS += "mtd-utils"
+IMAGE_INSTALL += "mtd-utils"
export IMAGE_BASENAME = "minimalist-image-mtdutils"
============================================================
--- packages/tcpdump/tcpdump_3.9.3.bb 6155511c925cd01881357a3d5f6729dfd24254fd
+++ packages/tcpdump/tcpdump_3.9.7.bb de2e8ad319450b0714e8ca594e5aad8768645f99
@@ -1,10 +1,9 @@ PRIORITY = "optional"
DESCRIPTION = "A sophisticated network protocol analyzer"
HOMEPAGE = "http://www.tcpdump.org/"
LICENSE = "BSD"
SECTION = "console/network"
PRIORITY = "optional"
-DEPENDS = "libpcap-0.9.3"
-PR = "r2"
+DEPENDS = "libpcap"
SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
file://tcpdump_configure_no_-O2.patch;patch=1"
#
# mt diff -rb6d3200d932c1e277015164a4e83ea009d96872f -re4201f3c5efef702c8a5f6804a394e9e3304e1cc
#
#
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [69820edb24da782a8f84fb3676ee676aa0293a7a]
# to [701a8d99a136183c1057c39066992f41228dd86c]
#
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc 69820edb24da782a8f84fb3676ee676aa0293a7a
+++ packages/xorg-xserver/xserver-kdrive-common.inc 701a8d99a136183c1057c39066992f41228dd86c
@@ -116,7 +116,7 @@ EXTRA_OECONF = "--enable-composite --ena
--disable-xorg --disable-xorgcfg \
--disable-xkb --disable-xnest --disable-xvfb \
--disable-xevie --disable-xprint --disable-xtrap \
- --disable-dmx \
+ --disable-dmx ${W100_OECONF} \
--with-default-font-path=built-ins \
--enable-tslib --enable-xcalibrate \
ac_cv_file__usr_share_X11_sgml_defs_ent=no"
More information about the Openembedded-commits
mailing list