summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/esmtp/esmtp_0.5.1.bb (renamed from packages/esmtp/esmtp_0.4.1.bb)6
-rw-r--r--packages/irk/irk-belkin_0.11.bb2
-rw-r--r--packages/irk/irk-targus_0.11.0.bb2
-rw-r--r--packages/kaffe/kaffe.inc2
-rw-r--r--packages/kaffe/kaffeh-native_1.1.5.bb2
-rw-r--r--packages/libesmtp/libesmtp-1.0.1/configure.patch45
-rw-r--r--packages/libesmtp/libesmtp_1.0.1.bb22
-rw-r--r--packages/libesmtp/libesmtp_1.0.4.bb (renamed from packages/libesmtp/libesmtp_1.0.3r1.bb)23
-rw-r--r--packages/meta/slugos-native.bb4
-rw-r--r--packages/meta/slugos-packages.bb22
-rw-r--r--packages/netbase/netbase/tosa/interfaces4
-rw-r--r--packages/php/php-5.0.5/autotools.patch90
-rw-r--r--packages/php/php-5.0.5/endianness.patch10
-rw-r--r--packages/php/php-5.1.4/.mtn2git_empty (renamed from packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty)0
-rw-r--r--packages/php/php-5.1.4/autotools.patch94
-rw-r--r--packages/php/php_5.0.5.bb60
-rw-r--r--packages/php/php_5.1.4.bb38
-rw-r--r--packages/rt2x00/.mtn2git_empty (renamed from packages/php/php-5.0.5/.mtn2git_empty)0
-rw-r--r--packages/rt2x00/rt2570_1.1.0-b2.bb17
-rw-r--r--packages/slcalc/slcalc_1.2.1.bb3
-rw-r--r--packages/sudo/sudo.inc1
-rw-r--r--packages/tasks/task-dvb.bb3
-rw-r--r--packages/tasks/task-mythfront.bb3
-rw-r--r--packages/ushare/.mtn2git_empty0
-rw-r--r--packages/ushare/ushare_0.9.7.bb10
-rw-r--r--packages/xqt/xqt_0.0.9.bb4
26 files changed, 202 insertions, 265 deletions
diff --git a/packages/esmtp/esmtp_0.4.1.bb b/packages/esmtp/esmtp_0.5.1.bb
index 081c7ab208..2ab587a505 100644
--- a/packages/esmtp/esmtp_0.4.1.bb
+++ b/packages/esmtp/esmtp_0.5.1.bb
@@ -1,10 +1,10 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "libesmtp"
DESCRIPTION = "ESMTP is a user-configurable relay-only MTA \
with a sendmail-compatible syntax, based on libESMTP and \
supporting the AUTH (including the CRAM-MD5 and NTLM SASL \
mechanisms) and StartTLS SMTP extensions."
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "libesmtp"
SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2"
diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb
index b743544903..e543ebdcc5 100644
--- a/packages/irk/irk-belkin_0.11.bb
+++ b/packages/irk/irk-belkin_0.11.bb
@@ -5,5 +5,5 @@ RCONFLICTS = "irk-targus"
RREPLACES = "irk-targus"
PR = "r3"
-SRC_URI = "http://kopsisengineering.com/irk-current.tgz \
+SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz \
file://install-default-conf.patch;patch=1"
diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb
index 1b130776a8..87b74cb5eb 100644
--- a/packages/irk/irk-targus_0.11.0.bb
+++ b/packages/irk/irk-targus_0.11.0.bb
@@ -7,5 +7,5 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
RCONFLICTS = "irk-belkin"
RREPLACES = "irk-belkin"
-SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${PV}.tgz \
+SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-${PV}.tgz \
file://install-default-conf.patch;patch=1"
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index ea308f1043..2d536b3dea 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.kaffe.org/"
LICENSE = "GPL LGPL W3C Classpath BSD"
DEPENDS = "jikes-native fastjar-native libffi zip-native"
+RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
SRC_URI += "file://disable-automake-checks.patch;patch=1"
@@ -45,7 +46,6 @@ oe_runconf () {
PACKAGES =+ "${PN}-common"
FILES_${PN} += "${libdir}/${PN}"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
do_install () {
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index 54737ce8f6..d4d6287592 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -4,6 +4,8 @@ PR = "r3"
require kaffe.inc
+RDEPENDS_${PN} = ""
+
inherit native
EXTRA_OECONF = "--disable-alsatest \
diff --git a/packages/libesmtp/libesmtp-1.0.1/configure.patch b/packages/libesmtp/libesmtp-1.0.1/configure.patch
deleted file mode 100644
index 5058db4b99..0000000000
--- a/packages/libesmtp/libesmtp-1.0.1/configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libesmtp-1.0.1/configure.in~configure 2003-09-11 17:23:26.000000000 -0400
-+++ libesmtp-1.0.1/configure.in 2004-01-20 11:59:35.000000000 -0500
-@@ -231,7 +231,7 @@
- if test x$enable_emulate_getaddrinfo != xyes ; then
- AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo])
- fi
-- LIBOBJS="$LIBOBJS getaddrinfo.o"
-+ AC_LIBOBJ([getaddrinfo])
- fi
-
- if test x"$enable_emulate_getaddrinfo" != xno ; then
-@@ -259,7 +259,7 @@
- AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, ,
- [AC_MSG_ERROR([cannot find gethostbyname])])
- fi
-- LIBOBJS="$LIBOBJS gethostbyname.o"
-+ AC_LIBOBJ([gethostbyname])
-
- AC_CACHE_CHECK([for IPv6 support], acx_cv_sys_use_ipv6, [
- AC_TRY_COMPILE([
-@@ -572,7 +572,7 @@
- dnl #########################################################################
- dnl Check that snprintf works correctly.
- dnl #########################################################################
--ACX_SNPRINTF(,[LIBOBJS="$LIBOBJS snprintf.o"])
-+ACX_SNPRINTF(,[AC_LIBOBJ([snprintf])])
-
- dnl #########################################################################
- dnl Make substitutions
-@@ -588,8 +588,8 @@
- AC_SUBST(RANLIB)
- AC_SUBST(subdirs)
-
--LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
--AC_SUBST(LTLIBOBJS)
-+#LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
-+#AC_SUBST(LTLIBOBJS)
- LTALLOCA=`echo "$ALLOCA" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
- AC_SUBST(LTALLOCA)
-
diff --git a/packages/libesmtp/libesmtp_1.0.1.bb b/packages/libesmtp/libesmtp_1.0.1.bb
deleted file mode 100644
index fe6d958f1b..0000000000
--- a/packages/libesmtp/libesmtp_1.0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "libs"
-DEPENDS = "openssl"
-DESCRIPTION = "LibESMTP is a library to manage posting \
-(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
-
-SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2 \
- file://configure.patch;patch=1"
-LICENSE = "LGPL GPL"
-inherit autotools
-
-EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-
-do_stage () {
- oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}
- install -m 644 auth-client.h ${STAGING_INCDIR}
- install -m 644 auth-plugin.h ${STAGING_INCDIR}
- install -m 644 libesmtp.h ${STAGING_INCDIR}
-}
diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.4.bb
index baff0d8931..294333c579 100644
--- a/packages/libesmtp/libesmtp_1.0.3r1.bb
+++ b/packages/libesmtp/libesmtp_1.0.4.bb
@@ -1,22 +1,19 @@
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "openssl"
DESCRIPTION = "LibESMTP is a library to manage posting \
(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
+preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
+LICENSE = "GPL"
+SECTION = "libs/network"
+DEPENDS = "openssl"
+PR = "r1"
SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
-inherit autotools
+inherit autotools binconfig
EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-do_stage () {
- oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}
- install -m 644 auth-client.h ${STAGING_INCDIR}
- install -m 644 auth-plugin.h ${STAGING_INCDIR}
- install -m 644 libesmtp.h ${STAGING_INCDIR}
+do_stage() {
+ autotools_stage_all
}
+
+FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 7af7f7961a..e3988aa8a2 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
#
DESCRIPTION = "Packages that are required for the SlugOS native build environment"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
INHIBIT_DEFAULT_DEPS = "1"
EXCLUDE_FROM_WORLD = "1"
@@ -28,7 +28,6 @@ SLUGOS_NATIVE_RT = "\
gcc gcc-symlinks \
gdbm \
libstdc++-dev \
- libc6-dev \
ncurses-dev ncurses-terminfo \
perl perl-modules \
python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
@@ -37,6 +36,7 @@ SLUGOS_NATIVE_RT = "\
# Run-time and DEPENDS
SLUGOS_NATIVE_prepend_linux = "\
+ libc6-dev \
"
SLUGOS_NATIVE_prepend_linux-uclibc = "\
libiconv \
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index ec42c59c64..241f999999 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
CONFLICTS = "db3"
PROVIDES += "${SLUGOS_IMAGENAME}-packages"
@@ -14,11 +14,13 @@ EXCLUDE_FROM_WORLD = "1"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = 1
-# The list of packages to build for the ucslugc DISTRO.
+# The list of packages to build for the slugos DISTRO.
# KEEP IN ALPHABETICAL ORDER
SLUGOS_PACKAGES = "\
alsa-lib \
- apr \
+ alsa-utils \
+ asterisk \
+ asterisk-sounds \
atftp \
audiofile \
aumix \
@@ -31,7 +33,6 @@ SLUGOS_PACKAGES = "\
bison \
bluez-libs \
bluez-utils-nodbus \
- boost \
bridge-utils \
bwmon \
bzip2 \
@@ -77,6 +78,7 @@ SLUGOS_PACKAGES = "\
ifupdown \
ipkg-utils \
iptables \
+ ircp \
joe \
jpeg \
lcdproc \
@@ -92,10 +94,10 @@ SLUGOS_PACKAGES = "\
libol \
libpng \
libtool \
+ libupnp \
libusb \
libvorbis \
libxml2 \
- linphone \
lirc \
lrzsz \
lsof \
@@ -154,7 +156,6 @@ SLUGOS_PACKAGES = "\
ssmtp \
strace \
streamripper \
- sudo \
sysfsutils \
syslog-ng \
tar \
@@ -162,6 +163,7 @@ SLUGOS_PACKAGES = "\
tiff \
unzip \
usbutils \
+ ushare \
util-linux \
vim \
vlan \
@@ -199,11 +201,11 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
# These packages work with glibc, but break on uclibc.
UCLIBC_BROKEN_PACKAGES = "\
- alsa-utils \
- asterisk \
- asterisk-sounds \
+ apr \
bogofilter \
- ircp \
+ boost \
+ linphone \
+ sudo \
"
# Packages which build only with glibc (some of these use internal
diff --git a/packages/netbase/netbase/tosa/interfaces b/packages/netbase/netbase/tosa/interfaces
index 92b022475c..0da7168535 100644
--- a/packages/netbase/netbase/tosa/interfaces
+++ b/packages/netbase/netbase/tosa/interfaces
@@ -9,8 +9,8 @@ iface wlan0 inet dhcp
wireless_type wlan-ng
wireless_mode Managed
pre-up modprobe prism2_usb
- pre-up /sbin/usbctl on 1
- post-down /sbin/usbctl off 1
+# pre-up /sbin/usbctl on 1
+# post-down /sbin/usbctl off 1
post-down rmmod prism2_usb
# Wired or wireless interfaces
diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch
deleted file mode 100644
index 7e466a425e..0000000000
--- a/packages/php/php-5.0.5/autotools.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4
---- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700
-@@ -781,10 +781,10 @@
- OVERALL_TARGET=[]ifelse($1,,php,$1)
- php_c_pre='$(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-- php_c_post=' && echo > $[@]'
-+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
- php_cxx_pre='$(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-- php_cxx_post=' && echo > $[@]'
-+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
- php_lo=o
-
- case $with_pic in
-@@ -1531,6 +1531,7 @@
-
- dnl even newer glibcs have a different seeker definition...
-
-+ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
- AC_TRY_RUN([
- #define _GNU_SOURCE
- #include <stdio.h>
-@@ -1560,8 +1561,8 @@
- }
-
- ],
-- [ cookie_io_functions_use_off64_t=yes ],
-- [ ] )
-+ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
-+ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
-
- else
- dnl older glibc versions (up to 2.1.2 ?)
-diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in
---- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700
-@@ -247,7 +247,7 @@
- sinclude(Zend/acinclude.m4)
- sinclude(Zend/Zend.m4)
- sinclude(TSRM/tsrm.m4)
--
-+sinclude(TSRM/threads.m4)
-
-
- divert(2)
-diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4
---- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700
-@@ -1,7 +1,5 @@
- dnl This file becomes configure.in for self-contained extensions.
-
--AC_INIT(config.m4)
--
- PHP_INIT_BUILD_SYSTEM
-
- AC_DEFUN([PHP_WITH_PHP_CONFIG],[
-@@ -55,8 +53,6 @@
- PHP_PROG_RE2C
- AC_PROG_AWK
-
--sinclude(config.m4)
--
- enable_static=no
- enable_shared=yes
-
-diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4
---- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700
-+++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700
-@@ -86,7 +86,7 @@
- pthreads_working=no
- ], [
- dnl For cross compiling running this test is of no use. NetWare supports pthreads
-- pthreads_working=no
-+ pthreads_working=yes
- case $host_alias in
- *netware*)
- pthreads_working=yes
-diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4
---- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700
-+++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700
-@@ -68,7 +68,6 @@
- ])
-
- sinclude(threads.m4)
--sinclude(TSRM/threads.m4)
-
- AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch
deleted file mode 100644
index 0231727c33..0000000000
--- a/packages/php/php-5.0.5/endianness.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- php-5.0.5/Zend/zend_strtod.c~ 2005-10-10 19:58:06.000000000 -0700
-+++ php-5.0.5/Zend/zend_strtod.c 2005-10-10 20:21:35.000000000 -0700
-@@ -130,6 +130,7 @@
- * but the word order is big endian.
- */
- #define IEEE_BIG_ENDIAN
-+#undef IEEE_LITTLE_ENDIAN
- #endif
-
- #ifdef __vax__
diff --git a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty
+++ b/packages/php/php-5.1.4/.mtn2git_empty
diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch
new file mode 100644
index 0000000000..d198c8e36d
--- /dev/null
+++ b/packages/php/php-5.1.4/autotools.patch
@@ -0,0 +1,94 @@
+diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4
+--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400
++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400
+@@ -818,10 +818,10 @@
+ OVERALL_TARGET=[]ifelse($1,,php,$1)
+ php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+ php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+- php_c_post=
++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+ php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+- php_cxx_post=
++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+ php_lo=lo
+
+ case $with_pic in
+@@ -1670,6 +1670,7 @@
+ have_fopen_cookie=yes
+
+ dnl even newer glibcs have a different seeker definition...
++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
+ AC_TRY_RUN([
+ #define _GNU_SOURCE
+ #include <stdio.h>
+@@ -1702,10 +1703,11 @@
+ cookie_io_functions_use_off64_t=yes
+ ], [
+ cookie_io_functions_use_off64_t=no
+-], [
+- cookie_io_functions_use_off64_t=no
+-])
+-
++],
++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
++
++
+ else
+
+ dnl older glibc versions (up to 2.1.2 ?)
+diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in
+--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400
++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400
+@@ -209,6 +209,7 @@
+
+ sinclude(Zend/Zend.m4)
+ sinclude(TSRM/tsrm.m4)
++sinclude(TSRM/threads.m4)
+
+
+ divert(2)
+diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4
+--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400
++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400
+@@ -3,7 +3,6 @@
+ divert(1)
+
+ AC_PREREQ(2.13)
+-AC_INIT(config.m4)
+
+ PHP_CONFIG_NICE(config.nice)
+
+@@ -69,8 +68,6 @@
+ PHP_PROG_RE2C
+ PHP_PROG_AWK
+
+-sinclude(config.m4)
+-
+ enable_static=no
+ enable_shared=yes
+
+diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4
+--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400
++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400
+@@ -86,7 +86,7 @@
+ pthreads_working=no
+ ], [
+ dnl For cross compiling running this test is of no use. NetWare supports pthreads
+- pthreads_working=no
++ pthreads_working=yes
+ case $host_alias in
+ *netware*)
+ pthreads_working=yes
+diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4
+--- php-5.1.4~/TSRM/tsrm.m4 2005-05-29 19:16:40.000000000 -0400
++++ php-5.1.4/TSRM/tsrm.m4 2006-08-16 20:39:19.000000000 -0400
+@@ -68,7 +68,6 @@
+ ])
+
+ sinclude(threads.m4)
+-sinclude(TSRM/threads.m4)
+
+ AC_DEFUN([TSRM_CHECK_PTHREADS],[
+
diff --git a/packages/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb
deleted file mode 100644
index b4b721f85e..0000000000
--- a/packages/php/php_5.0.5.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-LICENSE = "PHP"
-DEPENDS = "zlib libxml2 mysql"
-SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
- file://autotools.patch;patch=1 \
- file://endianness.patch;patch=1"
-S = "${WORKDIR}/php-${PV}"
-
-inherit autotools
-
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
- --with-mysql=${STAGING_LIBDIR}/.. \
- --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
- --without-libpng --without-libjpeg \
- --with-config-file-path=${sysconfdir}/php5 \
- --cache-file=config.cache \
- --disable-debug \
- --disable-rpath \
- --enable-bcmath \
- --enable-calendar \
- --enable-maintainer-zts \
- --enable-embed=shared \
- --enable-force-cgi-redirect \
- --enable-ftp \
- --enable-inline-optimization \
- --enable-magic-quotes \
- --enable-memory-limit \
- --enable-pic \
- --enable-safe-mode \
- --enable-sockets \
- --enable-track-vars \
- --enable-trans-sid \
- --enable-wddx \
- --sysconfdir=/etc/appWeb \
- --with-exec-dir=/etc/appWeb/exec \
- --with-db \
- --with-regex=system \
- --with-pear \
- --with-xml \
- --with-xmlrpc \
- --with-zlib \
- --without-iconv"
-
-EXTRA_OECONF += " --without-pear"
-# Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
-#DEPENDS += " php-native"
-
-acpaths = ""
-
-do_configure_prepend() {
- find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
-}
-
-do_install () {
- oe_runmake 'INSTALL_ROOT=${D}' install
-}
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
new file mode 100644
index 0000000000..fc982a678c
--- /dev/null
+++ b/packages/php/php_5.1.4.bb
@@ -0,0 +1,38 @@
+SECTION = "console/network"
+DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
+MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>"
+LICENSE = "PHP"
+DEPENDS = "zlib libxml2 mysql libiconv"
+SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
+ file://autotools.patch;patch=1"
+S = "${WORKDIR}/php-${PV}"
+PR = "r1"
+
+inherit autotools
+
+export THREADS="pthread"
+export LIBS=" -lpthread "
+
+CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+EXTRA_OECONF = "--without-iconv \
+ --enable-discard-path \
+ --enable-sockets \
+ --enable-memory-limit \
+ --enable-wddx \
+ --with-zlib"
+
+EXTRA_OECONF += " --without-pear"
+# Uncomment the following two lines, and comment the above to enable PEAR
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#DEPENDS += " php-native"
+
+acpaths = ""
+
+do_configure_append() {
+ find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
+ find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
+do_install () {
+ oe_runmake 'INSTALL_ROOT=${D}' install
+}
diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/rt2x00/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/php-5.0.5/.mtn2git_empty
+++ b/packages/rt2x00/.mtn2git_empty
diff --git a/packages/rt2x00/rt2570_1.1.0-b2.bb b/packages/rt2x00/rt2570_1.1.0-b2.bb
new file mode 100644
index 0000000000..a3cc233351
--- /dev/null
+++ b/packages/rt2x00/rt2570_1.1.0-b2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Driver for Ralink rt2570 USB 802.11g WiFi sticks"
+HOMEPAGE = "http://rt2x00.serialmonkey.com/"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rt2400/rt2570-${PV}.tar.gz"
+
+inherit module
+
+S = "${WORKDIR}/${PN}-${PV}/Module/"
+
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+ install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb
index fa5720e0ce..a399defb76 100644
--- a/packages/slcalc/slcalc_1.2.1.bb
+++ b/packages/slcalc/slcalc_1.2.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Scientific calculator with user definable constants and functions
HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm"
SECTION = "opie/applications"
LICENSE = "GPL"
+PR = "r1"
APPTYPE = "binary"
APPDESKTOP = "${S}"
@@ -14,5 +15,5 @@ S = "${WORKDIR}/slcalc_source"
do_install() {
install -d ${D}${palmtopdir}/pics
- install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/
+ install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/slcalc.png
}
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index 92d3c47266..0dfb22ba8a 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -1,4 +1,3 @@
-SECTION = "base"
DESCRIPTION = "Sudo (superuser do) allows a system \
administrator to give certain users (or groups of \
users) the ability to run some (or all) commands \
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 5a5c37a565..335ab27e8d 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -7,3 +7,6 @@ PR = "r5"
RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
LICENSE = MIT
+
+# there is a -march=586 somewhere in the source tree of mythtv
+COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index a1532c1739..a938a12e57 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -7,3 +7,6 @@ PR = "r6"
RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm"
LICENSE = MIT
+
+# there is a -march=586 somewhere in the source tree of mythtv
+COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/packages/ushare/.mtn2git_empty b/packages/ushare/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ushare/.mtn2git_empty
diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb
new file mode 100644
index 0000000000..a922fed2d0
--- /dev/null
+++ b/packages/ushare/ushare_0.9.7.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "ushare is a UPnP media server"
+LICENSE = "GPL"
+HOMEPAGE = "http://ushare.geexbox.org/"
+MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
+DEPENDS = "libupnp"
+SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2"
+S = "${WORKDIR}/ushare-${PV}"
+PR = "r0"
+
+inherit autotools
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index d5a8e70332..0c7a77e7f9 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -2,15 +2,13 @@ HOMEPAGE = "http://xqt.sourceforge.jp"
LICENSE = "GPL"
SECTION = "x11"
-
SRCDATE = "20041111"
-DEPENDS = "freetype libxi libxmu flex-2.5.4-native virtual/libqte2 libqpe-opie"
+DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie"
SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
file://moc_call.patch;patch=1 "
-
S = "${WORKDIR}/xc"
do_configure() {