[oe-commits] org.oe.dev merge of '4a44b08ef83a5075a82f85c34d592996acfcec95'

koen commit oe at amethyst.openembedded.net
Mon Mar 17 08:57:11 UTC 2008 

merge of '4a44b08ef83a5075a82f85c34d592996acfcec95'
     and '525970acffe8506ad362922236614a52c8860952'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 81a7886604b6eb56e9b3e0e7e7a2032428d40826
ViewMTN: http://monotone.openembedded.org/revision/info/81a7886604b6eb56e9b3e0e7e7a2032428d40826
Files:
1
packages/uclibc/uclibc-0.9.29/avr32
packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-bzero.patch
conf/distro/angstrom-2008.1.conf
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.2.1.bb
packages/uclibc/uclibc.inc
packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
Diffs:

#
# mt diff -r4a44b08ef83a5075a82f85c34d592996acfcec95 -r81a7886604b6eb56e9b3e0e7e7a2032428d40826
#
#
#
# add_dir "packages/uclibc/uclibc-0.9.29/avr32"
# 
# add_file "packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine"
#  content [6eee945f4f60a18b512aca572845079a33e5fc2c]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-bzero.patch"
#  content [a1a301563a519027d610c7653a698806cca7acaf]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [f11f38e0d4d520e19d467465e9e4abd1f7ded37d]
#    to [68bb69c150a497ecf5d7a46defdfe8e52bd308a3]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [f10524857a44bab4e575452668a3691277b3f78f]
#    to [858566319ae3c59992ad1fd9b8f267f240f8e0f0]
# 
# patch "conf/machine/atngw100.conf"
#  from [89a6ee9913538126eac21df68b6676787b076b88]
#    to [474e760e6d35f3b194c4977885162a4aa0023764]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [2f16ff83d690b1b8e87a423c4a22b0bc0480f90a]
#    to [6f6c037d27c55d3999ec21bc550af351c1c63b85]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [24b156595e4214b3b525a3cb63450d3e9798bc1c]
#    to [a95795db10d39451f0f69178f660bc75e22edfaf]
# 
# patch "packages/uclibc/uclibc.inc"
#  from [de423804aa3669733b033b1a6d9f50c7e3d07d41]
#    to [e919110dc8574ffb8d2af66d51b387f56f9bdd82]
#
============================================================
--- packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine	6eee945f4f60a18b512aca572845079a33e5fc2c
+++ packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine	6eee945f4f60a18b512aca572845079a33e5fc2c
@@ -0,0 +1,50 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+TARGET_avr32=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+HAVE_ELF=y
+TARGET_ARCH="avr32"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+UCLIBC_COMPLETELY_PIC=y
+CONFIG_AP7000=y
+LINKRELAX=y
+# ARCH_LITTLE_ENDIAN is not set
+ARCH_BIG_ENDIAN=y
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=n
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+C_SYMBOL_PREFIX=""
+KERNEL_HEADERS="Dummy value, correct value substituted by uclibc.inc"
+HAVE_DOT_CONFIG=y
+
+
+
+
+
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-bzero.patch	a1a301563a519027d610c7653a698806cca7acaf
+++ packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-bzero.patch	a1a301563a519027d610c7653a698806cca7acaf
@@ -0,0 +1,11 @@
+--- uClibc-0.9.29-orig/libc/string/avr32/bzero.S	2008-03-10 15:02:14.000000000 -0500
++++ uClibc-0.9.29/libc/string/avr32/bzero.S	2008-03-10 15:05:39.000000000 -0500
+@@ -6,6 +6,8 @@
+  * archive for more details.
+  */
+ 
++#include <features.h>
++
+ #ifdef __UCLIBC_SUSV3_LEGACY__
+ 
+ 	.text
============================================================
--- conf/distro/angstrom-2008.1.conf	f11f38e0d4d520e19d467465e9e4abd1f7ded37d
+++ conf/distro/angstrom-2008.1.conf	68bb69c150a497ecf5d7a46defdfe8e52bd308a3
@@ -114,16 +114,13 @@ require conf/distro/include/preferred-xo
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
 #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
-PREFERRED_VERSION_gcc_avr32               = "4.1.2"
-PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
+PREFERRED_VERSION_gcc_avr32               = "4.2.1"
+PREFERRED_VERSION_gcc-cross_avr32         = "4.2.1"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.2.1"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.1"
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-#there's is no avr32 patch for 0.9.29
-PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
-PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
============================================================
--- conf/machine/at32stk1000.conf	f10524857a44bab4e575452668a3691277b3f78f
+++ conf/machine/at32stk1000.conf	858566319ae3c59992ad1fd9b8f267f240f8e0f0
@@ -14,7 +14,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 u
 MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
 IMAGE_FSTYPES ?= "jffs2"
============================================================
--- conf/machine/atngw100.conf	89a6ee9913538126eac21df68b6676787b076b88
+++ conf/machine/atngw100.conf	474e760e6d35f3b194c4977885162a4aa0023764
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
 ROOT_FLASH_SIZE = "8"
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	2f16ff83d690b1b8e87a423c4a22b0bc0480f90a
+++ packages/gcc/gcc-cross_4.2.1.bb	6f6c037d27c55d3999ec21bc550af351c1c63b85
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.2.1.bb	24b156595e4214b3b525a3cb63450d3e9798bc1c
+++ packages/gcc/gcc_4.2.1.bb	a95795db10d39451f0f69178f660bc75e22edfaf
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 inherit autotools gettext
 
@@ -42,7 +42,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
 	file://pr34130.patch;patch=1 \
 "
 
-SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
+SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.tar.gz \
         file://100-uclibc-conf.patch;patch=1 \
         file://103-uclibc-conf-noupstream.patch;patch=1 \
         file://200-uclibc-locale.patch;patch=1 \
============================================================
--- packages/uclibc/uclibc.inc	de423804aa3669733b033b1a6d9f50c7e3d07d41
+++ packages/uclibc/uclibc.inc	e919110dc8574ffb8d2af66d51b387f56f9bdd82
@@ -70,7 +70,7 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOS
 
 # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
 # the CFLAGS (for when building the utils).
-OEMAKE_NO_CC = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \
+OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
 		'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
 EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}'"
 EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"


#
# mt diff -r525970acffe8506ad362922236614a52c8860952 -r81a7886604b6eb56e9b3e0e7e7a2032428d40826
#
#
#
# delete "packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch"
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34]
#    to [6ee762ca50690741aee1b59934653c4e6899f3ff]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [77d66be7e651da29ca286c2f28474b976270f746]
#    to [358d89b41f8bf41044bf9fb95edf85da0b2238b9]
#
============================================================
--- packages/linux/linux-handhelds-2.6.inc	98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34
+++ packages/linux/linux-handhelds-2.6.inc	6ee762ca50690741aee1b59934653c4e6899f3ff
@@ -38,6 +38,11 @@ do_configure() {
 	fi
 
 	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
+		if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
+		    echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
+		    exit 1
+		fi
+
 		# Kernel expects non-compressed cpio
 		gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
 		echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	77d66be7e651da29ca286c2f28474b976270f746
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	358d89b41f8bf41044bf9fb95edf85da0b2238b9
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r19"
+PR = "r20"
 
 DEFAULT_PREFERENCE = "-1"

More information about the Openembedded-commits mailing list