summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini8
-rw-r--r--recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb17
-rw-r--r--recipes/libqpe/libqpe-opie.inc3
-rw-r--r--recipes/libqpe/libqpe-opie_1.2.2.bb2
-rw-r--r--recipes/libqpe/libqpe-opie_1.2.3.bb2
-rw-r--r--recipes/libqpe/libqpe-opie_1.2.4.bb2
-rw-r--r--recipes/libqpe/libqpe-opie_cvs.bb2
-rw-r--r--recipes/linux/linux-h1940_2.6.14-h1940.bb4
-rw-r--r--recipes/linux/linux_2.6.14.bb4
-rw-r--r--recipes/php/php_5.2.11.bb11
10 files changed, 33 insertions, 22 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index f7b44d4d56..3bf98541fe 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7898,6 +7898,10 @@ sha256=fa1b97a6d9d2f7d7699f6b0ccd433ab132c7d10835b449ed14b12b48e7749aad
md5=d133e77f625c496ae9d58629d7443596
sha256=b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f
+[http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch]
+md5=d7ec27a9b44eed194426038640af5460
+sha256=70e8e8230390fb355d62270764f18f6b553bcb9383ddabfbed4a1238b0e79b80
+
[http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch]
md5=230b98276779339a4102abdb1c36197a
sha256=866d1e45a575f448148c227f60cde4c8b607c51f179da3a7ec1acb5036b8e3ec
@@ -26894,6 +26898,10 @@ sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
md5=64c54d43787339a7cced48390eb3e1d0
sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
+[http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch]
+md5=e0b42e51630e9cd7e3b0adf1be42f4a1
+sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571
+
[http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch]
md5=e0b42e51630e9cd7e3b0adf1be42f4a1
sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571
diff --git a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
index fbf5f61a39..f3434e16f9 100644
--- a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
+++ b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
@@ -4,14 +4,15 @@ HOMEPAGE = "http://www.ez-ipupdate.com/"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
-SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz"
-SRC_URI += "file://configure.patch;patch=1"
-SRC_URI += "file://conffile.patch;patch=1"
-SRC_URI += "file://zoneedit.patch;patch=1"
-SRC_URI += "file://init"
-SRC_URI += "file://ipupdate.conf"
+SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://conffile.patch;patch=1 \
+ file://zoneedit.patch;patch=1 \
+ file://init \
+ file://ipupdate.conf \
+ "
INITSCRIPT_NAME = "ipupdate"
# No dependencies, so just go in at the standard level (20)
@@ -22,8 +23,6 @@ CONFFILES_${PN} = "${sysconfdir}/ipupdate.conf"
inherit autotools update-rc.d
-PACKAGES += "ez-ipupdate"
-
do_install_append() {
install -d "${D}${sysconfdir}/init.d"
install -c -m 755 ${WORKDIR}/init "${D}${sysconfdir}/init.d/ipupdate"
diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc
index ebb49c0658..3cecedd071 100644
--- a/recipes/libqpe/libqpe-opie.inc
+++ b/recipes/libqpe/libqpe-opie.inc
@@ -6,10 +6,11 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc-native virtual/libqte2"
PROVIDES = "virtual/libqpe1"
-
+INC_PR = "r7"
S = "${WORKDIR}/library"
inherit palmtop
+inherit opie
OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
QMAKE_PROFILES = "library.pro"
diff --git a/recipes/libqpe/libqpe-opie_1.2.2.bb b/recipes/libqpe/libqpe-opie_1.2.2.bb
index 009a075091..b209780ff7 100644
--- a/recipes/libqpe/libqpe-opie_1.2.2.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.2.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PR = "r3"
+PR = "${INC_PR}.0"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb
index 0822385b9d..1a74e3a156 100644
--- a/recipes/libqpe/libqpe-opie_1.2.3.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.3.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PR = "r3"
+PR = "${INC_PR}.0"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index 8c2abc7af6..5c1690ec12 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PR = "r0"
+PR = "${INC_PR}.0"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb
index 49c1a934e3..8ed2f4d88b 100644
--- a/recipes/libqpe/libqpe-opie_cvs.bb
+++ b/recipes/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "${INC_PR}.0"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
diff --git a/recipes/linux/linux-h1940_2.6.14-h1940.bb b/recipes/linux/linux-h1940_2.6.14-h1940.bb
index 5a657eb0b5..0669600a98 100644
--- a/recipes/linux/linux-h1940_2.6.14-h1940.bb
+++ b/recipes/linux/linux-h1940_2.6.14-h1940.bb
@@ -6,8 +6,8 @@ COMPATIBLE_HOST = "arm.*-linux"
COMPATIBLE_MACHINE = "h1940"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \
- http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
- http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch;patch=1 \
+ http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
+ http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/linux-2.6.14"
diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb
index c7e5e614fc..702246bd8f 100644
--- a/recipes/linux/linux_2.6.14.bb
+++ b/recipes/linux/linux_2.6.14.bb
@@ -9,8 +9,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://defconfig"
SRC_URI_append_acern30 = "\
- http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
- http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \
+ http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
+ http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \
file://n30-cleanup.patch;patch=1 \
file://n35.patch;patch=1 \
file://n30-lcd.patch;patch=1 \
diff --git a/recipes/php/php_5.2.11.bb b/recipes/php/php_5.2.11.bb
index 058f1c2554..5b4871cbc7 100644
--- a/recipes/php/php_5.2.11.bb
+++ b/recipes/php/php_5.2.11.bb
@@ -1,9 +1,9 @@
require php.inc
-DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql \
+DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
libc-client openssl"
-PR = "r2"
+PR = "r4"
SRC_URI += "file://pear-makefile.patch;patch=1 \
file://imap-fix-autofoo.patch;patch=1 \
@@ -19,7 +19,7 @@ EXTRA_OECONF = " --without-iconv \
--enable-pcntl \
--enable-memory-limit \
--enable-wddx \
- --enable-embedded-mysqli \
+ --disable-embedded-mysqli \
--enable-magic-quotes \
--enable-fastcgi \
--with-imap=${STAGING_DIR_HOST} \
@@ -27,7 +27,8 @@ EXTRA_OECONF = " --without-iconv \
--with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
--with-libxml-dir=${STAGING_BINDIR_CROSS} \
--with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
-# --with-mysqli = "${STAGING_BINDIR_NATIVE}/mysql_config" \
+ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
+ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
--without-pdo-sqlite \
"
@@ -35,6 +36,8 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
export PHP_PEAR_PHP_BIN = "${bindir}/php"
+#LDFLAGS += "-lstdc++"
+
do_configure_append() {
find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
}