[oe-commits] org.oe.dev merge of 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Feb 17 19:07:50 UTC 2008
merge of 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
and 'd0092933b0c82a6d8470e8da03507e0e5e71529c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 14ec17d9c2eedda24db3cbf24c95130ea062c5cb
ViewMTN: http://monotone.openembedded.org/revision/info/14ec17d9c2eedda24db3cbf24c95130ea062c5cb
Files:
1
packages/initrdscripts/initramfs-image-ipk_1.0.bb
packages/initrdscripts/kernel-initramfs_1.0.bb
packages/at76c503a/at76c503a-modules_0.17.bb
classes/image.bbclass
classes/kernel.bbclass
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/initrdscripts/devimage_0.1.bb
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/lighttpd/lighttpd/src-server.c.patch
packages/linux/linux-handhelds-2.6.inc
packages/zten/files/zten.patch
packages/zten/zten_1.6.2.bb
conf/distro/include/sane-srcrevs.inc
packages/gstreamer/gst-plugin-pulse_0.9.7.bb
packages/openmoko2/openmoko-sound-system2/session
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.9.bb
Diffs:
#
# mt diff -rcb01f2744d89a35b7112e49fc0d5862aba66733f -r14ec17d9c2eedda24db3cbf24c95130ea062c5cb
#
#
#
# delete "packages/initrdscripts/initramfs-image-ipk_1.0.bb"
#
# delete "packages/initrdscripts/kernel-initramfs_1.0.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/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/initrdscripts/devimage_0.1.bb"
# from [955c0d0e038ef20daa3fd5247047bf341c3f5116]
# to [88d34c65381db0061c854a2000edef77b08e3a06]
#
# patch "packages/initrdscripts/files/10-initfs.sh"
# from [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
# to [5f0d6f2403263afd21f7a7a0b34c979666f7a4ef]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8]
# to [b378e73bcd2daa97bd9e9134000a2ade7fe2538f]
#
# patch "packages/initrdscripts/files/85-blockboot.sh"
# from [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
# to [e0ae45c3c5c308f37255fd249ea75bdacb3d5f67]
#
# patch "packages/initrdscripts/files/init.sh"
# from [d6057201f9ee2a9e2d44ed71124d43142bc1a05f]
# to [96fb4bc0a57019aa64a5b8316e5868a507195f87]
#
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
# from [1d63081f1074144e693737bd6ca954bd64c1b1a2]
# to [7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [f13252f06b1023c948e8295f3ee95c0eda773899]
# to [ed86798f2ad4cb2713e525c7939d02a161e7465a]
#
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
# from [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
# to [71d1fee98407e78577c2537c60488436d5a31c88]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [716f3127ca0421f8c9920adbb82ec03ace9a4717]
# to [614ab72976521dc2833ecb9383e5556d18c05fa6]
#
# patch "packages/lighttpd/lighttpd/src-server.c.patch"
# from [ff0cc797c5884c967e00ae132428f5aa6f206750]
# to [8b4f719a20587a5a8efb400bdb383aeb6cd6166f]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [2a754a7d66cf1dec3b59ed67417eeb6af7e654a2]
# to [a212a1e08710b140bd482d9538939be6fed39bab]
#
# patch "packages/zten/files/zten.patch"
# from [a4d0d1cf7012199ec440d1189262d3b651e04355]
# to [ffbf836fcbb8e8a4346209dd0d27adecb6b106c1]
#
# patch "packages/zten/zten_1.6.2.bb"
# from [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
# to [3a657dad91761dc2aaaeecda01e90a118fd99cbe]
#
============================================================
--- 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/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/initrdscripts/devimage_0.1.bb 955c0d0e038ef20daa3fd5247047bf341c3f5116
+++ packages/initrdscripts/devimage_0.1.bb 88d34c65381db0061c854a2000edef77b08e3a06
@@ -1,12 +1,14 @@ SRC_URI = "file://devimage.sh file://pas
DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r3"
+PR = "r4"
do_install() {
- install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
install -d ${D}/etc/dropbear
+ install -d ${D}/sbin
+ install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
install -m 0600 ${WORKDIR}/dropbear_rsa_host_key ${D}/etc/dropbear/
install -m 0644 ${WORKDIR}/passwd ${D}/etc/
+ ln -s /init ${D}/sbin/init
}
+FILES_${PN} += " /init /etc/* /sbin/*"
-FILES_${PN} += " /init /etc/*"
============================================================
--- packages/initrdscripts/files/10-initfs.sh 31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
+++ packages/initrdscripts/files/10-initfs.sh 5f0d6f2403263afd21f7a7a0b34c979666f7a4ef
@@ -1,5 +1,6 @@ modprobe -q ext3 >/dev/null 2>&1
#!/bin/sh
modprobe -q vfat >/dev/null 2>&1
modprobe -q ext2 >/dev/null 2>&1
modprobe -q ext3 >/dev/null 2>&1
+modprobe -q jffs2 >/dev/null 2>&1
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8
+++ packages/initrdscripts/files/30-bootmenu.sh b378e73bcd2daa97bd9e9134000a2ade7fe2538f
@@ -95,6 +95,7 @@ add_menu_item "NFS (nfsroot=192.168.2.20
done < /proc/partitions
add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)"
+add_menu_item "Shell"
total=`echo -e $list | wc -l`
num=0
@@ -142,8 +143,11 @@ path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
dev=`expr "$sel" : '\([^ /]*\)'`
path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
+fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
-if [ "$dev" == "NFS" ]; then
+if [ "$dev" == "Shell" ]; then
+ exec /bin/sh
+elif [ "$dev" == "NFS" ]; then
ROOT_DEVICE="/dev/nfs"
CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image"
elif [ -n "$path" ]; then
@@ -151,6 +155,10 @@ else
CMDLINE="$CMDLINE root=/dev/loop looproot=/dev/$dev:$path"
else
ROOT_DEVICE="/dev/$dev"
+ # jffs2 is not recognized by mount automagically
+ if [ "$fstype" == "(jffs2)" ]; then
+ ROOT_FSTYPE="jffs2"
+ fi
CMDLINE="$CMDLINE root=$ROOT_DEVICE"
fi
============================================================
--- packages/initrdscripts/files/85-blockboot.sh e1e0ab71a19561305b6a02ff169c7e789c5359ae
+++ packages/initrdscripts/files/85-blockboot.sh e0ae45c3c5c308f37255fd249ea75bdacb3d5f67
@@ -1,8 +1,12 @@ if [ -e "$ROOT_DEVICE" ]; then
#!/bin/sh
# Allow booting from a normal block device.
if [ -e "$ROOT_DEVICE" ]; then
echo "booting from: $ROOT_DEVICE"
- mount "$ROOT_DEVICE" /mnt
+ type=""
+ if [ -n "$ROOT_FSTYPE" ]; then
+ type="-t $ROOT_FSTYPE"
+ fi
+ mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
BOOT_ROOT=/mnt
fi
============================================================
--- packages/initrdscripts/files/init.sh d6057201f9ee2a9e2d44ed71124d43142bc1a05f
+++ packages/initrdscripts/files/init.sh 96fb4bc0a57019aa64a5b8316e5868a507195f87
@@ -8,6 +8,7 @@ early_setup() {
mkdir /proc
mount -t proc proc /proc
mkdir /mnt
+ modprobe -q mtdblock
}
dev_setup()
@@ -30,6 +31,8 @@ read_args() {
case $arg in
root=*)
ROOT_DEVICE=$optarg ;;
+ rootfstype=*)
+ ROOT_FSTYPE=$optarg ;;
rootdelay=*)
rootdelay=$optarg ;;
esac
@@ -48,13 +51,13 @@ boot_root() {
exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
}
-boot_failed() {
- echo "No valid root device was specified. Please add root=/dev/something to"
- echo "the kernel command-line and try again."
+fatal() {
+ echo $1
echo
exec sh
}
+
echo "Starting initramfs boot..."
early_setup
read_args
@@ -68,4 +71,5 @@ load_modules
load_modules
[ -n "$BOOT_ROOT" ] && boot_root
+
+fatal "No valid root device was specified. Please add root=/dev/something to the kernel command-line and try again."
-boot_failed
============================================================
--- packages/initrdscripts/initramfs-module-block_1.0.bb 1d63081f1074144e693737bd6ca954bd64c1b1a2
+++ packages/initrdscripts/initramfs-module-block_1.0.bb 7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh"
SRC_URI = "file://85-blockboot.sh"
-PR = "r1"
+PR = "r3"
RDEPENDS = "initramfs-uniboot"
DESCRIPTION = "An initramfs module for booting off normal block devices."
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb f13252f06b1023c948e8295f3ee95c0eda773899
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb ed86798f2ad4cb2713e525c7939d02a161e7465a
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
SRC_URI = "file://30-bootmenu.sh"
-PR = "r9"
+PR = "r11"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
# For VFAT mounting.
============================================================
--- packages/initrdscripts/initramfs-module-initfs_1.0.bb e8b2ca5b6f8808155c08371d32e7b42f94caa7bb
+++ packages/initrdscripts/initramfs-module-initfs_1.0.bb 71d1fee98407e78577c2537c60488436d5a31c88
@@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh"
SRC_URI = "file://10-initfs.sh"
-PR = "r2"
+PR = "r4"
DESCRIPTION = "An initramfs module for initializing filesystems."
RDEPENDS = "initramfs-uniboot"
RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb 716f3127ca0421f8c9920adbb82ec03ace9a4717
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb 614ab72976521dc2833ecb9383e5556d18c05fa6
@@ -1,6 +1,7 @@ SRC_URI = "file://init.sh"
SRC_URI = "file://init.sh"
-PR = "r2"
+PR = "r4"
DESCRIPTON = "A modular initramfs init script system."
+RRECOMMENDS = "kernel-module-mtdblock"
do_install() {
install -m 0755 ${WORKDIR}/init.sh ${D}/init
============================================================
--- 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/linux/linux-handhelds-2.6.inc 2a754a7d66cf1dec3b59ed67417eeb6af7e654a2
+++ packages/linux/linux-handhelds-2.6.inc a212a1e08710b140bd482d9538939be6fed39bab
@@ -88,20 +88,27 @@ set cmdline "root=/dev/mmcblk0p2 rootdel
## Choice 2 - Boot from CF card, setup like above
#set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
-## Choice 3 - Boot rootfs image as initramfs (works only for smaller images)
+## Choice 3 - Boot kernel with builtin interactive bootloader (initramfs-bootmenu-image)
+# rootdelay is a wait before scanning for the available pa%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd0092933b0c82a6d8470e8da03507e0e5e71529c -r14ec17d9c2eedda24db3cbf24c95130ea062c5cb
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [06c680c836e1f326a6ad003d8e7198e317e64709]
# to [d864a60f9ae785c0ec3e27ce5ea71dacd656d7de]
#
# patch "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
# from [5554f865191f1f521ae855a40f67b2d8b13bc4ac]
# to [c8b0b0e80f6d09a6542f2e0f6bbcfc2bee77c1c4]
#
# patch "packages/openmoko2/openmoko-sound-system2/session"
# from [963e0a668b32334f079f421e73b9a68bc5a9cfc5]
# to [9291bc4112b6646a2f915a992a0969068f8545ac]
#
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
# from [13b0af54bfe883481d5d3db51bf22cf84091f8d4]
# to [ee4a04630adac72cef3bd2b8bfe5edc6adf2e7e0]
#
# patch "packages/pulseaudio/pulse.inc"
# from [1d80936eb792c520f41e2b7d53e94292e959129f]
# to [21cfea996a2da42f5d28bdf518cec74f51f8454a]
#
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
# from [90330867c2b9d3a07bbf0e113c2289c5fd452fca]
# to [a076f2143bcd4c95f958a442f117d983aef69d9c]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 06c680c836e1f326a6ad003d8e7198e317e64709
+++ conf/distro/include/sane-srcrevs.inc d864a60f9ae785c0ec3e27ce5ea71dacd656d7de
@@ -26,7 +26,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "73"
+SRCREV_pn-gsm0710muxd ?= "77"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "56"
SRCREV_pn-hildon-1 ?= "14429"
============================================================
--- packages/gstreamer/gst-plugin-pulse_0.9.7.bb 5554f865191f1f521ae855a40f67b2d8b13bc4ac
+++ packages/gstreamer/gst-plugin-pulse_0.9.7.bb c8b0b0e80f6d09a6542f2e0f6bbcfc2bee77c1c4
@@ -1,11 +1,9 @@ PR = "r1"
DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
LICENSE = "GPL"
DEPENDS = "gstreamer pulseaudio"
PR = "r1"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \
file://dont-overload-pulseaudio.patch;patch=1"
S = "${WORKDIR}/gst-pulse-${PV}"
============================================================
--- packages/openmoko2/openmoko-sound-system2/session 963e0a668b32334f079f421e73b9a68bc5a9cfc5
+++ packages/openmoko2/openmoko-sound-system2/session 9291bc4112b6646a2f915a992a0969068f8545ac
@@ -1,7 +1,7 @@
#!/usr/bin/pulseaudio -nF
# Create autoload entries for the device drivers
-add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-sink output module-alsa-sink sink_name=output
add-autoload-source input module-alsa-source source_name=input
# Load several protocols
============================================================
--- packages/openmoko2/openmoko-sound-system2_0.1.0.bb 13b0af54bfe883481d5d3db51bf22cf84091f8d4
+++ packages/openmoko2/openmoko-sound-system2_0.1.0.bb ee4a04630adac72cef3bd2b8bfe5edc6adf2e7e0
@@ -13,7 +13,7 @@ RPROVIDES = "openmoko-sound-system"
"
RREPLACES = "openmoko-sound-system"
RPROVIDES = "openmoko-sound-system"
-PR = "r4"
+PR = "r5"
inherit openmoko-base update-rc.d
============================================================
--- packages/pulseaudio/pulse.inc 1d80936eb792c520f41e2b7d53e94292e959129f
+++ packages/pulseaudio/pulse.inc 21cfea996a2da42f5d28bdf518cec74f51f8454a
@@ -20,8 +20,8 @@ EXTRA_OECONF = "\
--with-glib \
--with-alsa \
--with-oss \
- --with-hal \
- "
+ --with-hal \
+"
PARALLEL_MAKE = ""
@@ -83,7 +83,8 @@ pkg_postinst_${PN}-server() {
grep -q pulse: /etc/group || addgroup pulse
grep -q pulse: /etc/passwd || \
adduser --disabled-password --home=/var/run/pulse --system \
- --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
+ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
+ adduser pulse audio
/etc/init.d/populate-volatile.sh update
}
============================================================
--- packages/pulseaudio/pulseaudio_0.9.9.bb 90330867c2b9d3a07bbf0e113c2289c5fd452fca
+++ packages/pulseaudio/pulseaudio_0.9.9.bb a076f2143bcd4c95f958a442f117d983aef69d9c
@@ -8,11 +8,9 @@ SRC_URI += "\
file://fix-dbus-without-hal.patch;patch=1 \
"
-PR = "r1"
+PR = "r2"
# 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)
+# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
-# 3.) hangs, if used with gst-pulse 0.9.7, fails with hierarchical pthread stuff
-DEFAULT_PREFERENCE = "-1"
-
More information about the Openembedded-commits
mailing list