[oe-commits] org.oe.dev merge of '110c6ec488c63036fe1cb9a1e304bfb935b57bca'
ifaistos commit
openembedded-commits at lists.openembedded.org
Wed Sep 5 17:31:34 UTC 2007
merge of '110c6ec488c63036fe1cb9a1e304bfb935b57bca'
and '60181dbea7f819472034ab00db51dac31fd65723'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 4ce520c97b90a6c5f2c5faacee3eab83b4513c92
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ce520c97b90a6c5f2c5faacee3eab83b4513c92
Files:
1
conf/distro/openmoko.conf
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/tasks/task-openmoko.bb
packages/uboot/uboot-openmoko_svn.bb
classes/base.bbclass
classes/image.bbclass
conf/bitbake.conf
packages/linux/linux-rp-2.6.22/defconfig-akita
packages/linux/linux-rp-2.6.22/defconfig-c7x0
packages/linux/linux-rp_2.6.22.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:
#
# mt diff -r110c6ec488c63036fe1cb9a1e304bfb935b57bca -r4ce520c97b90a6c5f2c5faacee3eab83b4513c92
#
#
#
# patch "conf/distro/openmoko.conf"
# from [e0c801f07369b559ca30a4b14350a95774ebaedd]
# to [8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [d755c69ff62f959cd61f30c99b68d783420b3606]
# to [473fde484283e9e9ecdc176e1bda70a0d3f7fc9f]
#
# patch "packages/tasks/task-openmoko.bb"
# from [8f483a0572038a79f60bddab9863f323e93bbef2]
# to [0c2dfe8b69490ce7bd6d86af3f88cff0d0439864]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [e2be2c8abbfa2f529e0ca0879acb4195c4db28ac]
# to [a9daac10326cc7c8c5b0dfea1c25a605b5855bc9]
#
============================================================
--- conf/distro/openmoko.conf e0c801f07369b559ca30a4b14350a95774ebaedd
+++ conf/distro/openmoko.conf 8a793c4c4e8b4bf9d2e7b7b95829905e94482cf1
@@ -11,7 +11,7 @@ DISTRO_NAME = "OpenMoko"
#
DISTRO = "openmoko"
DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session d755c69ff62f959cd61f30c99b68d783420b3606
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session 473fde484283e9e9ecdc176e1bda70a0d3f7fc9f
@@ -8,7 +8,7 @@ matchbox-window-manager -use_titlebar ye
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
-matchbox-panel-2 --start-applets startup \
+matchbox-panel-2 --start-applets systray,startup \
--end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
exec neod
============================================================
--- packages/tasks/task-openmoko.bb 8f483a0572038a79f60bddab9863f323e93bbef2
+++ packages/tasks/task-openmoko.bb 0c2dfe8b69490ce7bd6d86af3f88cff0d0439864
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r60"
+PR = "r61"
inherit task
@@ -98,6 +98,7 @@ RDEPENDS_task-openmoko-base = "\
# openmoko-appmanager \
matchbox-keyboard-inputmethod \
matchbox-keyboard-im \
+ matchbox-keyboard-applet \
matchbox-stroke \
openmoko-terminal2 \
openmoko-keyboard \
============================================================
--- packages/uboot/uboot-openmoko_svn.bb e2be2c8abbfa2f529e0ca0879acb4195c4db28ac
+++ packages/uboot/uboot-openmoko_svn.bb a9daac10326cc7c8c5b0dfea1c25a605b5855bc9
@@ -1,19 +1,21 @@ PROVIDES = "virtual/bootloader"
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
PROVIDES = "virtual/bootloader"
-PV = "1.2.0+git${SRCDATE}+svn${SRCDATE}"
+PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
PR = "r0"
+SRCREV_FORMAT = "patches"
+
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "\
- git://www.denx.de/git/u-boot.git/;protocol=git \
- svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
+ git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
#
# mt diff -r60181dbea7f819472034ab00db51dac31fd65723 -r4ce520c97b90a6c5f2c5faacee3eab83b4513c92
#
#
#
# patch "classes/base.bbclass"
# from [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
# to [c46582cf3af337f4c4c1769a3cc4f456f429f294]
#
# patch "classes/image.bbclass"
# from [95a9259837f0da14059da200343397588b5b677f]
# to [469ee07830a49ad3c97a67804413039b7e82c1a0]
#
# patch "conf/bitbake.conf"
# from [27f28821d89de0f8fab490644ac698eedc27f811]
# to [2dc9ee975a901881a1c927dc7a1e682c4dd7246b]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-akita"
# from [3b4350d48675e15178efe1715de3f38002b7129d]
# to [37ddad6b88ba793e3b10c7e3e24a9d2ba7d92edd]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-c7x0"
# from [74a3fb8e2f5401c826fb60ca0018e4347559ebf6]
# to [0642b05daa34a16f12836bbb237cdb00105bcbd6]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [dc29be19e8eaf4db51405bb3511a5ad4248ee05b]
# to [282e8a8c96f9e04c16468fe3d53ee1935bcabcd6]
#
# patch "packages/openmoko2/openmoko-common2_svn.bb"
# from [13898cb7774ae7a674521a58eb62b930b1aef045]
# to [2b1fc081aed526f2c6bb9e9e643576153e9b7a10]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [693ce6e2621655052632c3ddfdd9427c170673b8]
# to [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
#
============================================================
--- classes/base.bbclass d0d8cdb0b25aaa62b66b99e71e401912b449c593
+++ classes/base.bbclass c46582cf3af337f4c4c1769a3cc4f456f429f294
@@ -375,10 +375,7 @@ oe_machinstall() {
}
# Remove and re-create ${D} so that is it guaranteed to be empty
-do_install_prepend() {
- rm -rf ${D}
- mkdir -p ${D}
-}
+do_install[cleandirs] = "${D}"
addtask listtasks
do_listtasks[nostamp] = "1"
============================================================
--- classes/image.bbclass 95a9259837f0da14059da200343397588b5b677f
+++ classes/image.bbclass 469ee07830a49ad3c97a67804413039b7e82c1a0
@@ -1,10 +1,10 @@ RDEPENDS += "${IMAGE_INSTALL}"
inherit rootfs_${IMAGE_PKGTYPE}
LICENSE = "MIT"
PACKAGES = ""
RDEPENDS += "${IMAGE_INSTALL}"
-export IMAGE_BASENAME ?= "${PN}"
+IMAGE_BASENAME[export] = "1"
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
# We need to recursively follow RDEPENDS and RRECOMMENDS for images
============================================================
--- conf/bitbake.conf 27f28821d89de0f8fab490644ac698eedc27f811
+++ conf/bitbake.conf 2dc9ee975a901881a1c927dc7a1e682c4dd7246b
@@ -157,6 +157,7 @@ GITDIR = "${DL_DIR}/git"
CVSDIR = "${DL_DIR}/cvs"
SVNDIR = "${DL_DIR}/svn"
GITDIR = "${DL_DIR}/git"
+BZRDIR = "${DL_DIR}/bzr"
STAMP = "${TMPDIR}/stamps/${PF}"
WORKDIR = "${TMPDIR}/work/${PF}"
@@ -203,7 +204,7 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
##################################################################
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-IMAGE_BASENAME = "rootfs"
+IMAGE_BASENAME = "${PN}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
IMAGE_CMD = ""
@@ -372,6 +373,7 @@ FETCHCMD_wget = "/usr/bin/env wget -t 5"
FETCHCMD_svn = "/usr/bin/env svn"
FETCHCMD_cvs = "/usr/bin/env cvs"
FETCHCMD_wget = "/usr/bin/env wget -t 5"
+FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
============================================================
--- packages/linux/linux-rp-2.6.22/defconfig-akita 3b4350d48675e15178efe1715de3f38002b7129d
+++ packages/linux/linux-rp-2.6.22/defconfig-akita 37ddad6b88ba793e3b10c7e3e24a9d2ba7d92edd
@@ -743,6 +743,7 @@ CONFIG_NET_RADIO=y
#
# Wireless 802.11b ISA/PCI cards support
#
+CONFIG_WLAN_80211=y
CONFIG_HERMES=m
# CONFIG_ATMEL is not set
============================================================
--- packages/linux/linux-rp-2.6.22/defconfig-c7x0 74a3fb8e2f5401c826fb60ca0018e4347559ebf6
+++ packages/linux/linux-rp-2.6.22/defconfig-c7x0 0642b05daa34a16f12836bbb237cdb00105bcbd6
@@ -757,6 +757,7 @@ CONFIG_NET_RADIO=y
#
# Wireless 802.11b ISA/PCI cards support
#
+CONFIG_WLAN_80211=y
CONFIG_HERMES=m
# CONFIG_ATMEL is not set
@@ -772,7 +773,6 @@ CONFIG_HOSTAP_CS=m
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_CS=m
-CONFIG_NET_WIRELESS=y
#
# PCMCIA network device support
============================================================
--- packages/linux/linux-rp_2.6.22.bb dc29be19e8eaf4db51405bb3511a5ad4248ee05b
+++ packages/linux/linux-rp_2.6.22.bb 282e8a8c96f9e04c16468fe3d53ee1935bcabcd6
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r8"
+PR = "r9"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb 13898cb7774ae7a674521a58eb62b930b1aef045
+++ packages/openmoko2/openmoko-common2_svn.bb 2b1fc081aed526f2c6bb9e9e643576153e9b7a10
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
DESCRIPTION = "Common files for the OpenMoko distribution"
SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
PR = "r3"
inherit openmoko2
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 693ce6e2621655052632c3ddfdd9427c170673b8
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb e8a1f377f5a46ff991e1c83c538827b48f5f3229
@@ -7,7 +7,7 @@ PE = "1"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r1"
+PR = "r2"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -21,6 +21,5 @@ S = "${WORKDIR}/xorg-server-${PV}"
S = "${WORKDIR}/xorg-server-${PV}"
-IMAGEON_OECONF = "--disable-imageon"
-IMAGEON_OECONF_arm = "--enable-imageon"
+EXTRA_OECONF += "--enable-imageon"
More information about the Openembedded-commits
mailing list