[oe-commits] org.oe.dev merge of '56704f7503bb0227cf679daac7659f9d259379ee'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Feb 17 14:51:56 UTC 2008
merge of '56704f7503bb0227cf679daac7659f9d259379ee'
and '6bbae187bae4f40bad7b2577220dde3fded1edc1'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 162eb3f390155eebfba9358f72a893b1ff627cc2
ViewMTN: http://monotone.openembedded.org/revision/info/162eb3f390155eebfba9358f72a893b1ff627cc2
Files:
1
packages/initrdscripts/initramfs-image-ipk_1.0.bb
packages/python/python-efl-examples.bb
packages/tasks/task-python-efl-examples.bb
packages/python/python-efl.bb
packages/tasks/task-python-efl.bb
packages/at76c503a/at76c503a-modules_0.17.bb
classes/image.bbclass
classes/kernel.bbclass
conf/distro/include/sane-srcdates.inc
conf/machine/h5000.conf
packages/anki/anki_0.4.3.bb
packages/busybox/busybox-1.9.1/adduser-longops.patch
packages/gcc/gcc_4.2.2.bb
packages/lighttpd/lighttpd/src-server.c.patch
packages/python/python-ecore_cvs.bb
packages/python/python-edbus_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/tasks/task-openmoko-python-devel.bb
Diffs:
#
# mt diff -r56704f7503bb0227cf679daac7659f9d259379ee -r162eb3f390155eebfba9358f72a893b1ff627cc2
#
#
#
# delete "packages/initrdscripts/initramfs-image-ipk_1.0.bb"
#
#
# mt diff -r6bbae187bae4f40bad7b2577220dde3fded1edc1 -r162eb3f390155eebfba9358f72a893b1ff627cc2
#
#
#
# rename "packages/python/python-efl-examples.bb"
# to "packages/tasks/task-python-efl-examples.bb"
#
# rename "packages/python/python-efl.bb"
# to "packages/tasks/task-python-efl.bb"
#
# add_file "packages/at76c503a/at76c503a-modules_0.17.bb"
# content [684ad95a1c7f9fb930a8aea5710d5f65a2f4e887]
#
# patch "classes/image.bbclass"
# from [73120c465f8175c72d4001b3985cab785ee72ced]
# to [3ee271e04e5f55aafbefcc98d3e2d4a69568301f]
#
# patch "classes/kernel.bbclass"
# from [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
# to [3aa638c9a8de8e90342e08b530a40c8c2f120497]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# to [e417185fe87a77364d7d662829af7d8b658df96e]
#
# patch "conf/machine/h5000.conf"
# from [b0fe52891e392a5d43162145964546c7517d27e4]
# to [3ea37b416dd8fc0749b3f3ea3c6e59cf6fe06138]
#
# patch "packages/anki/anki_0.4.3.bb"
# from [9835acc146314e91072d7098eeda6a3a4f40d543]
# to [31ac492693b17db388f5871371697d2f5bc0b838]
#
# patch "packages/busybox/busybox-1.9.1/adduser-longops.patch"
# from [661b2538eda36e581314cde361bb3efe6411959b]
# to [3737526f742ab3a8325c20ac9e35f2f74f1b10bf]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [b649640ada6aa7b3be9155792213ea7689d6e6ac]
# to [e3cc18f11ea8954870f79c7a095814c2a298871d]
#
# patch "packages/lighttpd/lighttpd/src-server.c.patch"
# from [ff0cc797c5884c967e00ae132428f5aa6f206750]
# to [8b4f719a20587a5a8efb400bdb383aeb6cd6166f]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
# to [b6e5ba00d6b809a3e441d6dc27d125164f78dacb]
#
# patch "packages/python/python-edbus_cvs.bb"
# from [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
# to [d5e8bad1f13826a22bcd975f9899d3048049d345]
#
# patch "packages/python/python-edje_cvs.bb"
# from [18a2503cde02ed33e4f15943318b8dfc8cfcfca3]
# to [46da9e504d792e8cd17a35cec8ebeea2f9a49c58]
#
# patch "packages/python/python-efl.inc"
# from [c89446d67552d9bb92644bcef06879c238785740]
# to [7a1e1c981a4d514c24d0cf695b0c335614b36bbb]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [45709d87daaee3ee043e8c8536f35bb73b68f5ca]
# to [9fc029007ba460e19b900588f14fada95732512a]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [3aa59441db25ec4ff0a8fae0e15f87935ad266f7]
# to [ba4915bb31b83045d2be815f9b219c081c2701e1]
#
# patch "packages/python/python-evas_cvs.bb"
# from [8d47b306dcfe4ce206dd3e6188ebc30c94c155b7]
# to [004f170367e06ca113e955f686f51ce112ce9368]
#
# patch "packages/tasks/task-openmoko-python-devel.bb"
# from [cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3]
# to [561fb2c52bfab563c0929cbc0c48393897743b6b]
#
============================================================
--- packages/at76c503a/at76c503a-modules_0.17.bb 684ad95a1c7f9fb930a8aea5710d5f65a2f4e887
+++ packages/at76c503a/at76c503a-modules_0.17.bb 684ad95a1c7f9fb930a8aea5710d5f65a2f4e887
@@ -0,0 +1,19 @@
+SECTION = "base"
+LICENSE = "GPL"
+
+SRCDATE = "20080116"
+
+SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz"
+S = "${WORKDIR}/at76_usb-${PV}/"
+
+inherit module
+
+MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \
+ at76c505-rfmd at76c503-i3863 at76c505-rfmd2958"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+ for i in *${KERNEL_OBJECT_SUFFIX}; do
+ install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+ done
+}
============================================================
--- classes/image.bbclass 73120c465f8175c72d4001b3985cab785ee72ced
+++ classes/image.bbclass 3ee271e04e5f55aafbefcc98d3e2d4a69568301f
@@ -35,9 +35,9 @@ python () {
}
#
-# Get a list of files containing device tables to create.
+# Get a list of files containing tables of devices to be created.
# * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table file
-# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, seached
+# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, searched
# for in the BBPATH
# If neither are specified then the default name of files/device_table-minimal.txt
# is searched for in the BBPATH (same as the old version.)
============================================================
--- classes/kernel.bbclass 6eb314eeb40f044c37be9df698f02b9c149aa6f8
+++ classes/kernel.bbclass 3aa638c9a8de8e90342e08b530a40c8c2f120497
@@ -65,21 +65,21 @@ kernel_do_compile() {
fi
}
+INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
+INITRAMFS_IMAGE_TARGET ?= "initramfs-image"
+
do_builtin_initramfs() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz
+ cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
install -d ${DEPLOY_DIR_IMAGE}
- mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin
- install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+ install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin
# Make sure to kill injected initramfs, in case someone will do "-c compile -f"
rm usr/initramfs_data.cpio.gz
-
- [ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO}
}
addtask builtin_initramfs after do_compile
-# As it accepts external parameter(s), better make it unstamped
do_builtin_initramfs[nostamp] = "1"
+do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs"
kernel_do_stage() {
ASMDIR=`readlink include/asm`
============================================================
--- conf/distro/include/sane-srcdates.inc 458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
+++ conf/distro/include/sane-srcdates.inc e417185fe87a77364d7d662829af7d8b658df96e
@@ -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 = "20080129"
+EFL_SRCDATE = "20080216"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/machine/h5000.conf b0fe52891e392a5d43162145964546c7517d27e4
+++ conf/machine/h5000.conf 3ea37b416dd8fc0749b3f3ea3c6e59cf6fe06138
@@ -24,12 +24,15 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ;
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+# Ship complete set of modules ('kernel-modules') for easier debug purposes
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules \
+ kernel-module-h5400-lcd \
kernel-module-h5400-battery \
kernel-module-h5400-bt \
kernel-module-snd-soc-h5000 \
- kernel-module-i2c-pxa"
+ kernel-module-i2c-pxa \
+ at76c503a-modules"
#
# Modules autoload and other boot properties
============================================================
--- packages/anki/anki_0.4.3.bb 9835acc146314e91072d7098eeda6a3a4f40d543
+++ packages/anki/anki_0.4.3.bb 31ac492693b17db388f5871371697d2f5bc0b838
@@ -1,9 +1,9 @@ RDEPENDS += "libanki"
require anki.inc
RDEPENDS += "libanki"
-PR = "r0"
+PR = "r1"
-#export PV="${PV}"
+export PV := "${PV}"
SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1"
S = "${WORKDIR}/anki-${PV}"
============================================================
--- packages/busybox/busybox-1.9.1/adduser-longops.patch 661b2538eda36e581314cde361bb3efe6411959b
+++ packages/busybox/busybox-1.9.1/adduser-longops.patch 3737526f742ab3a8325c20ac9e35f2f74f1b10bf
@@ -1,3 +1,7 @@
+upstream: http://bugs.busybox.net/view.php?id=2134
+status: accepted in rev. 21031 on Feb 15 2008
+comment: fixes OE bug 3781, applied by mickeyl
+
diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in
--- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008
+++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008
============================================================
--- packages/gcc/gcc_4.2.2.bb b649640ada6aa7b3be9155792213ea7689d6e6ac
+++ packages/gcc/gcc_4.2.2.bb e3cc18f11ea8954870f79c7a095814c2a298871d
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
+ file://801-arm-bigendian-eabi.patch;patch=1 \
file://904-flatten-switch-stmt-00.patch;patch=1 \
file://arm-nolibfloat.patch;patch=1 \
file://arm-softfloat.patch;patch=1 \
============================================================
--- packages/lighttpd/lighttpd/src-server.c.patch ff0cc797c5884c967e00ae132428f5aa6f206750
+++ packages/lighttpd/lighttpd/src-server.c.patch 8b4f719a20587a5a8efb400bdb383aeb6cd6166f
@@ -1,3 +1,6 @@
+upstream: http://trac.lighttpd.net/trac/ticket/1402
+status: pending
+
--- lighttpd/src/server.c.orig 2006-03-04 09:12:17.000000000 -0800
+++ lighttpd/src/server.c 2006-07-11 09:16:28.000000000 -0700
@@ -1174,8 +1174,8 @@
============================================================
--- packages/python/python-ecore_cvs.bb 295246b44c66e0eec08f9eaa1d8d53026cfaaf09
+++ packages/python/python-ecore_cvs.bb b6e5ba00d6b809a3e441d6dc27d125164f78dacb
@@ -1,6 +1,7 @@ require python-efl.inc
require python-efl.inc
-DEPENDS += "ecore"
-PR = "r5"
+DEPENDS += "python-evas ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
do_stage() {
distutils_stage_all
============================================================
--- packages/python/python-edbus_cvs.bb b9e9b38cb16c01ec8101aa260e4284de97c19c1e
+++ packages/python/python-edbus_cvs.bb d5e8bad1f13826a22bcd975f9899d3048049d345
@@ -1,8 +1,8 @@ DEPENDS += "edbus python-dbus"
require python-efl.inc
DEPENDS += "edbus python-dbus"
+PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r3"
-
SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
S = "${WORKDIR}/python-e_dbus"
============================================================
--- packages/python/python-edje_cvs.bb 18a2503cde02ed33e4f15943318b8dfc8cfcfca3
+++ packages/python/python-edje_cvs.bb 46da9e504d792e8cd17a35cec8ebeea2f9a49c58
@@ -1,4 +1,5 @@ DEPENDS += "edje python-evas"
require python-efl.inc
DEPENDS += "edje python-evas"
-PR = "r5"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
============================================================
--- packages/python/python-efl.inc c89446d67552d9bb92644bcef06879c238785740
+++ packages/python/python-efl.inc 7a1e1c981a4d514c24d0cf695b0c335614b36bbb
@@ -6,7 +6,6 @@ RDEPENDS += "python-lang"
# does not compile unless pyrex has been built
DEPENDS = "python-cython-native python-pyrex-native python-numeric"
RDEPENDS += "python-lang"
-PV = "0.1.1+cvs${SRCDATE}"
inherit setuptools
============================================================
--- packages/python/python-emotion_cvs.bb 45709d87daaee3ee043e8c8536f35bb73b68f5ca
+++ packages/python/python-emotion_cvs.bb 9fc029007ba460e19b900588f14fada95732512a
@@ -1,3 +1,4 @@ DEPENDS += "emotion python-evas"
require python-efl.inc
DEPENDS += "emotion python-evas"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-epsilon_cvs.bb 3aa59441db25ec4ff0a8fae0e15f87935ad266f7
+++ packages/python/python-epsilon_cvs.bb ba4915bb31b83045d2be815f9b219c081c2701e1
@@ -1,3 +1,4 @@ DEPENDS += "epsilon python-ecore"
require python-efl.inc
DEPENDS += "epsilon python-ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-evas_cvs.bb 8d47b306dcfe4ce206dd3e6188ebc30c94c155b7
+++ packages/python/python-evas_cvs.bb 004f170367e06ca113e955f686f51ce112ce9368
@@ -1,6 +1,7 @@ DEPENDS += "evas"
require python-efl.inc
DEPENDS += "evas"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
do_stage() {
distutils_stage_all
============================================================
--- packages/tasks/task-openmoko-python-devel.bb cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3
+++ packages/tasks/task-openmoko-python-devel.bb 561fb2c52bfab563c0929cbc0c48393897743b6b
@@ -1,12 +1,12 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Python Development Tools"
SECTION = "openmoko/devel"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
inherit task
RDEPENDS_task-openmoko-python-devel = "\
- python-efl \
+ task-python-efl \
python-pygtk \
python-lightmediascanner \
"
More information about the Openembedded-commits
mailing list