[oe-commits] org.oe.dev merge of '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
oe commit
openembedded-commits at lists.openembedded.org
Wed Dec 19 08:13:51 UTC 2007
merge of '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
and 'c2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7636a76a892fc7f94dd1f4061fef697b8e314676
ViewMTN: http://monotone.openembedded.org/revision/info/7636a76a892fc7f94dd1f4061fef697b8e314676
Files:
1
conf/machine/ixp4xx.conf
conf/machine/nslu2.conf
packages/linux/linux-ixp4xx/defconfig-2.6.21.6
packages/linux/linux-ixp4xx/defconfig-2.6.21.7
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.6
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.7
packages/linux/linux-ixp4xx_2.6.21.6.bb
packages/linux/linux-ixp4xx_2.6.21.7.bb
packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch
packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch
conf/distro/include/angstrom.inc
conf/machine/include/ixp4xx.inc
conf/machine/nslu2be.conf
conf/machine/nslu2le.conf
packages/glibc/glibc_2.2.5.bb
packages/tasks/task-slugos.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r5968fdd70fe297abea7dae6b5ada03014e1c4e37 -r7636a76a892fc7f94dd1f4061fef697b8e314676
#
#
#
# delete "conf/machine/ixp4xx.conf"
#
# delete "conf/machine/nslu2.conf"
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.21.6"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.21.7"
#
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.6"
# to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.7"
#
# rename "packages/linux/linux-ixp4xx_2.6.21.6.bb"
# to "packages/linux/linux-ixp4xx_2.6.21.7.bb"
#
# add_file "packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch"
# content [677ca0b52ec0fe18848b08965dd750c56a836ee2]
#
# add_file "packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch"
# content [c5f0de043a35f455594733a38746fddc51f70fd6]
#
# patch "conf/distro/include/angstrom.inc"
# from [b2fcc97fd9d2dd36be72566d73b0c456e0bc36da]
# to [ef356d78c89cc9b9de013a2e8d617f6125f760dd]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1]
# to [20b9033235fa7a2b9c96df8d4a1bb3e47d6f29e0]
#
# patch "conf/machine/nslu2be.conf"
# from [2eb05c6598de70bd095e0f2e54553a7de1c28fd0]
# to [ee093d573002da68cdbf3408f25b09f0eca8d47d]
#
# patch "conf/machine/nslu2le.conf"
# from [c3ea05ab779688cea0d2db8845c8a89647ff5d17]
# to [9c11d795f3c0528643a18edd362f677b5815b7c4]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [c1e515394463dc364c06a656f0ddca88820ee0a6]
# to [aff79544708458393df6c930d35874c955473879]
#
# patch "packages/linux/linux-ixp4xx_2.6.21.7.bb"
# from [d6c856fde004af7bb34338d7add40228d3c244f2]
# to [e1c269f58c1f57107fd1d261268e06a8acb2e7ac]
#
# patch "packages/tasks/task-slugos.bb"
# from [6828037c6d95ea3758b661c5277817df96d75b69]
# to [62a3f9c847703c3e7329b87d8891319e81f9fea0]
#
============================================================
--- packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch 677ca0b52ec0fe18848b08965dd750c56a836ee2
+++ packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch 677ca0b52ec0fe18848b08965dd750c56a836ee2
@@ -0,0 +1,21 @@
+Fixes
+checking version of powerpc-405-linux-gnu-gcc ... 4.0.0, bad
+checking for gnumake... no
+checking for gmake... no
+checking for make... make
+checking version of make... 3.80, ok
+configure: error:
+*** These critical programs are missing or too old:gcc
+
+
+--- glibc-2.2.5/configure.old 2005-03-10 00:23:46.374213600 -0800
++++ glibc-2.2.5/configure 2005-03-10 00:25:13.313996744 -0800
+@@ -1476,7 +1476,7 @@
+ ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
++ *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|4.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
============================================================
--- packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch c5f0de043a35f455594733a38746fddc51f70fd6
+++ packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch c5f0de043a35f455594733a38746fddc51f70fd6
@@ -0,0 +1,41 @@
+See http://sources.redhat.com/ml/crossgcc/2003-11/msg00111.html
+Might fix error
+... gcc-3.2.3-glibc-2.3.2/build-glibc/csu/version-info.h:8: too many decimal points in floating constant
+make[2]: ***
+when building on Solaris. I haven't seen this be needed yet, but what the heck,
+here it is in case someone needs it.
+
+Retrieved with http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/csu/Makefile.diff?r1=1.70&r2=1.71&cvsroot=glibc
+
+Revision 1.71, Thu Sep 25 20:29:39 2003 UTC (8 months, 2 weeks ago) by drepper
+Branch: MAIN
+CVS Tags: glibc-2_3_3
+
+($(objpfx)version-info.h): Fix sed script to handle banners.
+
+===================================================================
+RCS file: /cvs/glibc/libc/csu/Makefile,v
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- libc/csu/Makefile 2003/06/26 07:27:39 1.70
++++ libc/csu/Makefile 2003/09/25 20:29:39 1.71
+@@ -222,14 +222,14 @@
+ if [ -z "$$os" ]; then \
+ os=Linux; \
+ fi; \
+- echo "\"Compiled on a $$os $$version system" \
+- "on `date +%Y-%m-%d`.\\n\"" ;; \
++ printf '"Compiled on a %s %s system on %s.\\n"\n' \
++ "$os" "$version" "`date +%Y-%m-%d`" ;; \
+ *) ;; \
+ esac; \
+ files="$(all-Banner-files)"; \
+ if test -n "$$files"; then \
+- echo "\"Available extensions:\\n\""; \
++ printf '"Available extensions:\\n"\n'; \
+ sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \
+- -e 's/\(^.*$$\)/\"\1\\n\"/' $$files; \
++ -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \
+ fi) > $@T
+ mv -f $@T $@
============================================================
--- conf/distro/include/angstrom.inc b2fcc97fd9d2dd36be72566d73b0c456e0bc36da
+++ conf/distro/include/angstrom.inc ef356d78c89cc9b9de013a2e8d617f6125f760dd
@@ -270,4 +270,3 @@ DISTRO_FEATURES = "nfs smbfs wifi ppp al
# We want images supporting the following features (for task-base)
DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
-DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
============================================================
--- conf/machine/include/ixp4xx.inc 9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1
+++ conf/machine/include/ixp4xx.inc 20b9033235fa7a2b9c96df8d4a1bb3e47d6f29e0
@@ -1,13 +1,13 @@
#@TYPE: Machine configuration
#@NAME: ixp4xx
#@DESCRIPTION: genric machine configuration for ixp4xx platforms
# Set default for common ixp4xx-based machines
-MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
# Select an appropriate default kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}"
# Add packages required for basic networking support
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
============================================================
--- conf/machine/nslu2be.conf 2eb05c6598de70bd095e0f2e54553a7de1c28fd0
+++ conf/machine/nslu2be.conf ee093d573002da68cdbf3408f25b09f0eca8d47d
@@ -6,8 +6,6 @@ PACKAGE_EXTRA_ARCHS = "armv4b armv4tb ar
PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
-MACHINE_ARCH = "ixp4xxbe"
-
OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
ROOT_FLASH_SIZE ?= "6"
============================================================
--- conf/machine/nslu2le.conf c3ea05ab779688cea0d2db8845c8a89647ff5d17
+++ conf/machine/nslu2le.conf 9c11d795f3c0528643a18edd362f677b5815b7c4
@@ -6,8 +6,6 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
-MACHINE_ARCH = "ixp4xxle"
-
OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
ROOT_FLASH_SIZE ?= "6"
============================================================
--- packages/glibc/glibc_2.2.5.bb c1e515394463dc364c06a656f0ddca88820ee0a6
+++ packages/glibc/glibc_2.2.5.bb aff79544708458393df6c930d35874c955473879
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r13"
DEFAULT_PREFERENCE_sh3 = "-99"
@@ -63,6 +63,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${P
file://errlist-arm.patch;patch=1 \
file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \
file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \
+ file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \
file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \
file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \
file://glibc-2.2.5-crosstest.patch;patch=1 \
@@ -95,6 +96,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${P
file://threadparam.patch;patch=1 \
file://initfini-flags.patch;patch=1 \
file://pt-initfini-flags.patch;patch=1 \
+ file://glibc-2.3.2-allow-solaris.patch;patch=1 \
\
file://etc/ld.so.conf \
file://generate-supported.mk"
@@ -161,7 +163,7 @@ do_stage() {
rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
oe_runmake 'install_root=${STAGING_DIR_HOST}' \
'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
- '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \
+ '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
'${STAGING_INCDIR}/bits/errno.h' \
'${STAGING_INCDIR}/bits/libc-lock.h' \
'${STAGING_INCDIR}/gnu/stubs.h' \
@@ -199,6 +201,7 @@ PACKAGE_ARCH_unslung = "nslu2"
PACKAGES_unslung = "libc6-unslung"
PACKAGE_ARCH_unslung = "nslu2"
+PACKAGE_NO_GCONV_unslung = "1"
RDEPENDS_libc6-unslung = "nslu2-linksys-libs"
RPROVIDES_libc6-unslung = "libc6"
============================================================
--- packages/linux/linux-ixp4xx_2.6.21.6.bb d6c856fde004af7bb34338d7add40228d3c244f2
+++ packages/linux/linux-ixp4xx_2.6.21.7.bb e1c269f58c1f57107fd1d261268e06a8acb2e7ac
@@ -1,11 +1,11 @@ VANILLA_VERSION = "2.6.21"
require linux.inc
require linux-ixp4xx.inc
VANILLA_VERSION = "2.6.21"
-KERNEL_RELEASE = "2.6.21.6"
+KERNEL_RELEASE = "2.6.21.7"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r3"
+PR = "r0"
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 \
============================================================
--- packages/tasks/task-slugos.bb 6828037c6d95ea3758b661c5277817df96d75b69
+++ packages/tasks/task-slugos.bb 62a3f9c847703c3e7329b87d8891319e81f9fea0
@@ -20,20 +20,23 @@ SLUGOS_STANDARD_RRECOMMENDS = ""
SLUGOS_STANDARD_RDEPENDS = ""
SLUGOS_STANDARD_RRECOMMENDS = ""
-# diff, cpio and find are required for reflash and turnup ram.
-# Removing these probably leaves the system bootable, but standard
-# openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
+# diff, cpio and find are required for turnup and ipkg.
+SLUGOS_STANDARD_RRECOMMENDS += "\
+diffutils \
+cpio \
+findutils \
+"
# These lines add support for formatting ext2 and ext3 file systems
# on a hard disk attached to the NSLU2. ext3 is the standard Linux
# file system.
-SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "\
+e2fsprogs-mke2fs \
+e2fsprogs-fsck \
+e2fsprogs-e2fsck \
+e2fsprogs-badblocks \
+e2fsprogs-blkid \
+"
# These lines add support for an X/Y/ZModem package called lrzsz
# (this is of use for people with modified NSLU2 hardware which
@@ -66,7 +69,6 @@ kernel-module-nls-utf8 \
kernel-module-nls-utf8 \
"
-
# Add daemon required for HW RNG support
SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
@@ -93,6 +95,9 @@ kernel-module-via-velocity \
kernel-module-via-velocity \
"
+# Other candidate packages that have been considered and
+# are intentionally excluded from the base flash image.
+#
# portmap \
# kexec-tools \
# kernel-module-nfs \
@@ -118,7 +123,6 @@ RDEPENDS += "\
module-init-tools modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
beep \
- e2fsprogs-blkid \
util-linux-mount \
util-linux-umount \
util-linux-swaponoff \
@@ -126,6 +130,7 @@ RDEPENDS += "\
${SLUGOS_STANDARD_RDEPENDS} \
${DISTRO_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS ?= ""
RRECOMMENDS += "\
openssh \
${SLUGOS_STANDARD_RRECOMMENDS} \
#
# mt diff -rc2b6ec6ab4d7fe9e98eeb4ab4762cdb5da714774 -r7636a76a892fc7f94dd1f4061fef697b8e314676
#
#
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [27fb03e6e272d6cbc1b97489f33e1e076ac5625b]
# to [edfade99b01acbfb856f3c07d7657e47238313d7]
#
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- conf/distro/angstrom-2007.1.conf 27fb03e6e272d6cbc1b97489f33e1e076ac5625b
+++ conf/distro/angstrom-2007.1.conf edfade99b01acbfb856f3c07d7657e47238313d7
@@ -8,7 +8,7 @@ DISTRO_VERSION = "2007.11RC1.2"
# The release will the 2007.12
DISTRO_VERSION = "2007.11RC1.2"
-DISTRO_REVISION = "49"
+DISTRO_REVISION = "50"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
@@ -60,7 +60,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
More information about the Openembedded-commits
mailing list