[oe-commits] org.oe.dev merge of '18a835c49f98aebf12d1299f14d6e62e8358e6a4'

[rwhitby commit]

merge of '18a835c49f98aebf12d1299f14d6e62e8358e6a4'
     and '224361c92f343abb72e0ab516a332f63dace3f78'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c39d4987573efad0462189d4122fa11dbccd7f4f
ViewMTN: http://monotone.openembedded.org/revision/info/c39d4987573efad0462189d4122fa11dbccd7f4f
Files:
1
packages/linux/linux-ixp4xx/defconfig-2.6.24
packages/linux/linux-ixp4xx/defconfig-2.6.24.3
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3
packages/linux/linux-ixp4xx_2.6.24.bb
packages/linux/linux-ixp4xx_2.6.24.3.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/include/ixp4xx.inc
packages/images/slugos-image.bb
conf/machine/nokia800.conf
packages/dpkg/dpkg_1.13.22.bb
packages/dpkg/dpkg_1.13.25.bb
packages/glibc/glibc.inc
Diffs:

#
# mt diff -r18a835c49f98aebf12d1299f14d6e62e8358e6a4 -rc39d4987573efad0462189d4122fa11dbccd7f4f
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24"
#     to "packages/linux/linux-ixp4xx/defconfig-2.6.24.3"
# 
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
#     to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3"
# 
# rename "packages/linux/linux-ixp4xx_2.6.24.bb"
#     to "packages/linux/linux-ixp4xx_2.6.24.3.bb"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
#    to [44e4906ecf7591680ec759d0c7ea0fbc8cbab14a]
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [aa79f84872ffba6825c781a48f53c408a318a978]
#    to [af1b2871a2c2334a9ab155190f79070786c9c41f]
# 
# patch "packages/images/slugos-image.bb"
#  from [d1b20833658ac4a2ccc5e3cb746817cbf12bf138]
#    to [83b5d4afb1824bc34cbfc0ebb671afbbee6d911d]
# 
# patch "packages/linux/linux-ixp4xx_2.6.24.3.bb"
#  from [6df87e421ee2408a059092ec0b63b1393e0c03ce]
#    to [067925905346daa80ca610740fd9398e7c32ca12]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	0269a178e7edbe8ac9c17cef3cc5878aa563ee30
+++ conf/distro/include/sane-srcrevs.inc	44e4906ecf7591680ec759d0c7ea0fbc8cbab14a
@@ -56,7 +56,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1039"
+SRCREV_pn-linux-ixp4xx ?= "1056"
 SRCREV_pn-linux-openmoko ?= "4194"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- conf/machine/include/ixp4xx.inc	aa79f84872ffba6825c781a48f53c408a318a978
+++ conf/machine/include/ixp4xx.inc	af1b2871a2c2334a9ab155190f79070786c9c41f
@@ -7,7 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "li
 
 # Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.3+svnr${SRCREV}"
 
 # Add packages required for basic networking support
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
============================================================
--- packages/images/slugos-image.bb	d1b20833658ac4a2ccc5e3cb746817cbf12bf138
+++ packages/images/slugos-image.bb	83b5d4afb1824bc34cbfc0ebb671afbbee6d911d
@@ -9,7 +9,7 @@ IMAGE_INSTALL = "task-slugos"
 DEPENDS = "task-slugos"
 IMAGE_INSTALL = "task-slugos"
 
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "nslu2|ixp4xx"
 
 IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2 tar.gz"
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.bb	6df87e421ee2408a059092ec0b63b1393e0c03ce
+++ packages/linux/linux-ixp4xx_2.6.24.3.bb	067925905346daa80ca610740fd9398e7c32ca12
@@ -1,21 +1,17 @@
-# Keep this until the dsmg600 via-velocity BE patch is forward-ported
-DEFAULT_PREFERENCE = "-1"
-
 require linux.inc
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.24.3"
 
 # If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
 
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
-
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
 	   file://defconfig-${KERNEL_RELEASE}"
 


#
# mt diff -r224361c92f343abb72e0ab516a332f63dace3f78 -rc39d4987573efad0462189d4122fa11dbccd7f4f
#
#
#
# patch "conf/machine/nokia800.conf"
#  from [1e9e59dde23e9afccf1a426c1fb934923f8dd124]
#    to [b067467a5bc022fe4141b381f0900eac3a8c5239]
# 
# patch "packages/dpkg/dpkg_1.13.22.bb"
#  from [8a65d6983892a8778aea34454d81412dd58743e7]
#    to [3d842f90bd0dea654285038ad0bfb6e84a4e1fe2]
# 
# patch "packages/dpkg/dpkg_1.13.25.bb"
#  from [447b8af2ef375b9607b5df7961b6bd2d573eeef3]
#    to [1248fb24d3363ec5cd5452f1274da4f9fb85700f]
# 
# patch "packages/glibc/glibc.inc"
#  from [04bd84e7ea44c803ddd3735e41396c24902c305f]
#    to [e9a2a880277298ca08e7f53a4e5c69127415a5ed]
#
============================================================
--- conf/machine/nokia800.conf	1e9e59dde23e9afccf1a426c1fb934923f8dd124
+++ conf/machine/nokia800.conf	b067467a5bc022fe4141b381f0900eac3a8c5239
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: Nokia 770 internet tablet
+#@NAME: Nokia 800 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 800
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
============================================================
--- packages/dpkg/dpkg_1.13.22.bb	8a65d6983892a8778aea34454d81412dd58743e7
+++ packages/dpkg/dpkg_1.13.22.bb	3d842f90bd0dea654285038ad0bfb6e84a4e1fe2
@@ -8,4 +8,5 @@ EXTRA_OECONF = "--without-static-progs \
 		--with-start-stop-daemon \
 		--with-zlib \
 		--with-bz2lib \
+		--without-sgml-doc \
+		PERL=/usr/bin/perl"
-		--without-sgml-doc"
============================================================
--- packages/dpkg/dpkg_1.13.25.bb	447b8af2ef375b9607b5df7961b6bd2d573eeef3
+++ packages/dpkg/dpkg_1.13.25.bb	1248fb24d3363ec5cd5452f1274da4f9fb85700f
@@ -8,4 +8,5 @@ EXTRA_OECONF = "--without-static-progs \
 		--with-start-stop-daemon \
 		--with-zlib \
 		--with-bz2lib \
+		--without-sgml-doc \
+		PERL=/usr/bin/perl"
-		--without-sgml-doc"
============================================================
--- packages/glibc/glibc.inc	04bd84e7ea44c803ddd3735e41396c24902c305f
+++ packages/glibc/glibc.inc	e9a2a880277298ca08e7f53a4e5c69127415a5ed
@@ -12,6 +12,8 @@ inherit autotools
 
 inherit autotools
 
+LEAD_SONAME = "libc.so"
+
 GLIBC_EXTRA_OECONF ?= ""
 INHIBIT_DEFAULT_DEPS = "1"