[oe-commits] org.oe.dev merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
Laibsch commit
openembedded-commits at lists.openembedded.org
Fri Feb 1 10:08:46 UTC 2008
merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
and '7c64c197c0b8e2b8661ee6bd11dbca6873ccb812'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8
ViewMTN: http://monotone.openembedded.org/revision/info/106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8
Files:
1
conf/checksums.ini
packages/php/php-native_4.4.4.bb
packages/php/php-native_5.2.0.bb
packages/php/php.inc
packages/php/php_4.4.4.bb
packages/php/php_5.1.4.bb
packages/php/php_5.2.0.bb
packages/linux/linux_2.6.23.bb
Diffs:
#
# mt diff -r723287caa1b0cd2e362ab6dd69f9e8db2eaca821 -r106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8
#
#
#
# patch "conf/checksums.ini"
# from [f3de66c07704795e4d713a57ccd83f857a134a2b]
# to [d46efbb6c50b6c05af0157650b6e3e6a51f5243d]
#
# patch "packages/php/php-native_4.4.4.bb"
# from [9eeba9981baf41f97fef5af6e2cdcfc742a57d6e]
# to [47e925f0ddbe96be21e9dba73e3412fe38ce6f0a]
#
# patch "packages/php/php-native_5.2.0.bb"
# from [18904fb48790405a599d27c48c958710902b361b]
# to [d63921a825ab9861b0bdfe0b1f761b44f25c414e]
#
# patch "packages/php/php.inc"
# from [c315473a94a1152128b9a5e36265761e013dff8d]
# to [05d469fc771d0798c8e8fc750ab8e1c1dde63c41]
#
# patch "packages/php/php_4.4.4.bb"
# from [830201995cc4ff74cc2704326cd886ada812d1e0]
# to [fb6d405a03a5996ba1806426b0a905791173e301]
#
# patch "packages/php/php_5.1.4.bb"
# from [9c66e44fe96affb7d82ed7a6bc9371c158f7d081]
# to [e3f518eac4c616faa17ae879f81b81abae3ad3e2]
#
# patch "packages/php/php_5.2.0.bb"
# from [f5e6351133ed8a63775ea4f3df9f159865e7d2c4]
# to [a163ebe31efaf24ca70addf00fa32e5b9c85c89a]
#
============================================================
--- conf/checksums.ini f3de66c07704795e4d713a57ccd83f857a134a2b
+++ conf/checksums.ini d46efbb6c50b6c05af0157650b6e3e6a51f5243d
@@ -8890,7 +8890,7 @@ sha256=e14546d11e899e7e9f06ca58979fee14b
md5=195b684e025ff5c15617d6f757cf631f
sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d
-[http://de3.php.net/distributions/php-4.4.4.tar.bz2]
+[http://museum.php.net/php4/php-4.4.4.tar.bz2]
md5=bc6fa8908e2ac36e93bab9f7d42cda3a
sha256=9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
============================================================
--- packages/php/php-native_4.4.4.bb 9eeba9981baf41f97fef5af6e2cdcfc742a57d6e
+++ packages/php/php-native_4.4.4.bb 47e925f0ddbe96be21e9dba73e3412fe38ce6f0a
@@ -1,5 +1,6 @@ DEPENDS = "zlib-native"
SECTION = "console/network"
require php_${PV}.bb
inherit native
FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
DEPENDS = "zlib-native"
+PR = "r1"
============================================================
--- packages/php/php-native_5.2.0.bb 18904fb48790405a599d27c48c958710902b361b
+++ packages/php/php-native_5.2.0.bb d63921a825ab9861b0bdfe0b1f761b44f25c414e
@@ -6,4 +6,4 @@ DEPENDS = "zlib-native libxml2-native"
FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
DEPENDS = "zlib-native libxml2-native"
+PR = "r1"
-
============================================================
--- packages/php/php.inc c315473a94a1152128b9a5e36265761e013dff8d
+++ packages/php/php.inc 05d469fc771d0798c8e8fc750ab8e1c1dde63c41
@@ -1,11 +1,13 @@
-SECTION = "console/network"
DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
+HOMEPAGE = "http://www.php.net"
+SECTION = "console/network"
LICENSE = "PHP"
-SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
- file://${FILESDIR}/autotools.patch;patch=1 \
- file://${FILESDIR}/pear.patch;patch=1"
-S = "${WORKDIR}/php-${PV}"
+DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native"
+SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
+ file://autotools.patch;patch=1 \
+ file://acinclude-xml2-config.patch;patch=1"
+
inherit autotools
CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
============================================================
--- packages/php/php_4.4.4.bb 830201995cc4ff74cc2704326cd886ada812d1e0
+++ packages/php/php_4.4.4.bb fb6d405a03a5996ba1806426b0a905791173e301
@@ -1 +1,8 @@ require php.inc
require php.inc
+
+PR = "r1"
+
+SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \
+ file://${FILESDIR}/autotools.patch;patch=1 \
+ file://${FILESDIR}/pear.patch;patch=1"
+
============================================================
--- packages/php/php_5.1.4.bb 9c66e44fe96affb7d82ed7a6bc9371c158f7d081
+++ packages/php/php_5.1.4.bb e3f518eac4c616faa17ae879f81b81abae3ad3e2
@@ -1,21 +1,12 @@
-SECTION = "console/network"
-DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-LICENSE = "PHP"
-DEPENDS = "zlib libxml2 mysql virtual/libiconv"
+require php.inc
-SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
- file://autotools.patch;patch=1 \
- file://acinclude-xml2-config.patch;patch=1"
+PR = "r3"
-S = "${WORKDIR}/php-${PV}"
-PR = "r2"
-
inherit autotools
export THREADS="pthread"
export LIBS=" -lpthread "
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
EXTRA_OECONF = "--without-iconv \
--enable-discard-path \
--enable-sockets \
@@ -28,13 +19,7 @@ EXTRA_OECONF += " --without-pear --with-
#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/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
-}
============================================================
--- packages/php/php_5.2.0.bb f5e6351133ed8a63775ea4f3df9f159865e7d2c4
+++ packages/php/php_5.2.0.bb a163ebe31efaf24ca70addf00fa32e5b9c85c89a
@@ -1,22 +1,12 @@
-SECTION = "console/network"
-DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-LICENSE = "PHP"
-DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native"
+require php.inc
-SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
- file://autotools.patch;patch=1 \
- file://acinclude-xml2-config.patch;patch=1 \
- file://pear-makefile.patch;patch=1 \
- "
-S = "${WORKDIR}/php-${PV}"
-PR = "r1"
+PR = "r2"
-inherit autotools
+SRC_URI += "file://pear-makefile.patch;patch=1 "
export THREADS="pthread"
export LIBS=" -lpthread "
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
EXTRA_OECONF = " --without-iconv \
--enable-discard-path \
--enable-sockets \
@@ -29,28 +19,16 @@ EXTRA_OECONF = " --without-iconv \
--with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
"
-
-
-
-# Uncomment the following two lines, and comment the above to enable PEAR
EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}"
export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"
export PHP_PEAR_PHP_BIN="/usr/bin/php"
-acpaths = ""
-
do_configure_append() {
find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
}
-do_install () {
- oe_runmake 'INSTALL_ROOT=${D}' install
-}
-
-
-
PACKAGES = "${PN}-dbg \
${PN}-cli \
${PN}-pear \
@@ -76,17 +54,12 @@ FILES_${PN}-pear ="/usr/bin/p
/usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \
/usr/lib/php/.lock"
-
FILES_${PN}-dev ="/usr/include/php /usr/include/build \
/usr/bin/phpize /usr/bin/php-config"
FILES_${PN} ="/usr/lib/php"
FILES_${PN} +="/usr/bin"
-
-
RDEPENDS_${PN}-pear =${PN}
RDEPENDS_${PN}-cli =${PN}
RDEPENDS_${PN}-dev =${PN}
-
-
#
# mt diff -r7c64c197c0b8e2b8661ee6bd11dbca6873ccb812 -r106bb23e9f7ef1f5ea827a00c3a0303c3fe5f8a8
#
#
#
# patch "packages/linux/linux_2.6.23.bb"
# from [8ad01fe63d105bb77ac6f9c29bb95d4288cc9b0b]
# to [a6f0a73d2b5930f50b709b6669aa86d7f65a6d74]
#
============================================================
--- packages/linux/linux_2.6.23.bb 8ad01fe63d105bb77ac6f9c29bb95d4288cc9b0b
+++ packages/linux/linux_2.6.23.bb a6f0a73d2b5930f50b709b6669aa86d7f65a6d74
@@ -26,8 +26,6 @@ SRC_URI += "http://kamikaze.waninkoko.in
SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
# Add support for squashfs-lzma (a highly compressed read-only filesystem)
SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1"
-# Completely fair scheduler
-SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
# The Atmel patch doesn't apply against 2.6.23.12 :(
SRC_URI_avr32 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
More information about the Openembedded-commits
mailing list