[oe-commits] org.oe.dev merge of '28c0b47110d44620be450547dae379ac6a2c8868'

hrw commit openembedded-commits at lists.openembedded.org
Wed Aug 29 10:07:39 UTC 2007 

merge of '28c0b47110d44620be450547dae379ac6a2c8868'
     and '309de2f5dd65f1b32e8c78500159efce669b5a24'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 379fa76ead1a67a4d5ade21cbca2a551c8348f08
ViewMTN: http://monotone.openembedded.org/revision.psp?id=379fa76ead1a67a4d5ade21cbca2a551c8348f08
Files:
1
packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t
packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te
packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt
packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm
packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine
packages/uclibc/uclibc_0.9.29.bb
packages/update-modules/update-modules_1.0.bb
Diffs:

#
# mt diff -r28c0b47110d44620be450547dae379ac6a2c8868 -r379fa76ead1a67a4d5ade21cbca2a551c8348f08
#
# 
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t"
#  content [4bb493d88e9e62926dd36a721907fb0f7485bb50]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te"
#  content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt"
#  content [b1e518a7f7fc0366b00ae228821d77e0a0d1ff56]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm"
#  content [eb2583ca1666dd284d4af3c4e03b4a37ab463a84]
# 
# patch "packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine"
#  from [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
#    to [b1e518a7f7fc0366b00ae228821d77e0a0d1ff56]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
#    to [8fed8c574108882b0ce50f97209832a6bfe548c3]
# 
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t	4bb493d88e9e62926dd36a721907fb0f7485bb50
+++ packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t	4bb493d88e9e62926dd36a721907fb0f7485bb50
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te	55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
+++ packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te	55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt	b1e518a7f7fc0366b00ae228821d77e0a0d1ff56
+++ packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt	b1e518a7f7fc0366b00ae228821d77e0a0d1ff56
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm	eb2583ca1666dd284d4af3c4e03b4a37ab463a84
+++ packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm	eb2583ca1666dd284d4af3c4e03b4a37ab463a84
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine	55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
+++ packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine	b1e518a7f7fc0366b00ae228821d77e0a0d1ff56
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Sun May 13 11:16:02 2007
+# Sat May 12 23:18:41 2007
 #
 # TARGET_alpha is not set
 TARGET_arm=y
@@ -48,8 +48,8 @@ USE_BX=y
 # CONFIG_ARM1176JZF_S is not set
 # CONFIG_ARM_SA110 is not set
 # CONFIG_ARM_SA1100 is not set
-CONFIG_ARM_XSCALE=y
-# CONFIG_ARM_IWMMXT is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
 TARGET_SUBARCH=""
 
 #
@@ -65,6 +65,6 @@ DO_C99_MATH=y
 # UCLIBC_HAS_FPU is not set
 UCLIBC_HAS_SOFT_FLOAT=y
 DO_C99_MATH=y
-KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+KERNEL_HEADERS="/usr/include"
 HAVE_DOT_CONFIG=y
 
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	a0c7d07639a2581b3d3ac3d18b716e2ea54fecca
+++ packages/uclibc/uclibc_0.9.29.bb	8fed8c574108882b0ce50f97209832a6bfe548c3
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r6"
+PR = "r7"
 
 require uclibc.inc
 


#
# mt diff -r309de2f5dd65f1b32e8c78500159efce669b5a24 -r379fa76ead1a67a4d5ade21cbca2a551c8348f08
#
# 
# 
# patch "packages/update-modules/update-modules_1.0.bb"
#  from [9298b5e1e0a79fd18419cb436b8247d24fca403e]
#    to [c826ebfc84c887b036affefdc32161fd9f4c103c]
# 
============================================================
--- packages/update-modules/update-modules_1.0.bb	9298b5e1e0a79fd18419cb436b8247d24fca403e
+++ packages/update-modules/update-modules_1.0.bb	c826ebfc84c887b036affefdc32161fd9f4c103c
@@ -1,8 +1,9 @@ PACKAGE_ARCH = "all"
 SECTION = "base"
 DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
-PR = "r4"
+RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26",  "module-init-tools-depmod","modutils-depmod",d)} "
+PR = "r5"
 
 SRC_URI = "file://update-modules"

More information about the Openembedded-commits mailing list