[oe-commits] org.oe.dev merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'

[oe commit]

merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
     and 'c07273f2dc49a66c31c6d5d925b7e24647366621'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6
ViewMTN: http://monotone.openembedded.org/revision/info/1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6
Files:
1
conf/checksums.ini
packages/php/php.inc
packages/php/php_4.4.4.bb
packages/linux/linux_2.6.23.bb
Diffs:

#
# mt diff -r723287caa1b0cd2e362ab6dd69f9e8db2eaca821 -r1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6
#
# 
# 
# patch "conf/checksums.ini"
#  from [f3de66c07704795e4d713a57ccd83f857a134a2b]
#    to [d46efbb6c50b6c05af0157650b6e3e6a51f5243d]
# 
# patch "packages/php/php.inc"
#  from [c315473a94a1152128b9a5e36265761e013dff8d]
#    to [508ecdf25eecda53c8974fc5cc1d6860ea2bf249]
# 
# patch "packages/php/php_4.4.4.bb"
#  from [830201995cc4ff74cc2704326cd886ada812d1e0]
#    to [ccbb4f51dad415ff80918799b53c0e15d84ae316]
# 
============================================================
--- 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.inc	c315473a94a1152128b9a5e36265761e013dff8d
+++ packages/php/php.inc	508ecdf25eecda53c8974fc5cc1d6860ea2bf249
@@ -1,10 +1,10 @@
-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}"
 
 inherit autotools
 
============================================================
--- packages/php/php_4.4.4.bb	830201995cc4ff74cc2704326cd886ada812d1e0
+++ packages/php/php_4.4.4.bb	ccbb4f51dad415ff80918799b53c0e15d84ae316
@@ -1 +1,6 @@ require php.inc
 require php.inc
+
+SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \
+           file://${FILESDIR}/autotools.patch;patch=1 \
+           file://${FILESDIR}/pear.patch;patch=1"
+


#
# mt diff -rc07273f2dc49a66c31c6d5d925b7e24647366621 -r1056feb7616863d1ec2a7aeb0cd0f515a02ed7b6
#
# 
# 
# 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 \