[oe-commits] org.oe.dev merge of '9a8a930122d29384549135ea3382884efdb4000e'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Feb 12 21:16:28 UTC 2008
merge of '9a8a930122d29384549135ea3382884efdb4000e'
and 'a0976fae9659c5e0c23233eaa6f5a6e777a1a044'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 34e43612b25ab2cef55713b9d003cdb82e7cfa25
ViewMTN: http://monotone.openembedded.org/revision/info/34e43612b25ab2cef55713b9d003cdb82e7cfa25
Files:
1
packages/bonnie/bonnie++_1.03a.bb
packages/bonnie/bonnie++.inc
packages/python/python-gst_0.10.8.bb
packages/python/python-gst_0.10.10.bb
packages/fuse/fuse-2.7.2
packages/fuse/fuse-module-2.5.3
packages/kobodeluxe
packages/kobodeluxe/files
packages/linux/linux-2.6.24/mpc8313e-rdb
packages/bonnie/bonnie++_1.03c.bb
packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch
packages/fuse/fuse-module_2.5.3.bb
packages/fuse/fuse-module_2.7.2.bb
packages/fuse/fuse_2.7.2.bb
packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch
packages/gstreamer/gst-plugins-base_0.10.17.bb
packages/gstreamer/gstreamer_0.10.17.bb
packages/kobodeluxe/files/debian-kobo.patch
packages/kobodeluxe/files/default-config
packages/kobodeluxe/files/kobodeluxe-dimension-autoswap.patch
packages/kobodeluxe/files/kobodeluxe-menu-pointer.patch
packages/kobodeluxe/files/kobodeluxe-putenv.patch
packages/kobodeluxe/files/kobodeluxe-sysconf-support.patch
packages/kobodeluxe/kobodeluxe_0.5.1.bb
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-davinci/davinci-nand.patch
packages/logic-analyzer/files/scrolling-capture-dialog.patch
packages/madwifi/files/30-define-ioreadwrite32be-for-little-endian-too.patch
packages/madwifi/madwifi-ng_r3314-20080131.bb
packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot
packages/python/python-sqlalchemy_0.4.2p3.bb
packages/udev/files/slugos/mount.sh
packages/xorg-driver/xf86-input-acecad_1.2.2.bb
packages/xorg-driver/xf86-video-trident_1.2.4.bb
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
MAINTAINERS
conf/machine/davinci-sffsdr.conf
conf/machine/mpc8313e-rdb.conf
packages/dbus-java/dbus-java_2.3.bb
packages/gcc/gcc-4.2.2/arm-softfloat.patch
packages/gcc/gcc-4.2.2/arm-thumb.patch
packages/glibc/glibc_2.6.1.bb
packages/libmatthew/libmatthew_0.5.bb
packages/linux/linux-davinci/davinci-sffsdr/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.24.bb
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/meta/slugos-packages.bb
packages/netbase/netbase_4.21.bb
packages/python/python-gst/python-path.patch
packages/python/python-pyqt_4.3.3.bb
packages/rxtx/rxtx_2.1-7r2.bb
packages/slugos-init/files/boot/network
packages/slugos-init/slugos-init_4.8.bb
packages/tasks/task-python-everything.bb
packages/tasks/task-slugos.bb
packages/udev/udev_100.bb
packages/xorg-driver/xorg-driver-common.inc
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/linux/linux-handhelds-2.6.inc
Diffs:
#
# mt diff -r9a8a930122d29384549135ea3382884efdb4000e -r34e43612b25ab2cef55713b9d003cdb82e7cfa25
#
#
#
# rename "packages/bonnie/bonnie++_1.03a.bb"
# to "packages/bonnie/bonnie++.inc"
#
# rename "packages/python/python-gst_0.10.8.bb"
# to "packages/python/python-gst_0.10.10.bb"
#
# add_dir "packages/fuse/fuse-2.7.2"
#
# add_dir "packages/fuse/fuse-module-2.5.3"
#
# add_dir "packages/kobodeluxe"
#
# add_dir "packages/kobodeluxe/files"
#
# add_dir "packages/linux/linux-2.6.24/mpc8313e-rdb"
#
# add_file "packages/bonnie/bonnie++_1.03a.bb"
# content [e2b7e06b997c66ef46588e548bac834ec2a8b963]
#
# add_file "packages/bonnie/bonnie++_1.03c.bb"
# content [e2b7e06b997c66ef46588e548bac834ec2a8b963]
#
# add_file "packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch"
# content [87f674d617d4471de42092a0ddef939de1626716]
#
# add_file "packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch"
# content [58653fb90ef7157df5508a85b4c9df3c805dfc09]
#
# add_file "packages/fuse/fuse-module_2.5.3.bb"
# content [496f6d970646c70b509c66d2f3b2d963418af819]
#
# add_file "packages/fuse/fuse-module_2.7.2.bb"
# content [18508e3a2ef6dcff4b6e5195c41b8b231e169cf7]
#
# add_file "packages/fuse/fuse_2.7.2.bb"
# content [558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd]
#
# add_file "packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch"
# content [6e27c665fb61282ca8bf798ada77542ae0e3c4ac]
#
# add_file "packages/gstreamer/gst-plugins-base_0.10.17.bb"
# content [42b568147310d58a2ca061df2db79c873973b472]
#
# add_file "packages/gstreamer/gstreamer_0.10.17.bb"
# content [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
#
# add_file "packages/kobodeluxe/files/debian-kobo.patch"
# content [1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a]
#
# add_file "packages/kobodeluxe/files/default-config"
# content [46257ad56eea9a725ce61d60791a7dc100217d6f]
#
# add_file "packages/kobodeluxe/files/kobodeluxe-dimension-autoswap.patch"
# content [a81da9854c43a33ce55b8bda5930b97c3432a3da]
#
# add_file "packages/kobodeluxe/files/kobodeluxe-menu-pointer.patch"
# content [cdf7d88a3c307e3234861a010c08d02718984c06]
#
# add_file "packages/kobodeluxe/files/kobodeluxe-putenv.patch"
# content [a98eaa1073b6536c57c61e4df76aace189795b2d]
#
# add_file "packages/kobodeluxe/files/kobodeluxe-sysconf-support.patch"
# content [1c09a303dbfdb24e5c9c15c96b075573198d7f20]
#
# add_file "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
# content [2040369b6c4f71d005b8c0e530e90fb9dd7efd50]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
# content [31fbac69083a743610a7b45b209c1eedf231ea8f]
#
# add_file "packages/linux/linux-davinci/davinci-nand.patch"
# content [09c96aff8af2932444cb3547c3a695a3f38ec5b8]
#
# add_file "packages/logic-analyzer/files/scrolling-capture-dialog.patch"
# content [5b6ee3474dd6b3ccf6f19e551bdc91192428e179]
#
# add_file "packages/madwifi/files/30-define-ioreadwrite32be-for-little-endian-too.patch"
# content [1b51cd6c2bc389a29f2144db569945f751b30fea]
#
# add_file "packages/madwifi/madwifi-ng_r3314-20080131.bb"
# content [aa87cb14b8005f3b927e4701b1ae845bf2099ec2]
#
# add_file "packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot"
# content [225fbcdfa332608a2c8f1360fc922261f28ba694]
#
# add_file "packages/python/python-sqlalchemy_0.4.2p3.bb"
# content [18b9298c36a2fa274dc84c3eee646683bf772e85]
#
# add_file "packages/udev/files/slugos/mount.sh"
# content [9e59c21651fc2f3094b4be636f3d58bf29c2b0c7]
#
# add_file "packages/xorg-driver/xf86-input-acecad_1.2.2.bb"
# content [d4eed3f09ab330e51e578d372d2836bf56e12c97]
#
# add_file "packages/xorg-driver/xf86-video-trident_1.2.4.bb"
# content [6652218c1d42422833ef6604609150e2bcbea706]
#
# add_file "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
# content [e5e3556e1bceb28bc0993ea107c09a15d5f6b215]
#
# patch "MAINTAINERS"
# from [b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02]
# to [42e1fd8bf852c29ab5e08a51152c446726334145]
#
# patch "conf/machine/davinci-sffsdr.conf"
# from [d52a6b196d1cddf497a5a3f358dd67ea44d0700e]
# to [e78c2776ef888446589865c926e40dbbcb5796e9]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [8d91dbc6066254429f7bb58a89ddd63064e893b6]
# to [ab8c53a3e3d1cc19ba638ce007d8bb544e084fe6]
#
# patch "packages/bonnie/bonnie++.inc"
# from [489765cbec9fc1aced60043864697639b2516bea]
# to [cfab1e0ebae83675cbf8b9313f8968a2131c9e5f]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [0f364694e12942f190ab3353a87700e5ae39ac26]
# to [17764905d124799a8edd17b918d5840fb5165cb9]
#
# patch "packages/gcc/gcc-4.2.2/arm-softfloat.patch"
# from [c2fcfd20cc1076a976149055efa9d3d47ccc9961]
# to [a75dd0178c0e43be67c6e716da8c1a82a6270226]
#
# patch "packages/gcc/gcc-4.2.2/arm-thumb.patch"
# from [c1ab94e8925134bf5b5cae5a2689f0c7127eb008]
# to [4e5930d45cd65afd0706edb94267818b9cd1ec05]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [1f216ad18c9a31af1594aec05b31fa975613897c]
# to [a3edca56fd29b409cf9c2080cd7c5d19362a434c]
#
# patch "packages/libmatthew/libmatthew_0.5.bb"
# from [23e5bf387eae5233d4fd7f2f2ec8be582756bac2]
# to [4d5017a96ee835a24017a6f101e47e55243c6816]
#
# patch "packages/linux/linux-davinci/davinci-sffsdr/defconfig"
# from [3d2c723eaac7576ad5fe9a492aac76ee978a2944]
# to [d76344cf2dccb9b3b92feb9643ac3df9f0182d91]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [e279dfd64f4b51730d46b080bc7b8b2a035fccbe]
# to [52f3d3b0d626d28fcb41b051eb1d474d8317f0f1]
#
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# from [ad1b8632676bd6456ca0ae5a7fbfe7125fe01fb9]
# to [2358fe351f97ad015b3e58e2534dd17058c60d52]
#
# patch "packages/linux/linux-ixp4xx_2.6.24.bb"
# from [8c6ec0c27876836cdbb7b4bef1f61641fe013dd7]
# to [6df87e421ee2408a059092ec0b63b1393e0c03ce]
#
# patch "packages/linux/linux.inc"
# from [842044ba3ce2c6e2833cece5e5b577864f966d55]
# to [50d164fb436a83e1bb06c2ef8819fc6da91f4b7c]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [9aa2936a0674d6f62622a857a74d7637177bf26e]
# to [bfcc7f56635a20d509535cb2e8653f0479ba726f]
#
# patch "packages/logic-analyzer/logic-analyzer_0.8.bb"
# from [1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad]
# to [887bea96f05438c0a3baacddfbfcf142ec2638c8]
#
# patch "packages/meta/slugos-packages.bb"
# from [5245a17c2f735fe2b2c50779e12e2bd525d82c8a]
# to [a0f84eecde8c29aacd23f8d841a38ccb02939c65]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [af669d9b9d58a59681b0445de61ca6198bb991e1]
# to [e8599c2f3bf24aaaf6db4afc8fb1f79a74ba059b]
#
# patch "packages/python/python-gst/python-path.patch"
# from [1afa10d102a359899e1de8322aa0ddd1ad3dd12d]
# to [11a3e813e3184881d5b4f4b3fcaedd2ddb4e700f]
#
# patch "packages/python/python-gst_0.10.10.bb"
# from [bfb2e80bf7941825e00221fb6bec64e8791e4a26]
# to [d5aab69018139eb74a0a3d2b4a439c3a8196e9cd]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [223ab1067352bfd8f64a2ce301d5cc0b02dcce43]
# to [3576e364ba5d18127b6acf06fa14a929527c5fa8]
#
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
# from [3974ebf631b2b9bafd21186daeaaa81409ba5eec]
# to [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
#
# patch "packages/slugos-init/files/boot/network"
# from [4fe9fe097faa17da41a09d209399c67df115768c]
# to [24a86887b19822c0276b0b4206959bddae2cd3c3]
#
# patch "packages/slugos-init/slugos-init_4.8.bb"
# from [5c3b2fe18a30d3510095f7868b4e32f248080492]
# to [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
#
# patch "packages/tasks/task-python-everything.bb"
# from [4205f773c7e409cd6521c0a3a73c501e4c6a15bc]
# to [b5a200a4072ebca5bb229f749f96085c3914b4e5]
#
# patch "packages/tasks/task-slugos.bb"
# from [1a313f3e4a3e8303d0d5961ed5f57295673414d6]
# to [17a889149bf02e7e6c1b412a448bf3d09cb0e4be]
#
# patch "packages/udev/udev_100.bb"
# from [ba7ba1e986f3e6a91b52b018b80113898d5f8cab]
# to [72309dab97aeccd4e512bd8d643d6467df4340e8]
#
# patch "packages/xorg-driver/xorg-driver-common.inc"
# from [4781f88414e5c06d12345456c1da9f7c9a9f833a]
# to [5ca39b0044edf92bc34a0bb204a622954fa97d7d]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [ab6b7713f6a5d17b7c19e07445de40a86cc924e5]
# to [4b5d3af5cb182cae469a03c02b833de42df211ed]
#
============================================================
--- packages/bonnie/bonnie++_1.03a.bb e2b7e06b997c66ef46588e548bac834ec2a8b963
+++ packages/bonnie/bonnie++_1.03a.bb e2b7e06b997c66ef46588e548bac834ec2a8b963
@@ -0,0 +1 @@
+require bonnie++.inc
============================================================
--- packages/bonnie/bonnie++_1.03c.bb e2b7e06b997c66ef46588e548bac834ec2a8b963
+++ packages/bonnie/bonnie++_1.03c.bb e2b7e06b997c66ef46588e548bac834ec2a8b963
@@ -0,0 +1 @@
+require bonnie++.inc
============================================================
--- packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch 87f674d617d4471de42092a0ddef939de1626716
+++ packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch 87f674d617d4471de42092a0ddef939de1626716
@@ -0,0 +1,15 @@
+Index: fuse-2.7.2/util/Makefile.am
+===================================================================
+--- fuse-2.7.2.orig/util/Makefile.am 2007-04-26 01:36:47.000000000 +0930
++++ fuse-2.7.2/util/Makefile.am 2008-02-10 16:43:19.000000000 +1030
+@@ -33,10 +33,6 @@
+ $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+- @if test -x /usr/sbin/update-rc.d; then \
+- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+- fi
+
+ install-data-local:
+ $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
============================================================
--- packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch 58653fb90ef7157df5508a85b4c9df3c805dfc09
+++ packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch 58653fb90ef7157df5508a85b4c9df3c805dfc09
@@ -0,0 +1,11 @@
+--- fuse-2.5.3/kernel/Makefile.in.orig 2008-01-05 20:43:00.000000000 -0600
++++ fuse-2.5.3/kernel/Makefile.in 2008-01-05 20:43:25.000000000 -0600
+@@ -54,8 +54,6 @@
+
+ ifeq ($(majver), 2.4)
+
+-CC = gcc
+-LD = ld
+ CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe @KERNELCFLAGS@
+ CPPFLAGS = -I at kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@
+
============================================================
--- packages/fuse/fuse-module_2.5.3.bb 496f6d970646c70b509c66d2f3b2d963418af819
+++ packages/fuse/fuse-module_2.5.3.bb 496f6d970646c70b509c66d2f3b2d963418af819
@@ -0,0 +1,31 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://preserve_CC_with_2_4_kernel.patch;patch=1"
+
+S = "${WORKDIR}/fuse-${PV}"
+
+FILES_${PN} = "${base_libdir}/modules"
+
+EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+ cd ${S}
+ oe_runconf
+}
+
+do_compile(){
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake
+}
+
+fakeroot do_install() {
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake install DESTDIR=${D}
+}
+
============================================================
--- packages/fuse/fuse-module_2.7.2.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
+++ packages/fuse/fuse-module_2.7.2.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
@@ -0,0 +1,29 @@
+require fuse.inc
+
+RRECOMMENDS = "fuse"
+PR = "r0"
+
+S = "${WORKDIR}/fuse-${PV}"
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
+EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+ cd ${S} ; oe_runconf
+}
+
+do_compile(){
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake
+}
+
+fakeroot do_install() {
+ LDFLAGS=""
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+ cd ${S}/kernel
+ oe_runmake install DESTDIR=${D}
+}
+
============================================================
--- packages/fuse/fuse_2.7.2.bb 558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
+++ packages/fuse/fuse_2.7.2.bb 558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
@@ -0,0 +1,27 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+fakeroot do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch 6e27c665fb61282ca8bf798ada77542ae0e3c4ac
+++ packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch 6e27c665fb61282ca8bf798ada77542ae0e3c4ac
@@ -0,0 +1,20 @@
+Submitted By: Joe Ciccone <jciccone at linuxfromscratch.org>
+Date: 07-02-2007
+Initial Package Version: 2.6
+Origin: http://sourceware.org/ml/libc-ports/2007-05/msg00051.html
+Upstream Status: Unknown
+Description: Defines RTLD_SINGLE_THREAD_P for arm.
+
+diff -Naur glibc-2.6.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-2.6/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+--- glibc-2.6.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-02 17:39:22.000000000 -0400
++++ glibc-2.6/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-02 17:39:36.000000000 -0400
+@@ -126,3 +126,9 @@
+ # define NO_CANCELLATION 1
+
+ #endif
++
++#ifndef __ASSEMBLER__
++# define RTLD_SINGLE_THREAD_P \
++ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
++ header.multiple_threads) == 0, 1)
++#endif
============================================================
--- packages/gstreamer/gst-plugins-base_0.10.17.bb 42b568147310d58a2ca061df2db79c873973b472
+++ packages/gstreamer/gst-plugins-base_0.10.17.bb 42b568147310d58a2ca061df2db79c873973b472
@@ -0,0 +1,12 @@
+require gst-plugins.inc
+
+PROVIDES += "gst-plugins"
+
+# gst-plugins-base only builds the alsa plugin
+# if alsa has been built and is present. You will
+# not get an error if this is not present, just
+# a missing alsa plugin
+DEPENDS += "alsa-lib"
+
+PR = "r2"
+
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.17.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
@@ -0,0 +1,3 @@
+require gstreamer.inc
+
+PR = "r0"
============================================================
--- packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
+++ packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
@@ -0,0 +1,72 @@
+--- kobodeluxe-0.5.1.orig/kobo.cpp
++++ kobodeluxe-0.5.1/kobo.cpp
+@@ -141,21 +141,21 @@
+ * Graphics data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("GFX", "./data/gfx");
++ //fmap->addpath("GFX", "./data/gfx");
+ /* Real data dir */
+ fmap->addpath("GFX", "DATA>>gfx");
+ /* Current dir */
+- fmap->addpath("GFX", "./gfx");
++ //fmap->addpath("GFX", "./gfx");
+
+ /*
+ * Sound data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("SFX", "./data/sfx");
++ //fmap->addpath("SFX", "./data/sfx");
+ /* Real data dir */
+ fmap->addpath("SFX", "DATA>>sfx");
+ /* Current dir */
+- fmap->addpath("SFX", "./sfx");
++ //fmap->addpath("SFX", "./sfx");
+
+ /*
+ * Score files (user and global)
+@@ -173,7 +173,7 @@
+ /* System local */
+ fmap->addpath("CONFIG", SYSCONF_DIR);
+ /* In current dir (last resort) */
+- fmap->addpath("CONFIG", "./");
++ //fmap->addpath("CONFIG", "./");
+ }
+
+
+--- kobodeluxe-0.5.1.orig/graphics/window.cpp
++++ kobodeluxe-0.5.1/graphics/window.cpp
+@@ -331,7 +331,7 @@
+ }
+
+
+-void window_t::center_token(int _x, int _y, const char *txt, char token)
++void window_t::center_token(int%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra0976fae9659c5e0c23233eaa6f5a6e777a1a044 -r34e43612b25ab2cef55713b9d003cdb82e7cfa25
#
#
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [8a1cbcb3f61f8916215950aabdd338c438d2f8f0]
# to [2a754a7d66cf1dec3b59ed67417eeb6af7e654a2]
#
============================================================
--- packages/linux/linux-handhelds-2.6.inc 8a1cbcb3f61f8916215950aabdd338c438d2f8f0
+++ packages/linux/linux-handhelds-2.6.inc 2a754a7d66cf1dec3b59ed67417eeb6af7e654a2
@@ -98,6 +98,11 @@ set cmdline "root=/dev/mmcblk0p2 rootdel
# 192.168.y.y - Handheld's address
#set cmdline "root=/dev/nfs nfsroot=192.168.x.x:<nfs_path> ip=192.168.y.y:192.168.x.x:192.168.x.x:255.255.255.0:pda:usb0 console=ttyS0,115200n8 console=tty0"
+## Choice 5 - Boot from MTD partition, for devices with lots of flash
+# to have both WinCE and Linux there. Note the value of root param,
+# that's how it should be, not "/dev/mtdblockN".
+# set cmdline "root=mtdN console=ttyS0,115200n8 console=tty0"
+
bootlinux
EOF
}
More information about the Openembedded-commits
mailing list