summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/ipaq-pxa270.conf28
-rw-r--r--packages/avahi/avahi_0.2.bb7
-rw-r--r--packages/dbus/dbus-0.34/.mtn2git_empty0
-rw-r--r--packages/dbus/dbus-0.34/dbus-1.init86
-rw-r--r--packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig45
-rw-r--r--packages/sqlite/sqlite3-3.2.5/.mtn2git_empty0
-rw-r--r--packages/sqlite/sqlite3-3.2.5/cross-compile.patch84
-rw-r--r--packages/sqlite/sqlite3-3.2.5/ldflags.patch77
-rw-r--r--packages/sqlite/sqlite3-3.2.5/libtool.patch25
-rw-r--r--packages/sqlite/sqlite3_3.2.5.bb44
10 files changed, 370 insertions, 26 deletions
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 9e1b677ecf..0565b897b7 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-PXA270_MODULES = "g_ether pxa27x_udc"
+PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
+ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
+ nls_cp437 nls_utf8"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
include conf/machine/tune-xscale.conf
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \
- hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700"
+HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
+ hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
+
+module_autoload_hx4700_power = "hx4700_power"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
+module_autoload_asic3_mmc = "asic3_mmc"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_hx4700_ts = "hx4700_ts"
+module_autoload_hx4700_navpt = "hx4700_navpt"
+module_autoload_hx4700_bt = "hx4700_bt"
+module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pcm-oss = "snd-mixer-oss"
+module_autoload_pxa27x_udc = "pxa27x_udc"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
diff --git a/packages/avahi/avahi_0.2.bb b/packages/avahi/avahi_0.2.bb
index 00c4dbd599..8added4ed2 100644
--- a/packages/avahi/avahi_0.2.bb
+++ b/packages/avahi/avahi_0.2.bb
@@ -5,11 +5,10 @@ DEPENDS = "expat libdaemon dbus-0.34"
RRECOMMENDS = "libnss-mdns"
SECTION = "net"
PRIORITY = "optional"
+PR = "r1"
SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz"
-# file://no-strict-ansi.patch;patch=1"
-
PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
@@ -35,10 +34,12 @@ inherit update-rc.d
INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
pkg_postinst_avahi-daemon () {
- grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon avahi
+ grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi -g Avahi
}
pkg_postrm_avahi-daemon () {
diff --git a/packages/dbus/dbus-0.34/.mtn2git_empty b/packages/dbus/dbus-0.34/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dbus/dbus-0.34/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.34/dbus-1.init b/packages/dbus/dbus-0.34/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/packages/dbus/dbus-0.34/dbus-1.init
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus-1
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus-1 ]; then
+ . /etc/default/dbus-1
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ run-parts --reverse --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ restart|force-reload)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
index dbfeab2a62..f90fb80edf 100644
--- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-hh1
-# Wed Jul 13 18:54:32 2005
+# Linux kernel version: 2.6.12-hh2
+# Mon Aug 15 19:13:48 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -102,6 +102,7 @@ CONFIG_PXA27x=y
CONFIG_PXA_KEYS=y
# CONFIG_ARCH_ESERIES is not set
# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
# CONFIG_ARCH_H1900 is not set
# CONFIG_ARCH_H2200 is not set
# CONFIG_ARCH_H3900 is not set
@@ -124,6 +125,9 @@ CONFIG_HX4700_LEDS=m
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
# CONFIG_PXA_SHARPSL is not set
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
#
# Linux As Bootloader
@@ -149,12 +153,7 @@ CONFIG_ARM_THUMB=y
CONFIG_XSCALE_PMU=y
#
-# Bus support
-#
-CONFIG_ISA_DMA_API=y
-
-#
-# Compaq/iPAQ Options
+# Compaq/iPAQ Platforms
#
CONFIG_PXA_IPAQ=y
@@ -162,11 +161,24 @@ CONFIG_PXA_IPAQ=y
# XScale-based iPAQ
#
CONFIG_IPAQ_HANDHELD=y
+
+#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
# CONFIG_IPAQ_SLEEVE is not set
# CONFIG_IPAQ_SAMCOP is not set
# CONFIG_IPAQ_HAMCOP is not set
#
+# Bus support
+#
+CONFIG_ISA_DMA_API=y
+
+#
# PCCARD (PCMCIA/CardBus) support
#
CONFIG_PCCARD=m
@@ -335,10 +347,8 @@ CONFIG_MTD_IPAQ=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=y
+# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=12288
-CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CDROM_PKTCDVD is not set
@@ -367,7 +377,6 @@ CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
# CONFIG_IDE_TASK_IOCTL is not set
#
@@ -690,7 +699,6 @@ CONFIG_NET_RADIO=y
#
# CONFIG_AIRO_CS is not set
# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_ACX100 is not set
CONFIG_NET_WIRELESS=y
# CONFIG_HOSTAP is not set
@@ -737,7 +745,6 @@ CONFIG_INPUT=y
# Userland interfaces
#
# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=m
@@ -1040,6 +1047,8 @@ CONFIG_SND_GENERIC_PM=y
#
# ALSA ARM devices
#
+# CONFIG_SND_A716 is not set
+# CONFIG_SND_H1910 is not set
# CONFIG_SND_H2200 is not set
CONFIG_SND_HX4700=m
# CONFIG_SND_PXA2XX_UDA1380 is not set
@@ -1091,9 +1100,9 @@ CONFIG_USB_PXA27X=m
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_G_CHAR is not set
#
@@ -1122,7 +1131,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
# CONFIG_EXT2_FS_SECURITY is not set
# CONFIG_EXT3_FS is not set
# CONFIG_JBD is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
@@ -1233,7 +1242,7 @@ CONFIG_MSDOS_PARTITION=y
# Native Language Support
#
CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
diff --git a/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty b/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty
diff --git a/packages/sqlite/sqlite3-3.2.5/cross-compile.patch b/packages/sqlite/sqlite3-3.2.5/cross-compile.patch
new file mode 100644
index 0000000000..aaafaa590c
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.2.5/cross-compile.patch
@@ -0,0 +1,84 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: sqlite-3.2.1/configure.ac
+===================================================================
+--- sqlite-3.2.1.orig/configure.ac 2005-03-23 17:08:39.000000000 +0100
++++ sqlite-3.2.1/configure.ac 2005-04-25 23:02:40.000000000 +0200
+@@ -186,10 +186,11 @@
+ default_build_cflags="-g"
+ if test "$config_BUILD_CC" = ""; then
+ AC_PROG_CC
+- if test "$cross_compiling" = "yes"; then
+- AC_MSG_ERROR([unable to find a compiler for building build tools])
+- fi
+- BUILD_CC=$CC
++# if test "$cross_compiling" = "yes"; then
++# AC_MSG_ERROR([unable to find a compiler for building build tools])
++# fi
++# BUILD_CC=$CC
++ BUILD_CC=gcc
+ default_build_cflags=$CFLAGS
+ else
+ BUILD_CC=$config_BUILD_CC
+@@ -539,55 +540,14 @@
+ # Figure out what C libraries are required to compile programs
+ # that use "readline()" library.
+ #
+-if test "$config_TARGET_READLINE_LIBS" != ""; then
+- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
+-else
+- CC=$TARGET_CC
+- LIBS=""
+- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
+- AC_CHECK_LIB([readline], [readline])
+- TARGET_READLINE_LIBS="$LIBS"
+-fi
++TARGET_READLINE_LIBS="-lreadline"
+ AC_SUBST(TARGET_READLINE_LIBS)
+
+ ##########
+ # Figure out where to get the READLINE header files.
+ #
+-AC_MSG_CHECKING([readline header files])
+-found=no
+-if test "$config_TARGET_READLINE_INC" != ""; then
+- TARGET_READLINE_INC=$config_TARGET_READLINE_INC
+- found=yes
+-fi
+-if test "$found" = "yes"; then
+- AC_MSG_RESULT($TARGET_READLINE_INC)
+-else
+- AC_MSG_RESULT(not specified: still searching...)
+- AC_CHECK_HEADER(readline.h, [found=yes])
+-fi
+-if test "$found" = "no"; then
+- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
+- AC_CHECK_FILE($dir/include/readline.h, found=yes)
+- if test "$found" = "yes"; then
+- TARGET_READLINE_INC="-I$dir/include"
+- break
+- fi
+- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
+- if test "$found" = "yes"; then
+- TARGET_READLINE_INC="-I$dir/include/readline"
+- break
+- fi
+- done
+-fi
+-if test "$found" = "yes"; then
+- if test "$TARGET_READLINE_LIBS" = ""; then
+- TARGET_HAVE_READLINE=0
+- else
+- TARGET_HAVE_READLINE=1
+- fi
+-else
+- TARGET_HAVE_READLINE=0
+-fi
++TARGET_READLINE_INC=""
++TARGET_HAVE_READLINE=1
+ AC_SUBST(TARGET_READLINE_INC)
+ AC_SUBST(TARGET_HAVE_READLINE)
+
diff --git a/packages/sqlite/sqlite3-3.2.5/ldflags.patch b/packages/sqlite/sqlite3-3.2.5/ldflags.patch
new file mode 100644
index 0000000000..7f40385f25
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.2.5/ldflags.patch
@@ -0,0 +1,77 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- sqlite-3.2.5/Makefile.in~ldflags
++++ sqlite-3.2.5/Makefile.in
+@@ -31,6 +31,10 @@
+ #
+ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
+
++# OE overrides
++#
++TARGET_LFLAGS = @TARGET_LFLAGS@
++
+ # Define -DNDEBUG to compile without debugging (i.e., for production usage)
+ # Omitting the define will cause extra debugging code to be inserted and
+ # includes extra comments when "EXPLAIN stmt" is used.
+@@ -235,17 +239,17 @@
+ | awk '{print $$5,$$6}' >last_change
+
+ libsqlite3.la: $(LIBOBJ)
+- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+ $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
+- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ -rpath $(libdir)/sqlite \
+ -version-info "8:6:8"
+
+ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
+- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
+ -o sqlite3 $(TOP)/src/shell.c libsqlite3.la $(LIBREADLINE)
+
+ # This target creates a directory named "tsrc" and fills it with
+@@ -419,18 +423,18 @@
+
+ tclsqlite3: tclsqlite-shell.lo libsqlite3.la
+ $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
+- libsqlite3.la $(LIBTCL)
++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+ testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
+ $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(TEMP_STORE) \
+ -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
+- libsqlite3.la $(LIBTCL)
++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+ crashtest$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) $(TOP)/src/os_test.c
+ $(LTLINK) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \
+ -o crashtest \
+ $(TESTSRC) $(TOP)/src/os_test.c $(TOP)/src/tclsqlite.c \
+- libsqlite3.la $(LIBTCL)
++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+
+
+--- sqlite-3.2.5/configure.ac~ldflags
++++ sqlite-3.2.5/configure.ac
+@@ -238,6 +238,13 @@
+ TARGET_LINK=$config_TARGET_LINK
+ fi
+ AC_MSG_RESULT($TARGET_LINK)
++AC_MSG_CHECKING([switches on the target linker])
++if test "$config_TARGET_LFLAGS" != ""; then
++ TARGET_LFLAGS=$config_TARGET_LFLAGS
++else
++ TARGET_LFLAGS=$BUILD_LFLAGS
++fi
++AC_MSG_RESULT($TARGET_LFLAGS)
+ AC_MSG_CHECKING([switches on the target compiler])
+ if test "$config_TARGET_TFLAGS" != ""; then
+ TARGET_TFLAGS=$config_TARGET_TFLAGS
diff --git a/packages/sqlite/sqlite3-3.2.5/libtool.patch b/packages/sqlite/sqlite3-3.2.5/libtool.patch
new file mode 100644
index 0000000000..ccf9993ed2
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.2.5/libtool.patch
@@ -0,0 +1,25 @@
+Index: sqlite-3.2.1/Makefile.in
+===================================================================
+--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100
++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200
+@@ -15,7 +15,10 @@
+ # The toplevel directory of the source tree. This is the directory
+ # that contains this "Makefile.in" and the "configure.in" script.
+ #
+-TOP = @srcdir@
++TOP = $(srcdir)
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = .
+
+ # C Compiler and options for use in building executables that
+ # will run on the platform that is doing the build.
+@@ -96,7 +99,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ INSTALL = @INSTALL@
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ ALLOWRELEASE = @ALLOWRELEASE@
+
+ # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3_3.2.5.bb b/packages/sqlite/sqlite3_3.2.5.bb
new file mode 100644
index 0000000000..a133f832a9
--- /dev/null
+++ b/packages/sqlite/sqlite3_3.2.5.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "An Embeddable SQL Database Engine"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "readline ncurses"
+LICENSE = "PD"
+
+SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
+ file://cross-compile.patch;patch=1 \
+ file://libtool.patch;patch=1 \
+ file://ldflags.patch;patch=1"
+S = "${WORKDIR}/sqlite-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-tcl --enable-shared \
+ --enable-threadsafe"
+export config_BUILD_CC = "${BUILD_CC}"
+export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
+export config_BUILD_LIBS = "${BUILD_LDFLAGS}"
+export config_TARGET_CC = "${CC}"
+export config_TARGET_LINK = "${CCLD}"
+export config_TARGET_CFLAGS = "${CFLAGS}"
+export config_TARGET_LFLAGS = "${LDFLAGS}"
+
+do_compile_prepend() {
+ oe_runmake sqlite3.h
+ install -m 0644 sqlite3.h ${STAGING_INCDIR}
+}
+
+do_stage() {
+ oe_libinstall -so libsqlite3 ${STAGING_LIBDIR}
+}
+
+#do_install() {
+# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix}
+#}
+
+PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3"
+FILES_sqlite3 = "${bindir}/*"
+FILES_libsqlite = "${libdir}/*.so.*"
+FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
+ ${libdir}/pkgconfig ${includedir}"
+FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}"
+AUTO_LIBNAME_PKGS = "libsqlite"