[oe-commits] org.oe.dev merge of '99187c0da3a302acfa7fa4f93194f5f358f40d92'
mickeyl commit
oe at amethyst.openembedded.net
Mon Sep 1 18:38:23 UTC 2008
merge of '99187c0da3a302acfa7fa4f93194f5f358f40d92'
and 'bfe16c15aa0c506913d70d09dc1dc9fcd8fabf94'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cbe3c01bd8b49af467a1371cedad2d5cf2e6654c
ViewMTN: http://monotone.openembedded.org/revision/info/cbe3c01bd8b49af467a1371cedad2d5cf2e6654c
Files:
1
packages/libgphoto2/libgphoto2_2.1.4.bb
packages/gphoto2/libgphoto2_2.1.4.bb
packages/libgphoto2/libgphoto2_2.1.5.bb
packages/gphoto2/libgphoto2_2.1.5.bb
packages/libgphoto2/libgphoto2_2.1.6.bb
packages/gphoto2/libgphoto2_2.1.6.bb
packages/aufs
packages/aufs/aufs
packages/python/python-numpy/arm
packages/sugar/etoys
packages/aufs/aufs/aufs_create_no_manpage.patch
packages/aufs/aufs_cvs.bb
packages/gnome/gnome-panel_2.22.2.bb
packages/gnome/libgweather_2.22.3.bb
packages/gphoto2/gphoto2_2.4.2.bb
packages/gphoto2/libgphoto2_2.4.2.bb
packages/python/python-numpy/arm/config.h
packages/python/python-numpy/arm/numpyconfig.h
packages/python/python-numpy/trycompile.diff
packages/python/python-xappy_0.5.bb
packages/sugar/etoys/etoys.diff
packages/sugar/etoys_3.0.2076.bb
packages/sugar/sugar-datastore_0.82.0.bb
packages/xapian/xapian-core_1.0.7.bb
conf/distro/include/sane-srcdates.inc
packages/gphoto2/gphoto2_2.4.0.bb
packages/konqueror/konqueror-embedded_20070316.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_1.2.3.bb
packages/libqpe/libqpe-opie_cvs.bb
packages/mythtv/mythtv_0.21.bb
packages/openssh/openssh_4.6p1.bb
packages/python/python-numpy_1.1.1.bb
packages/sugar/sugar-base_0.82.0.bb
packages/tasks/task-openmoko-feed.bb
packages/tslib/tslib/tslib-input_raw-grab_events.patch
conf/distro/include/sane-srcrevs.inc
packages/tslib/tslib/om-gta01/ts.conf
packages/tslib/tslib/om-gta02/ts.conf
packages/tslib/tslib/ts.conf
packages/tslib/tslib_1.0.bb
Diffs:
#
# mt diff -r99187c0da3a302acfa7fa4f93194f5f358f40d92 -rcbe3c01bd8b49af467a1371cedad2d5cf2e6654c
#
#
#
# rename "packages/libgphoto2/libgphoto2_2.1.4.bb"
# to "packages/gphoto2/libgphoto2_2.1.4.bb"
#
# rename "packages/libgphoto2/libgphoto2_2.1.5.bb"
# to "packages/gphoto2/libgphoto2_2.1.5.bb"
#
# rename "packages/libgphoto2/libgphoto2_2.1.6.bb"
# to "packages/gphoto2/libgphoto2_2.1.6.bb"
#
# add_dir "packages/aufs"
#
# add_dir "packages/aufs/aufs"
#
# add_dir "packages/python/python-numpy/arm"
#
# add_dir "packages/sugar/etoys"
#
# add_file "packages/aufs/aufs/aufs_create_no_manpage.patch"
# content [e0a7fa112994fecc771033ff581a9974c48649ff]
#
# add_file "packages/aufs/aufs_cvs.bb"
# content [756bfb0fefa7cf7a0eb2df75e32b29ab540ee503]
#
# add_file "packages/gnome/gnome-panel_2.22.2.bb"
# content [650f78a4da1a4d5d63c46a1487b2a87755e809eb]
#
# add_file "packages/gnome/libgweather_2.22.3.bb"
# content [5819c7e2274025898c47c9d6e95cd2b7c53817be]
#
# add_file "packages/gphoto2/gphoto2_2.4.2.bb"
# content [f321626856381fc5cc1444eec358e78409e433d4]
#
# add_file "packages/gphoto2/libgphoto2_2.4.2.bb"
# content [528b89e98b39641ab1a7f5481c41aa48295f3334]
#
# add_file "packages/python/python-numpy/arm/config.h"
# content [49d3ea7ecc913ff768f658cbc3b006329dd908df]
#
# add_file "packages/python/python-numpy/arm/numpyconfig.h"
# content [5ef46292cbca23ac1109074f427af9514165c618]
#
# add_file "packages/python/python-numpy/trycompile.diff"
# content [c6d78ba02b769b42fc0545f8a98d64c8141b8a2e]
#
# add_file "packages/python/python-xappy_0.5.bb"
# content [68f8e3ebcbedbae672e6dc62230e2ca306d3a48e]
#
# add_file "packages/sugar/etoys/etoys.diff"
# content [bae27fd509d315f31104c0ecd2298f03f99d5e14]
#
# add_file "packages/sugar/etoys_3.0.2076.bb"
# content [daa216973313b8ce9594455722cb536fe176c442]
#
# add_file "packages/sugar/sugar-datastore_0.82.0.bb"
# content [f0734b87b0d9eaa1dc08e700095222627e317cdc]
#
# add_file "packages/xapian/xapian-core_1.0.7.bb"
# content [a6a41b3e9ba8cee1c5423139180a835062201ac1]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [9007aebc39932ba342d30c8e70192aa4ddfc13cd]
# to [bc0e8e2f090f061492b00b5e97bd6c3106d66670]
#
# patch "packages/gphoto2/gphoto2_2.4.0.bb"
# from [cd3e313d727b48a81b5b3d9736604d8e8c5f99a6]
# to [f321626856381fc5cc1444eec358e78409e433d4]
#
# patch "packages/konqueror/konqueror-embedded_20070316.bb"
# from [86f01914d98db2ca4443578b2001273781984d3e]
# to [52f0903096648402a9ab125d07ab48ac699a6d98]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
# to [39a3ed985b49d78d9e5d903134cb404b9f1eff0e]
#
# patch "packages/libqpe/libqpe-opie_1.2.3.bb"
# from [e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f]
# to [e40ccb715212c4467dad3596d2f776c152097df7]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [1be4fc68fcba5b0e72363211f2fd5c6249ec3333]
# to [220c730d3576bd768e9e7acf18c1d7478616d45d]
#
# patch "packages/mythtv/mythtv_0.21.bb"
# from [11c9903ba5a2d62b47e984d6c45a432010f6bbab]
# to [5fa160f936006e93a6e2bcba0d308ddcc3b105f6]
#
# patch "packages/openssh/openssh_4.6p1.bb"
# from [10c9d7afb3cf9de6cae64ac94cf32103fa96bce6]
# to [98a3923a4964f4b492c8103d6a1c475fd9861a2a]
#
# patch "packages/python/python-numpy_1.1.1.bb"
# from [bb077493a3e8852e6547319161e595c4622bcfc5]
# to [35cd7953095f766b2f0497396859da5461a829f8]
#
# patch "packages/sugar/sugar-base_0.82.0.bb"
# from [752924beabb314108c93457e7a9ae3505e9ba428]
# to [f798cc119c2e5e6e9281913789426077b83ebe49]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [6c9d14f781da8cd6061d7caac00db3856b96784e]
# to [a236d83f49b15fe73d6135a8065aa85f99eb7d4d]
#
============================================================
--- packages/aufs/aufs/aufs_create_no_manpage.patch e0a7fa112994fecc771033ff581a9974c48649ff
+++ packages/aufs/aufs/aufs_create_no_manpage.patch e0a7fa112994fecc771033ff581a9974c48649ff
@@ -0,0 +1,34 @@
+OE-only:
+comment: Not building the manpage is just a hack.
+
+diff -Nur aufs.vanilla/util/Makefile aufs/util/Makefile
+--- aufs.vanilla/util/Makefile 2008-08-23 13:00:37.000000000 +0200
++++ aufs/util/Makefile 2008-08-23 15:40:26.000000000 +0200
+@@ -1,25 +1,10 @@
+
+ # $Id: Makefile,v 1.10 2008/05/26 04:02:40 sfjro Exp $
+
+-all: aufs.5 aulchown
++all: aulchown
+ test -x ./mount.aufs || chmod a+x ./mount.aufs
+
+-aufs.5: aufs.in.5 ./c2tmac
+- ${RM} $@
+- ./c2tmac > $@
+- awk '{ \
+- gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \
+- gsub(/\\\[oq\]\140/, "\\[oq]"); \
+- gsub(/\047\\\[cq\]/, "\\[cq]"); \
+- gsub(/\047/, "\\[aq]"); \
+- print; \
+- }' aufs.in.5 >> $@
+- chmod a-w $@
+-
+ CFLAGS += -O2 -Wall ${EXTRA_CFLAGS} ${ccflags-y}
+
+-.INTERMEDIATE: c2tmac.o c2tmac
+-c2tmac.o: c2tmac.c ../include/linux/aufs_type.h
+-
+ clean:
+- ${RM} c2tmac aulchown aufs.5 *~ .*~
++ ${RM} aulchown *~ .*~
============================================================
--- packages/aufs/aufs_cvs.bb 756bfb0fefa7cf7a0eb2df75e32b29ab540ee503
+++ packages/aufs/aufs_cvs.bb 756bfb0fefa7cf7a0eb2df75e32b29ab540ee503
@@ -0,0 +1,62 @@
+DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single directory."
+HOMEPAGE = "http://aufs.sourceforge.net/"
+LICENSE = "GPL"
+RDEPENDS = "kernel (${KERNEL_VERSION})"
+DEPENDS = "virtual/kernel sed-native"
+PV = "cvs${SRCDATE}"
+PR = "r0"
+S = "${WORKDIR}/aufs"
+inherit module
+
+# We do not create the manpage for aufs because we do not install it anyway.
+# If you want to have the manpage created you will need to add host cc to
+# the makefile else it will fail to crosscompile.
+# See http://svn.exactcode.de/t2/trunk/package/filesystem/aufs/compile.patch.cross
+# as an example how this could be done.
+
+SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE} \
+ file://aufs_create_no_manpage.patch;patch=1 "
+
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk"
+
+# We need to check the architecture and the kernel version to
+# configure properly lokal.mk. We ignore the export CONFIG_AUFS_STAT option.
+# If you want to have CONFIG_AUFS_STAT enabled you have to add some other ARCH checks.
+# Debian does not enable CONFIG_AUFS_STAT for arm.
+# We disable CONFIG_AUFS_SYSAUFS for arm because arm does not know about cmpxchg.
+# If you want this feature enabled you have to define it.
+# I suggest you to read http://osdir.com/ml/linux.kernel.tracing/2006-12/msg00020.html
+
+do_configure() {
+echo ${S} > /home/nice/sdir
+ K_VERSION=$(echo ${KERNEL_VERSION} | awk 'BEGIN{FS="."}{print $3}')
+ cd ${S}
+ if [ $K_VERSION -ge 24 ] ; then
+ sed -i 's/CONFIG_AUFS_FAKE_DM\ =\ y/CONFIG_AUFS_FAKE_DM\ =/g' local.mk
+ fi
+ if [ $K_VERSION -eq 25 ] || [ $ARCH = "arm" ] ; then
+ sed -i 's/CONFIG_AUFS_SYSAUFS\ =\ y/CONFIG_AUFS_SYSAUFS\ =/g' local.mk
+ fi
+}
+
+do_compile(){
+ LDFLAGS=""
+ oe_runmake
+}
+
+do_install() {
+ install -m 500 -p mount.aufs umount.aufs auplink aulchown ${D}/${sbindir}
+ mkdir -p ${D}/etc/default
+ echo FLUSH=ALL > ${D}/etc/default/auplink
+ mkdir -p ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/
+ cp aufs.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/
+}
+
+pkg_postinst() {
+if test "x$D" != "x"; then
+ exit 1
+else
+ depmod -ae
+fi
+}
+
============================================================
--- packages/gnome/gnome-panel_2.22.2.bb 650f78a4da1a4d5d63c46a1487b2a87755e809eb
+++ packages/gnome/gnome-panel_2.22.2.bb 650f78a4da1a4d5d63c46a1487b2a87755e809eb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+DEPENDS = "libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
+
+inherit gnome pkgconfig
+
+do_configure_prepend() {
+ sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+ ${datadir}/icons"
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gnome/libgweather_2.22.3.bb 5819c7e2274025898c47c9d6e95cd2b7c53817be
+++ packages/gnome/libgweather_2.22.3.bb 5819c7e2274025898c47c9d6e95cd2b7c53817be
@@ -0,0 +1,21 @@
+LICENSE = "LGPL"
+DEPENDS = "libgnome"
+
+inherit gnome
+
+do_configure_prepend() {
+ sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+ ${datadir}/icons"
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gphoto2/gphoto2_2.4.2.bb f321626856381fc5cc1444eec358e78409e433d4
+++ packages/gphoto2/gphoto2_2.4.2.bb f321626856381fc5cc1444eec358e78409e433d4
@@ -0,0 +1,14 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libtool libgphoto2 popt"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
============================================================
--- packages/gphoto2/libgphoto2_2.4.2.bb 528b89e98b39641ab1a7f5481c41aa48295f3334
+++ packages/gphoto2/libgphoto2_2.4.2.bb 528b89e98b39641ab1a7f5481c41aa48295f3334
@@ -0,0 +1,31 @@
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "libtool jpeg libusb libexif"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
+
+inherit autotools pkgconfig lib_package
+
+OE_LT_RPATH_ALLOW=":${libdir}:"
+OE_LT_RPATH_ALLOW[export]="1"
+
+EXTRA_OECONF = " --with-drivers=all ac_cv_lib_ltdl_lt_dlcaller_register=yes"
+
+PACKAGES =+ "libgphotoport libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
+RDEPENDS_${PN} = "libgphoto2-camlibs"
+
+FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*"
+
+FILES_${PN} += "${libdir}/udev/*"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/python/python-numpy/arm/config.h 49d3ea7ecc913ff768f658cbc3b006329dd908df
+++ packages/python/python-numpy/arm/config.h 49d3ea7ecc913ff768f658cbc3b006329dd908df
@@ -0,0 +1,21 @@
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
============================================================
--- packages/python/python-numpy/arm/numpyconfig.h 5ef46292cbca23ac1109074f427af9514165c618
+++ packages/python/python-numpy/arm/numpyconfig.h 5ef46292cbca23ac1109074f427af9514165c618
@@ -0,0 +1,17 @@
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT
+ * */
+#define NPY_SIZEOF_SHORT 2
+#define NPY_SIZEOF_INT 4
+#define NPY_SIZEOF_LONG 4
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_LONGDOUBLE 12
+#define NPY_SIZEOF_PY_INTPTR_T 4
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+
============================================================
--- packages/python/python-numpy/trycompile.diff c6d78ba02b769b42fc0545f8a98d64c8141b8a2e
+++ packages/python/python-numpy/trycompile.diff c6d78ba02b769b42fc0545f8a98d64c8141b8a2e
@@ -0,0 +1,33 @@
+--- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200
++++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200
+@@ -80,8 +80,7 @@
+ raise SystemError,\
+ "Non-existing %s. Perhaps you need to install"\
+ " python-dev|python-devel." % (python_h)
+- result = config_cmd.try_run(tc,include_dirs=[python_include],
+- library_dirs = default_lib_dirs)
++ result = config_cmd.try_compile(tc)
+ if not result:
+ raise SystemError,"Failed to test configuration. "\
+ "See previous error messages for more information."
+@@ -95,7 +94,7 @@
+ if mathlib:
+ mathlibs_choices.insert(0,mathlib.split(','))
+ for libs in mathlibs_choices:
+- if config_cmd.try_run(tc,libraries=libs):
++ if config_cmd.try_compile(tc):
+ mathlibs = libs
+ break
+ else:
+@@ -180,10 +179,7 @@
+ " python-dev|python-devel." % (python_h)
+
+ config.numpy_include_dirs
+- result = config_cmd.try_run(testcode,
+- include_dirs = [python_include] + \
+- config.numpy_include_dirs,
+- library_dirs = default_lib_dirs)
++ result = config_cmd.try_compile(testcode)
+
+ if not result:
+ raise SystemError,"Failed to generate numpy configuration. "\
============================================================
--- packages/python/python-xappy_0.5.bb 68f8e3ebcbedbae672e6dc62230e2ca306d3a48e
+++ packages/python/python-xappy_0.5.bb 68f8e3ebcbedbae672e6dc62230e2ca306d3a48e
@@ -0,0 +1,15 @@
+DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine"
+LICENSE = "GPLv2"
+
+DEPENDS += "xapian-core"
+
+SRC_URI = "http://xappy.googlecode.com/files/xappy-${PV}.tar.gz"
+
+inherit distutils
+
+S = "${WORKDIR}/xappy-${PV}"
+
+do_stage() {
+ distutils_stage_all
+}
+
============================================================
--- packages/sugar/etoys/etoys.diff bae27fd509d315f31104c0ecd2298f03f99d5e14
+++ packages/sugar/etoys/etoys.diff bae27fd509d315f31104c0ecd2298f03f99d5e14
@@ -0,0 +1,65 @@
+--- /tmp/Makefile.in 2008-09-01 13:20:20.000000000 +0200
++++ etoys-3.0.2076/Makefile.in 2008-09-01 13:29:37.453198000 +0200
+@@ -79,23 +79,23 @@
+ dirs = $(bindir) $(etoysdir) $(mimedir) $(exmpldir) $(guidedir) $(docsdir)
+
+ install-etoys: Content
+- for d in $(dirs) ; do mkdir -p $$d ; done
+- install -v etoys $(bindir)
+- for f in $(etoys) ; do install -v -m 644 $$f $(etoysdir); done
+- for f in $(examples); do install -v -m 644 $$f $(exmpldir); done
++ for d in $(dirs) ; do mkdir -p $(DESTDIR)$$d ; done
++ install -v etoys $(DESTDIR)$(bindir)
++ for f in $(etoys) ; do install -v -m 644 $$f $(DESTDIR)$(etoysdir); done
++ for f in $(examples); do install -v -m 644 $$f $(DESTDIR)$(exmpldir); done
+ for f in $(guides); do \
+ dest=$(guidedir)/`basename $$f`; \
+ echo -n $$dest; \
+- ( gunzip -c $$f | gzip -v --rsyncable > $$dest ); \
+- chmod 644 $$dest; \
++ ( gunzip -c $$f | gzip -v --rsyncable > $(DESTDIR)$$dest ); \
++ chmod 644 $(DESTDIR)$$dest; \
+ done
+- for f in $(docs) ; do install -v -m 644 $$f $(docsdir); done
++ for f in $(docs) ; do install -v -m 644 $$f $(DESTDIR)$(docsdir); done
+ for f in $(mos) ; do \
+ dir=`dirname $$f|sed 's/^Content.//'` ; \
+- mkdir -p $(etoysdir)/$$dir ; \
+- install -v -m 644 $$f $(etoysdir)/$$dir ; \
++ mkdir -p $(DESTDIR)$(etoysdir)/$$dir ; \
++ install -v -m 644 $$f $(DESTDIR)$(etoysdir)/$$dir ; \
+ done
+- install -v -m 644 etoys.xml $(mimedir)
++ install -v -m 644 etoys.xml $(DESTDIR)$(mimedir)
+
+
+ # install activity - only used from sugar-jhbuild
+@@ -109,20 +109,20 @@
+ ./mkNews > $@
+
+ install-activity: $(activityall)
+- mkdir -p $(activitydir)/activity
+- mkdir -p $(activitydir)/bin
+- install -v etoys-activity $(activitydir)/bin
+- rm -f $(activitydir)/etoys-activity
+- install -v -m 644 NEW%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbfe16c15aa0c506913d70d09dc1dc9fcd8fabf94 -rcbe3c01bd8b49af467a1371cedad2d5cf2e6654c
#
#
#
# delete "packages/tslib/tslib/tslib-input_raw-grab_events.patch"
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f26ce611141232b0ce4d310873be5609dff97aee]
# to [8d38dd2bc488cd5167b556687964fce056cfa2c1]
#
# patch "packages/tslib/tslib/om-gta01/ts.conf"
# from [7123e2647340fe6a95f41cd9f53f3307c08cd223]
# to [330e12437f24e5887dc375f822e6a2ba23413a9c]
#
# patch "packages/tslib/tslib/om-gta02/ts.conf"
# from [7123e2647340fe6a95f41cd9f53f3307c08cd223]
# to [330e12437f24e5887dc375f822e6a2ba23413a9c]
#
# patch "packages/tslib/tslib/ts.conf"
# from [de4e4fea450b701945b99658e8317fa1b3e462ec]
# to [330e12437f24e5887dc375f822e6a2ba23413a9c]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [11f9ac2e626e92402422989031894d52cd8285e2]
# to [ca9920204a4c76065069c2733de2ba76ccbdf74a]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc f26ce611141232b0ce4d310873be5609dff97aee
+++ conf/distro/include/sane-srcrevs.inc 8d38dd2bc488cd5167b556687964fce056cfa2c1
@@ -79,7 +79,7 @@ SRCREV_pn-linux-openmoko ?= "88bf43840b9
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
-SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
+SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
============================================================
--- packages/tslib/tslib/om-gta01/ts.conf 7123e2647340fe6a95f41cd9f53f3307c08cd223
+++ packages/tslib/tslib/om-gta01/ts.conf 330e12437f24e5887dc375f822e6a2ba23413a9c
@@ -1,5 +1,5 @@
# Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=1
+module_raw input
# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
# module_raw collie
============================================================
--- packages/tslib/tslib/om-gta02/ts.conf 7123e2647340fe6a95f41cd9f53f3307c08cd223
+++ packages/tslib/tslib/om-gta02/ts.conf 330e12437f24e5887dc375f822e6a2ba23413a9c
@@ -1,5 +1,5 @@
# Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=1
+module_raw input
# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
# module_raw collie
============================================================
--- packages/tslib/tslib/ts.conf de4e4fea450b701945b99658e8317fa1b3e462ec
+++ packages/tslib/tslib/ts.conf 330e12437f24e5887dc375f822e6a2ba23413a9c
@@ -1,5 +1,5 @@
# Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=0
+module_raw input
# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
# module_raw collie
============================================================
--- packages/tslib/tslib_1.0.bb 11f9ac2e626e92402422989031894d52cd8285e2
+++ packages/tslib/tslib_1.0.bb ca9920204a4c76065069c2733de2ba76ccbdf74a
@@ -3,19 +3,21 @@ LICENSE = "LGPL"
AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
+PR = "r20"
-PR = "r19"
+SRC_URI = "\
+ http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
+ file://fix_version.patch;patch=1 \
+ file://ts.conf \
+ file://ts.conf-simpad-2.4 \
+ file://ts.conf-collie-2.4 \
+ file://tslib.sh \
+"
+SRC_URI_append_mnci += "\
+ file://devfs.patch;patch=1 \
+ file://event1.patch;patch=1 \
+"
-SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
- file://tslib-input_raw-grab_events.patch;patch=1 \
- file://fix_version.patch;patch=1 \
- file://ts.conf \
- file://ts.conf-simpad-2.4 \
- file://ts.conf-collie-2.4 \
- file://tslib.sh"
-SRC_URI_append_mnci += " file://devfs.patch;patch=1"
-SRC_URI_append_mnci += " file://event1.patch;patch=1"
-
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared"
More information about the Openembedded-commits
mailing list