[oe-commits] org.oe.dev merge of '7247d50baa3969c4328d37f4c560e6b56963636c'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jul 5 02:59:01 UTC 2007
merge of '7247d50baa3969c4328d37f4c560e6b56963636c'
and 'c1258545caf65ca7330dc5d776336c46135d7d52'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f2bd31f1aaf84bef9625b425a458bc019b97a434
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f2bd31f1aaf84bef9625b425a458bc019b97a434
Files:
1
packages/bluez/bluez-dtl1-workaround_1.0.bb
packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
classes/kernel.bbclass
conf/machine/h2200.conf
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.4.bb
packages/bluez/bluez-utils_3.7.bb
packages/bluez/bluez-utils_3.8.bb
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
packages/linux/linux/sarge-at91
conf/machine/include/motorola-ezx-base.inc
conf/machine/sarge-at91.conf
packages/atk/atk_1.19.3.bb
packages/kazehakase/kazehakase_cvs.bb
packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
packages/linux/linux/sarge-at91/defconfig
packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch
packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch
packages/slugos-init/files/boot/kexec
packages/uboot/u-boot-1.1.6/sarge-uboot.patch
packages/uclibc/files/errno_values.h.patch
packages/uclibc/files/termios.h.patch
packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
classes/sanity.bbclass
classes/sdk.bbclass
conf/distro/angstrom-2007.1-legacy.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/sane-srcdates.inc
conf/distro/sharprom-compatible.conf
conf/machine/a1200.conf
conf/machine/a780.conf
conf/machine/e680.conf
conf/machine/htcwallaby.conf
conf/machine/rokr-e2.conf
packages/0xFFFF/0xffff-native_0.2.bb
packages/0xFFFF/0xffff.inc
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-fsg3.h
packages/gpephone/xoo-vm_0.7-20070204.bb
packages/gtkmm/gtkmm.inc
packages/kazehakase/kazehakase_0.4.5.bb
packages/kazehakase/kazehakase_0.4.7.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux.inc
packages/linux/linux_2.6.21.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk.bb
packages/modutils/modutils-cross_2.4.27.bb
packages/modutils/modutils_2.4.27.bb
packages/php/php_5.1.4.bb
packages/php/php_5.2.0.bb
packages/qemu/qemu-native.inc
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-slugos.bb
packages/uboot/u-boot_1.1.6.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
Diffs:
#
# mt diff -r7247d50baa3969c4328d37f4c560e6b56963636c -rf2bd31f1aaf84bef9625b425a458bc019b97a434
#
#
#
# add_file "packages/bluez/bluez-dtl1-workaround_1.0.bb"
# content [4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f]
#
# add_file "packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb"
# content [97dfedad01f8662328b1032c806286a00f75caa0]
#
# patch "classes/kernel.bbclass"
# from [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# to [ee5ce321b13cfb7f7f7a9981e5fc1c14e4f65e81]
#
# patch "conf/machine/h2200.conf"
# from [06be039ceb7fc91de15ca6a3389483ee6372798f]
# to [ff1f7205bab8be68726927066f32d2c9dbc19f32]
#
# patch "packages/bluez/bluez-utils.inc"
# from [41deef17c0f5dace32506f5702ea35539c41bff6]
# to [13716750ab0571681b9e8449ea1ce394c881897e]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10]
# to [0b6adc1cba101361b308c4adcb33d6ec603c6be6]
#
# patch "packages/bluez/bluez-utils_3.12.bb"
# from [c9a40ce5190424b1ede28c8cc855bb8d094a3186]
# to [bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458]
#
# patch "packages/bluez/bluez-utils_3.4.bb"
# from [6e23c5824e702fbbaab762244716ebfd9bcdcc4b]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/bluez/bluez-utils_3.7.bb"
# from [7644ffe67fd0cf94cfed472498a4263e024d4de3]
# to [997459c635cbd92f7c2b398e5962dd23bf5c9623]
#
# patch "packages/bluez/bluez-utils_3.8.bb"
# from [dd085c7f50957785f015790ff90f72a6eab37cf1]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/udev/udev_092.bb"
# from [9c280c1d2cc7237d3dd3cc93dd6a6861334b7786]
# to [3b1cae0e753955c3ad4b534712c7f13582d9a938]
#
# patch "packages/udev/udev_097.bb"
# from [8d341ef0c55e6945df0f9050797bba9644b6d15b]
# to [1944d7e0e7e54cc38dcca0c59c66c7080828011f]
#
# patch "packages/udev/udev_100.bb"
# from [cf318dbe137533d51d411b1f6361520cd7e366a3]
# to [3a32c3de3de21597a8c1984dbf4e9892cafda3b0]
#
============================================================
--- packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
+++ packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
@@ -0,0 +1,17 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb 97dfedad01f8662328b1032c806286a00f75caa0
+++ packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb 97dfedad01f8662328b1032c806286a00f75caa0
@@ -0,0 +1,12 @@
+DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
+card one sweet day."
+PR = "r1"
+
+SRC_URI = " file://50-hostap_cs.rules "
+
+do_install() {
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
+PACKAGE_ARCH = "all"
============================================================
--- classes/kernel.bbclass b3df4a5e97f27bbbdeedf06373b1f8a115c48333
+++ classes/kernel.bbclass ee5ce321b13cfb7f7f7a9981e5fc1c14e4f65e81
@@ -183,6 +183,10 @@ ALLOW_EMPTY_kernel-image = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
+# Userspace workarounds for kernel modules issues
+# This is shame, fix the kernel instead!
+RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
============================================================
--- conf/machine/h2200.conf 06be039ceb7fc91de15ca6a3389483ee6372798f
+++ conf/machine/h2200.conf ff1f7205bab8be68726927066f32d2c9dbc19f32
@@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
============================================================
--- packages/bluez/bluez-utils.inc 41deef17c0f5dace32506f5702ea35539c41bff6
+++ packages/bluez/bluez-utils.inc 13716750ab0571681b9e8449ea1ce394c881897e
@@ -10,7 +10,6 @@ SRC_URI = "http://bluez.sourceforge.net/
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1 \
file://handle-eintr.patch;patch=1;status=applied"
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
}
============================================================
--- packages/bluez/bluez-utils_3.11.bb 4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10
+++ packages/bluez/bluez-utils_3.11.bb 0b6adc1cba101361b308c4adcb33d6ec603c6be6
@@ -6,9 +6,8 @@ SRC_URI = "http://bluez.sourceforge.net/
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -84,9 +83,6 @@ FILES_${PN} = " \
${base_sbindir}/hciattach \
"
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
-FILES_${PN} += "${sysconfdir}/apm/"
-
FILES_${PN}-dbg += " \
${libdir}/bluetooth/.debug \
"
============================================================
--- packages/bluez/bluez-utils_3.12.bb c9a40ce5190424b1ede28c8cc855bb8d094a3186
+++ packages/bluez/bluez-utils_3.12.bb bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458
@@ -1,12 +1,11 @@ SRC_URI = "http://bluez.sourceforge.net/
require bluez-utils.inc
DEPENDS += "glib-2.0"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -82,9 +81,6 @@ FILES_${PN} = " \
${base_sbindir}/hciattach \
"
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
-FILES_${PN} += "${sysconfdir}/apm/"
-
FILES_${PN}-dbg += " \
${libdir}/bluetooth/.debug \
"
============================================================
--- packages/bluez/bluez-utils_3.4.bb 6e23c5824e702fbbaab762244716ebfd9bcdcc4b
+++ packages/bluez/bluez-utils_3.4.bb 4bef33e5c1517513f7fef04b79b32f580b615259
@@ -11,7 +11,6 @@ SRC_URI = "http://bluez.sourceforge.net/
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
============================================================
--- packages/bluez/bluez-utils_3.7.bb 7644ffe67fd0cf94cfed472498a4263e024d4de3
+++ packages/bluez/bluez-utils_3.7.bb 997459c635cbd92f7c2b398e5962dd23bf5c9623
@@ -11,7 +11,6 @@ SRC_URI = "http://bluez.sourceforge.net/
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
============================================================
--- packages/bluez/bluez-utils_3.8.bb dd085c7f50957785f015790ff90f72a6eab37cf1
+++ packages/bluez/bluez-utils_3.8.bb 4bef33e5c1517513f7fef04b79b32f580b615259
@@ -7,11 +7,10 @@ LICENSE = "GPL"
RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
============================================================
--- packages/udev/udev_092.bb 9c280c1d2cc7237d3dd3cc93dd6a6861334b7786
+++ packages/udev/udev_092.bb 3b1cae0e753955c3ad4b534712c7f13582d9a938
@@ -1,9 +1,9 @@ RPROVIDES_${PN} = "hotplug"
DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
/dev/, handles hotplug events and loads drivers at boot time. It replaces \
the hotplug package and requires a kernel not older than 2.6.12."
RPROVIDES_${PN} = "hotplug"
-PR = "r19"
+PR = "r20"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -14,9 +14,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
file://mount.blacklist \
"
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
require udev.inc
INITSCRIPT_PARAMS = "start 03 S ."
@@ -55,10 +52,6 @@ do_install () {
install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
}
-do_install_append_h2200() {
- install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
pkg_postinst_append() {
# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
============================================================
--- packages/udev/udev_097.bb 8d341ef0c55e6945df0f9050797bba9644b6d15b
+++ packages/udev/udev_097.bb 1944d7e0e7e54cc38dcca0c59c66c7080828011f
@@ -8,7 +8,7 @@ needed to link programs with libvolume_i
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r9"
+PR = "r10"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -18,9 +18,6 @@ require udev.inc
require udev.inc
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
INITSCRIPT_PARAMS = "start 03 S ."
FILES_${PN} += "${base_libdir}/udev/*"
============================================================
--- packages/udev/udev_100.bb cf318dbe137533d51d411b1f6361520cd7e366a3
+++ packages/udev/udev_100.bb 3a32c3de3de21597a8c1984dbf4e9892cafda3b0
@@ -9,7 +9,7 @@ needed to link programs with libvolume_i
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r8"
+PR = "r9"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -19,9 +19,6 @@ require udev.inc
require udev.inc
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
INITSCRIPT_PARAMS = "start 03 S ."
FILES_${PN} += "${base_libdir}/udev/*"
@@ -56,10 +53,6 @@ do_install () {
install -d ${D}${base_libdir}/udev/
}
-do_install_append_h2200() {
- install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
pkg_postinst_append() {
# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
#
# mt diff -rc1258545caf65ca7330dc5d776336c46135d7d52 -rf2bd31f1aaf84bef9625b425a458bc019b97a434
#
#
#
# add_dir "packages/linux/linux/sarge-at91"
#
# add_file "conf/machine/include/motorola-ezx-base.inc"
# content [0667c6b496dfb760566158b9fbbd7d6d278b90a6]
#
# add_file "conf/machine/sarge-at91.conf"
# content [c143fccacff25ccef3d78df850733d0a04c84286]
#
# add_file "packages/atk/atk_1.19.3.bb"
# content [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
#
# add_file "packages/kazehakase/kazehakase_cvs.bb"
# content [1b5a8edcf4a52f628f27e5e38dff856525b60edc]
#
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch"
# content [214f7346ed9238c8e7169504a486dd0d9b8e8f6d]
#
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch"
# content [bf050035be44127be85f7e032a598eedf4633167]
#
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch"
# content [9260941cf7e54b07a87e8ffda492d2ff9a25a460]
#
# add_file "packages/linux/linux/sarge-at91/defconfig"
# content [887a1501d7a72435df8b09c025425ef867d22132]
#
# add_file "packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch"
# content [b8a26ac453b32eabec7a152dc8995c03346c07fa]
#
# add_file "packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch"
# content [bb565e82d3dbd8bf8be036f83d615b6a6fb269e4]
#
# add_file "packages/slugos-init/files/boot/kexec"
# content [673016bf05b9aa6cb772a7c6b241caedab27151a]
#
# add_file "packages/uboot/u-boot-1.1.6/sarge-uboot.patch"
# content [c9ee9edf5969ee2d501b6edeae91189ad44478ab]
#
# add_file "packages/uclibc/files/errno_values.h.patch"
# content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
#
# add_file "packages/uclibc/files/termios.h.patch"
# content [a49212a1ef49d0a938f6687ab867600f05b3f1a4]
#
# add_file "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
# content [80a6d114216133cf5b84be77d9090ced7721b591]
#
# patch "classes/sanity.bbclass"
# from [cebf5a2ee9519f8342891e74db6ab2aaa370b992]
# to [dcb94eb7036e5db9888430963dfbead08880632d]
#
# patch "classes/sdk.bbclass"
# from [f5a6cb53cd1f28070b6b61af23f5004767157e55]
# to [100957b869cd48dd7933ace807f396c946442a32]
#
# patch "conf/distro/angstrom-2007.1-legacy.conf"
# from [6881282904bf0d4a7ea3e5a985cd8f22862e4561]
# to [c5b38dbf99bb41080ad1856aeae6bb5359c8d578]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [59159a926215caee1cf37b3d07c5a4bcf28deb10]
# to [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [cb939b1a389e8b33c0bf4f658e709da4337a4add]
# to [c70c421338b418901a172a9210ea87a82ab763c0]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [5976f51d1a203540984b37aea9a01200c509f145]
# to [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e]
# to [211037ba3b8be809090a4a8d44a0ea8d709dae7e]
#
# patch "conf/distro/sharprom-compatible.conf"
# from [36c0bbeac678610033e6ff170af8457bd2f04dbb]
# to [3c1abcc8cdbeb6500fc7e48ad25b8eb278dff3a1]
#
# patch "conf/machine/a1200.conf"
# from [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/a780.conf"
# from [0b4ea0352725660f6f5612a0c0cb267b0274953e]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/e680.conf"
# from [987ace20df2d1dc626ea26f22b62e9dc7289adc5]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/htcwallaby.conf"
# from [9eb8958a34abb017fe40020f1493f5bd050a6e52]
# to [7eaaf072e197ae8aca3285e3c2c4decaa61230cc]
#
# patch "conf/machine/rokr-e2.conf"
# from [3c78073478e131d6f10f163a67a8c03cd4fa6593]
# to [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
#
# patch "packages/0xFFFF/0xffff-native_0.2.bb"
# from [6c9e9ffc3d5527a829bca5d65361f0962b8747d3]
# to [959e24359ef14785c97c6811de8c9643c2220911]
#
# patch "packages/0xFFFF/0xffff.inc"
# from [be76a770e7eaab17fb4a4733c9c98663400a2e99]
# to [9635c8b2381625c57b4d8aa255b220f7739b0826]
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [363539e6aa9b48b4075ef6f22841c250058075ba]
# to [691bb266bc3a89e594d2718bda178991edd6718a]
#
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
# from [6420555a5dfd7edfd3e08a847c058eb380b637df]
# to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
#
# patch "packages/gpephone/xoo-vm_0.7-20070204.bb"
# from [5228f8e9c69a2d20caea19ae8d355fdf2a5295bb]
# to [75d7ab96fd0fb00311b37907ddb10da84d8bef4e]
#
# patch "packages/gtkmm/gtkmm.inc"
# from [5daa50929bf91d353c37e24808bdcf6ffe37866c]
# to [c99e2e2f13acddd410f35d4c40468e00186e71fb]
#
# patch "packages/kazehakase/kazehakase_0.4.5.bb"
# from [2e14bb25ffbd6926f5a10ff4eb9a140996a469c3]
# to [33ebf750491386560f3a270602c11d797ef5bfb2]
#
# patch "packages/kazehakase/kazehakase_0.4.7.bb"
# from [c1051d793dabd07e39bcfb134d49967696a9bf43]
# to [b6fe737fdbc7bc21d3c74fa6ee5984c468f858a0]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84]
# to [a52ed332d359bc91a192a08cf926d94a67787424]
#
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
# from [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
# to [cff3c0080167dd8eefe97ec8f9ba2f6e1b60269d]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [b5692bf04a1318c480b98b9968ab4ea4446181d9]
# to [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
#
# patch "packages/linux/linux.inc"
# from [571ad2731ad0b3d6172a72c2f807cbcc9bb6c840]
# to [08e72ce149668a87f2289e9d8b21ed7c99ea7fb8]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [53a97580492f0de948ef1e7ef160f429dc8a1408]
# to [b173c031d2b38c69861aac233b95eb1254d0c9ed]
#
# patch "packages/meta/meta-sdk-gpe.bb"
# from [47ea869e6d4ac18d47ca62a018ebea80da185c55]
# to [911556373f204b869c56247be3aa3b40fc1f128a]
#
# patch "packages/meta/meta-sdk.bb"
# from [07d62cef69fc1e5ce78c9473a1807dab6b7e1a55]
# to [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
#
# patch "packages/modutils/modutils-cross_2.4.27.bb"
# from [0930c6ca80cd394f3bc0297699ec6ee0c8e07077]
# to [d2e5a6051325833d0a5b8fc3e3d9c178a778e38b]
#
# patch "packages/modutils/modutils_2.4.27.bb"
# from [064be998ea2ba1e1a54c8240906da23faeb1c552]
# to [851e756dae52512055185fc00ee99ffbda2ac230]
#
# patch "packages/php/php_5.1.4.bb"
# from [faa45ca80e5ac5c9d8d718d4ccddc21f5f1510d8]
# to [9c66e44fe96affb7d82ed7a6bc9371c158f7d081]
#
# patch "packages/php/php_5.2.0.bb"
# from [6c43a643d25ef8834530c67de3fff093916c345e]
# to [b3ffd57d43ed9710b732bd9a0745a83a4a45e958]
#
# patch "packages/qemu/qemu-native.inc"
# from [a6c0e5a75f0d0228a83c274f444a11031af95f6c]
# to [71d3322a1e1cff08495c023c071fdd6a29e15a80]
#
# patch "packages/slugos-init/files/boot/network"
# from [7863638b33cded9710583ad3868e24dc35c04195]
# to [1998f275fdd6f6ea83d325e7fe519c4357799e70]
#
# patch "packages/slugos-init/files/functions"
# from [de19dc6cafe30138b066dde30da63533e5278a40]
# to [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
#
# patch "packages/slugos-init/files/modulefunctions"
# from [534b40287bd038eafad6f14953eb107d549b1230]
# to [2fa625b35ea31712fde433431b13ec9b7c79d43b]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [71bdfe52397be1f4556cf272c28ecf7f960558ae]
# to [838d2b4d97516e7beb1501277067200126a20075]
#
# patch "packages/tasks/task-opie-all.bb"
# from [736a212427892e2181e55efb54106fec963fcf48]
# to [f882913a23b727a2f228423837f49cd69400af8b]
#
# patch "packages/tasks/task-slugos.bb"
# from [9b3a116faea9265f7fc10285942e53fbc831e391]
# to [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
#
# patch "packages/uboot/u-boot_1.1.6.bb"
# from [4fc0f6a543827c9634e59fdcf640234b80d8580f]
# to [2c312681345e37f99ff59ba0f3b883c44dd4f35c]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [4747e0d84e923f3e2393759e6b97315cedfb9b8a]
# to [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
#
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
# from [3eb23cf0c505c798552d20494b420631903c6ab1]
# to [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
#
============================================================
--- conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
+++ conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
@@ -0,0 +1,33 @@
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev: size erasesize name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+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
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
+ROOT_FLASH_SIZE = "24"
+
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
+
+# Opentapi 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"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/sarge-at91.conf c143fccacff25ccef3d78df850733d0a04c84286
+++ conf/machine/sarge-at91.conf c143fccacff25ccef3d78df850733d0a04c84286
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Sarge AT91RM9200 blackmesaeast dev boards
+#@DESCRIPTION: Machine configuration for sarge_at91 dev boards
+#
+#Homepage: http://blackmesaeast.com.pl/projects/electronics/sarge-single-board-computer/
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm920t.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# device has own patchset for u-boot 1.1.6
+PREFERRED_VERSION_u-boot = "1.1.6"
+PREFERRED_VERSION_linux = "2.6.21"
============================================================
--- packages/atk/atk_1.19.3.bb 656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb 656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
@@ -0,0 +1,10 @@
+require atk.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
+
+do_stage () {
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+}
============================================================
--- packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
+++ packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
@@ -0,0 +1,18 @@
+DESCRIPTION = "A gtk-webcore based browser"
+HOMEPAGE = "http://kazehakase.sourceforge.jp/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+DEPENDS = "osb-nrcit glib-2.0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/kazehakase;module=kazehakase"
+S = "${WORKDIR}/kazehakase"
+
+
+PV = "0.4.7+cvs${SRCDATE}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-gtkmozembed "
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch 214f7346ed9238c8e7169504a486dd0d9b8e8f6d
+++ packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch 214f7346ed9238c8e7169504a486dd0d9b8e8f6d
@@ -0,0 +1,238 @@
+diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S
+--- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200
++++ ./arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200
+@@ -73,6 +73,12 @@
+ cmp r7, r3
+ beq 99f
+
++ @ AT91RM9200
++ mov r3, #(MACH_TYPE_AT91RM9200 & 0xff)
++ orr r3, r3, #(MACH_TYPE_AT91RM9200 & 0xff00)
++ cmp r7, r3
++ beq 99f
++
+ @ Unknown board, use the AT91RM9200DK board
+ @ mov r7, #MACH_TYPE_AT91RM9200
+ mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
+diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c
+--- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100
++++ ./arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200
+@@ -0,0 +1,190 @@
++/*
++ * linux/arch/arm/mach-at91/board-sarge.c
++ *
++ * Copyright (C) 2007 BlackMesaEast staff
++ *
++ * mcgregor at blackmesaeast.com.pl
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/mtd/physmap.h>
++
++#include <asm/hardware.h>
++#include <asm/setup.h>
++#include <asm/mach-types.h>
++#include <asm/irq.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/map.h>
++#include <asm/mach/irq.h>
++
++#include <asm/arch/board.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/at91rm9200_mc.h>
++
++#include "generic.h"
++
++
++/*
++ * Serial port configuration.
++ * 0 .. 3 = USART0 .. USART3
++ * 4 = DBGU
++ */
++static struct at91_uart_config __initdata sarge_uart_config = {
++ .console_tty = 0, /* ttyS0 */
++ .nr_tty = 5,
++ .tty_map = { 4, 1, 0, 2, 3 } /* ttyS0, ..., ttyS4 */
++};
++
++static void __init sarge_map_io(void)
++{
++ /* Initialize processor: 18.432 MHz crystal */
++ at91rm9200_initialize(18432000, AT91RM9200_PQFP);
++
++ /* Setup the serial ports and console */
++ at91_init_serial(&sarge_uart_config);
++}
++
++static void __init sarge_init_irq(void)
++{
++ at91rm9200_init_interrupts(NULL);
++}
++
++static struct at91_eth_data __initdata sarge_eth_data = {
++ .phy_irq_pin = AT91_PIN_PB1,
++ .is_rmii = 0,
++};
++
++static struct at91_usbh_data __initdata sarge_usbh_data = {
++ .ports = 1,
++};
++
++static struct at91_udc_data __initdata sarge_udc_data = {
++ .vbus_pin = AT91_PIN_PA20,
++ .pullup_pin = AT91_PIN_PA21,
++};
++
++static struct at91_cf_data __initdata sarge_cf_data = {
++ .det_pin = AT91_PIN_PB24,
++ .rst_pin = AT91_PIN_PB23,
++ // .irq_pin = ... not connected
++ // .vcc_pin = ... always powered
++};
++
++static struct at91_mmc_data __initdata sarge_mmc_data = {
++ .det_pin = AT91_PIN_PB0,
++ .slot_b = 0,
++ .wire4 = 1,
++ .wp_pin = AT91_PIN_PB2,
++};
++
++
++
++static struct spi_board_info sarge_spi_devices[] = {
++ { /* DataFlash chip */
++ .modalias = "mtd_dataflash",
++ .chip_select = 0,
++ .max_speed_hz = 15 * 1000 * 1000,
++ }
++};
++
++static struct mtd_partition __initdata sarge_nand_partition[] = {
++ {
++ .name = "NAND Partition 1",
++ .offset = 0,
++ .size = MTDPART_SIZ_FULL,
++ },
++};
++
++static struct mtd_partition *nand_partitions(int size, int *num_partitions)
++{
++ *num_partitions = ARRAY_SIZE(sarge_nand_partition);
++ return sarge_nand_partition;
++}
++
++static struct at91_nand_data __initdata sarge_nand_data = {
++ .ale = 22,
++ .cle = 21,
++ .det_pin = AT91_PIN_PB22,
++ .rdy_pin = AT91_PIN_PB22,
++ // .enable_pin = ... not there
++ .partition_info = nand_partitions,
++};
++
++#define SARGE_FLASH_BASE AT91_CHIPSELECT_0
++#define SARGE_FLASH_SIZE 0x200000
++
++static struct physmap_flash_data sarge_flash_data = {
++ .width = 2,
++};
++
++static struct resource sarge_flash_resource = {
++ .start = SARG%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list