[oe-commits] org.oe.dev merge of 'a91112c3e784fea18d755b2f4d125e144e41fdc8'
thesing commit
oe at amethyst.openembedded.net
Fri Mar 28 17:07:20 UTC 2008
merge of 'a91112c3e784fea18d755b2f4d125e144e41fdc8'
and 'fc4b712c9e56d0a95e47daae16669dc117b1d181'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 4c5ff2d2d2cef2221b5b390b8ea792221e754584
ViewMTN: http://monotone.openembedded.org/revision/info/4c5ff2d2d2cef2221b5b390b8ea792221e754584
Files:
1
conf/machine/include/zaurus-2.6.inc
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.24.bb
packages/pulseaudio/files/fix-shm.patch
packages/pulseaudio/pulseaudio_0.9.9.bb
packages/python/python-dbus_0.82.4.bb
Diffs:
#
# mt diff -ra91112c3e784fea18d755b2f4d125e144e41fdc8 -r4c5ff2d2d2cef2221b5b390b8ea792221e754584
#
#
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [28f9350146ad28dc16ffd19ca0f09a93374826cb]
# to [ec1dccd443e27cabd637f308fbaa647b5ea3286b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
# from [c20ffc7ca88bd60b7372555603e25cf2b03abc9b]
# to [cdc131302bb2f166b54297d964f87b3c6b153bad]
#
# patch "packages/linux/linux-rp.inc"
# from [8efe110a0206f0bcff50da5554603214a407b8fe]
# to [3a2d5b9393fe2992f9997c380afb0b845c4b7e8b]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [d6d6154abb7e12ee339a56d8159976202d70a192]
# to [ce10df6d3a73ef3738f0718a582cff77e16c5954]
#
============================================================
--- conf/machine/include/zaurus-2.6.inc 28f9350146ad28dc16ffd19ca0f09a93374826cb
+++ conf/machine/include/zaurus-2.6.inc ec1dccd443e27cabd637f308fbaa647b5ea3286b
@@ -33,7 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS_collie = "kern
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
- kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd"
+ kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_collie = "smallscreen"
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-collie c20ffc7ca88bd60b7372555603e25cf2b03abc9b
+++ packages/linux/linux-rp-2.6.24/defconfig-collie cdc131302bb2f166b54297d964f87b3c6b153bad
@@ -825,7 +825,7 @@ CONFIG_SPI_MASTER=y
# SPI Master Controller Drivers
#
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_LOCOMO is not set
+CONFIG_SPI_LOCOMO=m
#
# SPI Protocol Masters
@@ -1014,8 +1014,8 @@ CONFIG_MMC=m
# CONFIG_HIDRAW is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_MMC=m
-CONFIG_MMC_DEBUG=y
-CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD Card Drivers
============================================================
--- packages/linux/linux-rp.inc 8efe110a0206f0bcff50da5554603214a407b8fe
+++ packages/linux/linux-rp.inc 3a2d5b9393fe2992f9997c380afb0b845c4b7e8b
@@ -58,6 +58,7 @@ module_autoload_mmc_block_collie = "mmc_
module_autoload_locomo-spi_collie = "locomo-spi"
module_autoload_mmc_block_collie = "mmc_block"
+module_autoload_mmc_spi = "mmc-spi"
module_autoload_locomokbd_collie = "locomokbd"
module_autoload_sa1100-cs_collie = "sa1100_cs"
module_autoload_collie-ts_collie = "collie-ts"
============================================================
--- packages/linux/linux-rp_2.6.24.bb d6d6154abb7e12ee339a56d8159976202d70a192
+++ packages/linux/linux-rp_2.6.24.bb ce10df6d3a73ef3738f0718a582cff77e16c5954
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r6"
+PR = "r7"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
@@ -82,24 +82,23 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
# Disabled until I find the reason this gives issues with cdc_subset
# ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
-# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
-# (Pavel Machek's git tree has updated versions of this?)
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
-# These patches are extracted from Pavel Machek's git tree
-# (diff against vanilla kernel)
SRC_URI_append_collie = "\
- ${TKSRC}/mtd-sharp-flash-hack-r3.patch;patch=1 \
+ ${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1 \
${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \
- ${TKSRC}/locomo-r0.patch;patch=1 \
-# ${TKSRC}/locomo_spi-4.patch;patch=1 \
- ${TKSRC}/collie-kexec.patch;patch=1 \
- ${TKSRC}/sharpsl_pm-3.patch;patch=1 \
- ${TKSRC}/collie_pm-2.patch;patch=1 \
- ${TKSRC}/locomokeyb_suspendkey-2.patch;patch=1 \
+ ${TKSRC}/locomo-r1.patch;patch=1 \
+ ${TKSRC}/collie-kexec-r1.patch;patch=1 \
+ ${TKSRC}/sharpsl_pm-4.patch;patch=1 \
+ ${TKSRC}/collie_pm-3.patch;patch=1 \
${TKSRC}/ucb1x00_suspend.patch;patch=1 \
${TKSRC}/collie-ts.patch;patch=1 \
${TKSRC}/pcmcia_suspend.patch;patch=1 \
+ ${TKSRC}/locomo_spi-6.patch;patch=1 \
+ ${TKSRC}/config.patch;patch=1 \
+ ${TKSRC}/locomokeyb.patch;patch=1 \
+ ${TKSRC}/mmc-spi.patch;patch=1 \
+ ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
+ ${TKSRC}/sa1100_spinlock.patch;patch=1 \
"
SRC_URI_append_poodle = "\
#
# mt diff -rfc4b712c9e56d0a95e47daae16669dc117b1d181 -r4c5ff2d2d2cef2221b5b390b8ea792221e754584
#
#
#
# add_file "packages/pulseaudio/files/fix-shm.patch"
# content [fb4917430c3dda689c1c92774f519315a6978ad9]
#
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
# from [a42f8d95ac47cb47a5e26144cc42a01d219a00e4]
# to [08f85100dead2cfb44c8bb085f028384f5674e16]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [aff2c48f361a7ace67a1057330cf36a822c07811]
# to [ef44ee10f31374784359fe76d1f10cabda60f104]
#
============================================================
--- packages/pulseaudio/files/fix-shm.patch fb4917430c3dda689c1c92774f519315a6978ad9
+++ packages/pulseaudio/files/fix-shm.patch fb4917430c3dda689c1c92774f519315a6978ad9
@@ -0,0 +1,20 @@
+# fixes building against uclibc
+# fixed upstream, see http://www.pulseaudio.org/ticket/200
+Index: pulseaudio-0.9.9/src/pulsecore/shm.c
+===================================================================
+--- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971)
++++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110)
+@@ -319,4 +319,5 @@
+ int pa_shm_cleanup(void) {
+
++#ifdef HAVE_SHM_OPEN
+ #ifdef SHM_PATH
+ DIR *d;
+@@ -376,5 +377,6 @@
+
+ closedir(d);
+-#endif
++#endif /* SHM_PATH */
++#endif /* HAVE_SHM_OPEN */
+
+ return 0;
============================================================
--- packages/pulseaudio/pulseaudio_0.9.9.bb a42f8d95ac47cb47a5e26144cc42a01d219a00e4
+++ packages/pulseaudio/pulseaudio_0.9.9.bb 08f85100dead2cfb44c8bb085f028384f5674e16
@@ -1,15 +1,15 @@ DEPENDS += "dbus"
require pulse.inc
DEPENDS += "dbus"
+PR = "r4"
# this is not correct (see below)
SRC_URI += "\
file://disable-using-glibc-tls.patch;patch=1 \
file://fix-dbus-without-hal.patch;patch=1 \
+ file://fix-shm.patch;patch=1 \
"
-PR = "r3"
-
# problems w/ pulseaudio 0.9.9 atm:
# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
# 2.) doesn't build w/ glibc TLS support (hence patched out)
============================================================
--- packages/python/python-dbus_0.82.4.bb aff2c48f361a7ace67a1057330cf36a822c07811
+++ packages/python/python-dbus_0.82.4.bb ef44ee10f31374784359fe76d1f10cabda60f104
@@ -4,12 +4,12 @@ RDEPENDS = "python-threading python-io p
LICENSE = "MIT"
DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml2"
+PR = "ml3"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
S = "${WORKDIR}/dbus-python-${PV}"
-inherit distutils-base autotools
+inherit distutils-base autotools pkgconfig
export BUILD_SYS := "${BUILD_SYS}"
export HOST_SYS := "${HOST_SYS}"
More information about the Openembedded-commits
mailing list