[oe-commits] org.oe.dev merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
john_lee commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 12:46:44 UTC 2008
merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
and '65fbfb9dd8770a45ce93446888e70c955e6b11d1'
Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 6c8738ab25503f1d21271ec5f6abc99991950ace
ViewMTN: http://monotone.openembedded.org/revision/info/6c8738ab25503f1d21271ec5f6abc99991950ace
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.inc
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/tasks/task-openmoko-toolchain-host.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/tasks/task-openmoko-debug.bb
Diffs:
#
# mt diff -r4b30415f5d28ab66598f7324bc7a1a3f91781ed2 -r6c8738ab25503f1d21271ec5f6abc99991950ace
#
#
#
# delete "conf/machine/include/collie-2.6.inc"
#
# delete "conf/machine/include/poodle-2.6.inc"
#
# patch "conf/machine/collie.conf"
# from [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
# to [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
# to [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
#
# patch "conf/machine/include/zaurus-clamshell.inc"
# from [460b6649ab7636b92a7031abd0f2850fcb6700f5]
# to [75189b78d2f98b4b5156904ea7515f88fcd23b77]
#
============================================================
--- conf/machine/collie.conf a0553e914a9461a2f8f27c4cf8972dcebb056d0d
+++ conf/machine/collie.conf 7c673b43c50f37bbb2d12b14434564b0e9613ec3
@@ -6,18 +6,13 @@ MACHINE_KERNEL_VERSION ?= "2.6"
TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-# This is needed for the ramdisk script to work
-MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
IMAGE_LINGUAS = ""
IMAGE_FSTYPES ?= "jffs2 tar.gz"
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
-
-GUI_MACHINE_CLASS_poodle = "smallscreen"
============================================================
--- conf/machine/include/zaurus-2.6.inc 7d4d7255328d5d3f3d61e09ec7b527085533b4d6
+++ conf/machine/include/zaurus-2.6.inc 0baab00ebcdca461a1c5f13d5bcba53c6099622a
@@ -1,8 +1,9 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.inc as well
+# Zaurus specific configuration for kernel 2.6
+# Additionally, clamshell specific stuff in zaurus-clamshell.inc
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS_collie = ""
MACHINE_KERNEL_VERSION = "2.6"
@@ -10,20 +11,15 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian
ERASEBLOCKSIZE_akita = "0x20000"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
-
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
EXTRA_IMAGEDEPENDS += "zaurus-updater"
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.inc
-
SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
PCMCIA_MANAGER ?= "pcmciautils"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
============================================================
--- conf/machine/include/zaurus-clamshell.inc 460b6649ab7636b92a7031abd0f2850fcb6700f5
+++ conf/machine/include/zaurus-clamshell.inc 75189b78d2f98b4b5156904ea7515f88fcd23b77
@@ -1,3 +1,6 @@
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.inc
+
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
#
# mt diff -r65fbfb9dd8770a45ce93446888e70c955e6b11d1 -r6c8738ab25503f1d21271ec5f6abc99991950ace
#
#
#
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
# to "packages/tasks/task-openmoko-toolchain-target.bb"
#
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
# content [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [2f7cb2290c8041be1845553e70a09af8c92e718d]
# to [1243c122ad661be1683a045938d93537f205ce15]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [0f5e441b0fc2a2781297da7b38cb843e8c77f550]
# to [d560814623625b6b57fc9aad038a6e4e6b62f271]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [fd3ecb56d2f926384dc852689d17e18430014b2e]
# to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
# to [76d692ed056a9397df52f5d27a16c97f29b032cd]
#
# patch "packages/meta/meta-toolchain.bb"
# from [b52d096ec913c333f9bb14b192bc922b80854834]
# to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
#
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
# from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
# to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
# to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
#
# patch "packages/tasks/task-openmoko-debug.bb"
# from [6f16b58858e9a8858a34530bccc7db757e1303ab]
# to [7f29d58704ca954c5e6e5ff766840cc0cff0eb5e]
#
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
# from [4526d09a7c1a87ae65eac1a78599062dad98e280]
# to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
#
============================================================
--- packages/tasks/task-openmoko-toolchain-host.bb b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
+++ packages/tasks/task-openmoko-toolchain-host.bb b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
@@ -0,0 +1,26 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+ openmoko-sample2-src \
+"
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+ openmoko-sample2-src \
+"
============================================================
--- conf/distro/include/moko-autorev.inc 2f7cb2290c8041be1845553e70a09af8c92e718d
+++ conf/distro/include/moko-autorev.inc 1243c122ad661be1683a045938d93537f205ce15
@@ -39,6 +39,7 @@ SRCREV_pn-openmoko-today2-folders ?= "${
SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 0f5e441b0fc2a2781297da7b38cb843e8c77f550
+++ conf/distro/include/sane-srcrevs.inc d560814623625b6b57fc9aad038a6e4e6b62f271
@@ -113,6 +113,7 @@ SRCREV_pn-openmoko-today2-folders ?= "34
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3609"
SRCREV_pn-openmoko-today2-folders ?= "3414"
+SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb fd3ecb56d2f926384dc852689d17e18430014b2e
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 9ec0920876981474a325a47766fa7d50bbb1cfd3
@@ -8,7 +8,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
# Avoid circular dependencies from package_ipk.bbclass
PACKAGES = ""
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
-INSTALL += "ipkg-list-fields arfile.py"
+INSTALL += "arfile.py"
do_stage() {
for i in ${INSTALL}; do
============================================================
--- packages/meta/meta-toolchain-openmoko.bb 2c36f31834b317cfdc81cff2dc8cd7db05229bcf
+++ packages/meta/meta-toolchain-openmoko.bb 76d692ed056a9397df52f5d27a16c97f29b032cd
@@ -1,5 +1,7 @@
-TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+PR = "r1"
-require meta-toolchain.bb
+TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
+TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
+require meta-toolchain.bb
SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain.bb b52d096ec913c333f9bb14b192bc922b80854834
+++ packages/meta/meta-toolchain.bb d53849cfd4dc2f21fcd44b4cc0926382313fc1e9
@@ -1,7 +1,7 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r1"
+PR = "r2"
inherit sdk meta
@@ -75,10 +75,17 @@ do_populate_sdk() {
for arch in $revipkgarchs; do
pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
if [ -e $pkgnames ]; then
- echo "Found $pkgnames"
+ oenote "Found $pkgnames"
cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
- pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+ pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+ for aarch in $revipkgarchs; do
+ if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
+ pkg_subdir="${aarch}${pkg_subdir_postfix}"
+ break
+ fi
+ done
+ oenote "Original package in ${pkg_subdir}"
mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
============================================================
--- packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d
+++ packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb d90b9e48b2570a1906b72dcb19d0a8764fe6c23b
@@ -1,15 +1,14 @@ DESCRIPTION = "Convenient scripts to be
DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PACKAGE_ARCH = "all"
+PR = "r1"
SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
-SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
-SRCREV="3630"
+S = "${WORKDIR}/toolkit"
+
FILES_${PN} = "/"
do_install () {
- (find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true
- install -m 755 -d ${D}/share
- cp -dr ${WORKDIR}/toolkit/* ${D}
- cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share
+ cp -dr ${S}/* ${D}
+ find ${D} -name ".svn" | xargs rm -rf
+ rm -r ${D}/patches
}
============================================================
--- packages/openmoko2/openmoko-sample2_svn.bb f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971
+++ packages/openmoko2/openmoko-sample2_svn.bb 90b2cf8a49d86bb43022f62052a46f47d57edcee
@@ -9,7 +9,7 @@ FILES_${PN}-src = "/usr/local/openmoko"
PACKAGES += "${PN}-src"
# path should match the toolchain path
FILES_${PN}-src = "/usr/local/openmoko"
-PACKAGE_ARCH_${PN}-src = "all"
+PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
do_configure_prepend() {
install -d ${WORKDIR}/source
============================================================
--- packages/tasks/task-openmoko-debug.bb 6f16b58858e9a8858a34530bccc7db757e1303ab
+++ packages/tasks/task-openmoko-debug.bb 7f29d58704ca954c5e6e5ff766840cc0cff0eb5e
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Debugging and Benchmarking Tools"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r58"
+PR = "r59"
inherit task
@@ -15,6 +15,7 @@ RDEPENDS_task-openmoko-debug = "\
cu \
dbench \
fbgrab \
+ fbset \
fstests \
gdb \
gdbserver \
============================================================
--- packages/tasks/task-toolchain-openmoko-sdk.bb 4526d09a7c1a87ae65eac1a78599062dad98e280
+++ packages/tasks/task-openmoko-toolchain-target.bb 28005de19ec998c9abe5e7d383d158bf18bbfc14
@@ -26,6 +26,5 @@ RDEPENDS_${PN} = "\
libmokoui2-dev \
libmokopanelui2-dev \
libmokojournal2-dev \
- openmoko-sample2-src \
openmoko-toolchain-scripts \
"
More information about the Openembedded-commits
mailing list