* [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3
@ 2011-08-01 7:35 Saul Wold
2011-08-01 7:35 ` [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS Saul Wold
` (22 more replies)
0 siblings, 23 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
Richard,
This set of patches are what have been pulled together for the
M3 RC1 build. They include patches to multi-lib and tuning changes
put last week.
There are also 2 changes from Josh for bitbake, not included here,
which are included in stage/master_under_test.
There are competing changes from Martin and Khem for the ARM fix, the
first change from Martin did not seem to solve (or there is a different
issue that I have not evaluated). I am building Khem's change, but it
also seems to fail in eglibc, so ARM is still an issue
Thanks
Sau!
One note, I
The following changes since commit e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2:
feature-arm-thumb: respect ARM_INSTRUCTION_SET (2011-07-29 10:18:15 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/mut
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/mut
Khem Raj (1):
feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide
thumb mode
Koen Kooi (2):
package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo
arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case
Kumar Gala (5):
libzypp: Fix variable substitution problem in do_archgen step
tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling
tune/arch-powerpc64: Remove support for soft-float from ppc64
tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in
PACKAGE_ARCHS
Lianhao Lu (1):
meta-environment: set correct *MULTIMACH_TARGET_SYS.
Malcolm Crossley (1):
tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard
fpu.
Mark Hatle (4):
tune/powerpc: Cleanup setting of TUNE_PKGARCH
populate_sdk: Fix the introduction of sdknative packages
bitbake.conf: Add default tune-${DEFAULTTUNE} override
rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE
Phil Blundell (1):
glibc: deleted
Saul Wold (7):
docbook-sgml-dtd-native: Write a bak file for shared state
docbook-dsssl-stylesheets-native: Write a bak file for shared state
openjade-native: Write a bak file for shared state
sgml-common-native: Read a catalog backup to repopulate
sgml-docbook.cat
sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS
twice
libzypp: Bump PR
external-*toolchain: remove glibc-utils provide
meta/classes/package_deb.bbclass | 6 +-
meta/classes/package_ipk.bbclass | 6 +-
meta/classes/package_rpm.bbclass | 25 +-
meta/classes/populate_sdk_deb.bbclass | 11 +-
meta/classes/populate_sdk_rpm.bbclass | 11 +-
meta/classes/rootfs_rpm.bbclass | 2 +-
meta/classes/sanity.bbclass | 14 +-
meta/classes/toolchain-scripts.bbclass | 7 +-
meta/conf/bitbake.conf | 3 +-
meta/conf/distro/include/tclibc-glibc.inc | 32 -
meta/conf/distro/include/tcmode-default.inc | 5 -
meta/conf/machine/include/arm/arch-armv7a.inc | 4 +-
.../conf/machine/include/arm/feature-arm-thumb.inc | 6 +-
meta/conf/machine/include/powerpc/arch-powerpc.inc | 5 +-
.../machine/include/powerpc/arch-powerpc64.inc | 9 +-
meta/conf/machine/include/tune-ppc603e.inc | 4 +-
meta/conf/machine/include/tune-ppce300c2.inc | 5 +-
meta/conf/machine/include/tune-ppce500.inc | 5 +-
meta/conf/machine/include/tune-ppce500mc.inc | 7 +-
meta/conf/machine/include/tune-ppce500v2.inc | 5 +-
.../glibc/glibc-2.10.1/arm-longlong.patch | 60 --
.../glibc/glibc-2.10.1/arm-memcpy.patch | 760 --------------------
.../glibc/glibc-2.10.1/dl-cache-libcmp.patch | 12 -
.../recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf | 2 -
.../glibc/glibc-2.10.1/fhs-linux-paths.patch | 13 -
.../glibc/glibc-2.10.1/generate-supported.mk | 11 -
.../glibc/glibc-2.10.1/generic-bits_select.h | 35 -
.../glibc/glibc-2.10.1/generic-bits_time.h | 75 --
.../glibc/glibc-2.10.1/generic-bits_types.h | 200 -----
.../glibc/glibc-2.10.1/generic-bits_typesizes.h | 66 --
.../glibc-2.9-enable-binutils-2.2.patch | 37 -
.../glibc-arm-IO-acquire-lock-fix.diff | 15 -
.../glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch | 17 -
.../glibc/glibc-2.10.1/glibc-check_pf.patch | 345 ---------
.../glibc/glibc-2.10.1/ldd-unbash.patch | 13 -
.../glibc/glibc-2.10.1/ldsocache-varrun.patch | 20 -
.../glibc/glibc-2.10.1/march-i686.patch | 39 -
.../glibc/glibc-2.10.1/mips-rld-map-check.patch | 23 -
.../glibc/glibc-2.10.1/nptl-crosscompile.patch | 28 -
.../glibc/glibc-2.10.1/nscd-init.patch | 41 --
.../glibc/glibc-2.10.1/powerpc-sqrt-hack.diff | 27 -
.../recipes-core/glibc/glibc-2.10.1/rulesfix.patch | 15 -
meta/recipes-core/glibc/glibc-initial.inc | 67 --
meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 10 -
meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 63 --
meta/recipes-core/glibc/glibc-package.inc | 96 ---
meta/recipes-core/glibc/glibc.inc | 60 --
meta/recipes-core/glibc/glibc_2.10.1.bb | 161 -----
meta/recipes-core/glibc/site_config/funcs | 474 ------------
meta/recipes-core/glibc/site_config/headers | 156 ----
meta/recipes-core/glibc/site_config/types | 21 -
.../meta/external-csl-toolchain_2008q3-72.bb | 4 +-
meta/recipes-core/meta/external-poky-toolchain.bb | 4 +-
meta/recipes-core/meta/meta-environment.bb | 9 +-
.../docbook-dsssl-stylesheets-native_1.79.bb | 5 +-
.../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 5 +-
.../openjade/openjade-native_1.3.2.bb | 5 +-
.../sgml-common/sgml-common-native_0.6.3.bb | 18 +-
meta/recipes-extended/libzypp/libzypp_git.bb | 8 +-
59 files changed, 111 insertions(+), 3081 deletions(-)
delete mode 100644 meta/conf/distro/include/tclibc-glibc.inc
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
delete mode 100644 meta/recipes-core/glibc/glibc-initial.inc
delete mode 100644 meta/recipes-core/glibc/glibc-initial_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/glibc-package.inc
delete mode 100644 meta/recipes-core/glibc/glibc-stage.inc
delete mode 100644 meta/recipes-core/glibc/glibc.inc
delete mode 100644 meta/recipes-core/glibc/glibc_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/site_config/funcs
delete mode 100644 meta/recipes-core/glibc/site_config/headers
delete mode 100644 meta/recipes-core/glibc/site_config/types
--
1.7.3.4
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS.
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 02/22] glibc: deleted Saul Wold
` (21 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
From: Lianhao Lu <lianhao.lu@intel.com>
Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available.
Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/classes/toolchain-scripts.bbclass | 7 ++++---
meta/recipes-core/meta/meta-environment.bb | 9 +++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 3301319..832cce4 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -66,13 +66,14 @@ toolchain_create_tree_env_script () {
# This function creates an environment-setup-script for use by the ADT installer
toolchain_create_sdk_env_script_for_installer () {
# Create environment setup script
- script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS}
+ local multimach_target_sys=$1
+ script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${multimach_target_sys}
rm -f $script
touch $script
- echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script
+ echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/'"${multimach_target_sys}"':$PATH' >> $script
echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script
- echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script
+ echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
echo 'export CC=${TARGET_PREFIX}gcc' >> $script
echo 'export CXX=${TARGET_PREFIX}g++' >> $script
echo 'export GDB=${TARGET_PREFIX}gdb' >> $script
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 351cbf0..6d547bb 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "Package of environment files for SDK"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
EXCLUDE_FROM_WORLD = "1"
inherit toolchain-scripts
# get target config site before inheritting cross-canadian
TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
@@ -22,12 +23,12 @@ do_generate_content() {
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}/${SDKPATH}
- toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
+ toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
- toolchain_create_sdk_env_script_for_installer
+ toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS}
# Add version information
- toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
+ toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
}
addtask generate_content before do_install after do_compile
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 02/22] glibc: deleted
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
2011-08-01 7:35 ` [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 03/22] libzypp: Fix variable substitution problem in do_archgen step Saul Wold
` (20 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
From: Phil Blundell <philb@gnu.org>
Glibc 2.10.1 is outdated now and eglibc seems to provide a superset of
its functionality.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/conf/distro/include/tclibc-glibc.inc | 32 -
meta/conf/distro/include/tcmode-default.inc | 5 -
.../glibc/glibc-2.10.1/arm-longlong.patch | 60 --
.../glibc/glibc-2.10.1/arm-memcpy.patch | 760 --------------------
.../glibc/glibc-2.10.1/dl-cache-libcmp.patch | 12 -
.../recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf | 2 -
.../glibc/glibc-2.10.1/fhs-linux-paths.patch | 13 -
.../glibc/glibc-2.10.1/generate-supported.mk | 11 -
.../glibc/glibc-2.10.1/generic-bits_select.h | 35 -
.../glibc/glibc-2.10.1/generic-bits_time.h | 75 --
.../glibc/glibc-2.10.1/generic-bits_types.h | 200 -----
.../glibc/glibc-2.10.1/generic-bits_typesizes.h | 66 --
.../glibc-2.9-enable-binutils-2.2.patch | 37 -
.../glibc-arm-IO-acquire-lock-fix.diff | 15 -
.../glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch | 17 -
.../glibc/glibc-2.10.1/glibc-check_pf.patch | 345 ---------
.../glibc/glibc-2.10.1/ldd-unbash.patch | 13 -
.../glibc/glibc-2.10.1/ldsocache-varrun.patch | 20 -
.../glibc/glibc-2.10.1/march-i686.patch | 39 -
.../glibc/glibc-2.10.1/mips-rld-map-check.patch | 23 -
.../glibc/glibc-2.10.1/nptl-crosscompile.patch | 28 -
.../glibc/glibc-2.10.1/nscd-init.patch | 41 --
.../glibc/glibc-2.10.1/powerpc-sqrt-hack.diff | 27 -
.../recipes-core/glibc/glibc-2.10.1/rulesfix.patch | 15 -
meta/recipes-core/glibc/glibc-initial.inc | 67 --
meta/recipes-core/glibc/glibc-initial_2.10.1.bb | 10 -
meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 63 --
meta/recipes-core/glibc/glibc-package.inc | 96 ---
meta/recipes-core/glibc/glibc.inc | 60 --
meta/recipes-core/glibc/glibc_2.10.1.bb | 161 -----
meta/recipes-core/glibc/site_config/funcs | 474 ------------
| 156 ----
meta/recipes-core/glibc/site_config/types | 21 -
33 files changed, 0 insertions(+), 2999 deletions(-)
delete mode 100644 meta/conf/distro/include/tclibc-glibc.inc
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
delete mode 100644 meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
delete mode 100644 meta/recipes-core/glibc/glibc-initial.inc
delete mode 100644 meta/recipes-core/glibc/glibc-initial_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/glibc-locale_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/glibc-package.inc
delete mode 100644 meta/recipes-core/glibc/glibc-stage.inc
delete mode 100644 meta/recipes-core/glibc/glibc.inc
delete mode 100644 meta/recipes-core/glibc/glibc_2.10.1.bb
delete mode 100644 meta/recipes-core/glibc/site_config/funcs
delete mode 100644 meta/recipes-core/glibc/site_config/headers
delete mode 100644 meta/recipes-core/glibc/site_config/types
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
deleted file mode 100644
index 823195c..0000000
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# glibc specific configuration
-#
-
-LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
-
-# Add glibc to the overrides.
-OVERRIDES =. "libc-glibc:"
-
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
-PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale"
-
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-LIBC_DEPENDENCIES = "\
- libsegfault \
- glibc \
- glibc-dbg \
- glibc-dev \
- glibc-utils \
- glibc-thread-db \
- glibc-localedata-i18n \
- glibc-gconv-ibm850 \
- glibc-gconv-cp1252 \
- glibc-gconv-iso8859-1 \
- glibc-gconv-iso8859-15 \
- locale-base-en-gb \
- "
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 86538f1..dce76db 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -49,11 +49,6 @@ PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}"
PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}"
PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}"
PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}"
PREFERRED_VERSION_eglibc-nativesdk ?= "${EGLIBCVERSION}"
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
deleted file mode 100644
index ce67d7e..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.4/stdlib/longlong.h.ark 2006-03-11 22:49:27.000000000 +0100
-+++ glibc-2.4/stdlib/longlong.h 2006-03-11 22:55:12.000000000 +0100
-@@ -206,6 +206,14 @@
- "rI" ((USItype) (bh)), \
- "r" ((USItype) (al)), \
- "rI" ((USItype) (bl)) __CLOBBER_CC)
-+/* v3m and all higher arches have long multiply support. */
-+#if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__)
-+#define umul_ppmm(xh, xl, a, b) \
-+ __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
-+#define UMUL_TIME 5
-+#define smul_ppmm(xh, xl, a, b) \
-+ __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
-+#else
- #define umul_ppmm(xh, xl, a, b) \
- {register USItype __t0, __t1, __t2; \
- __asm__ ("%@ Inlined umul_ppmm\n" \
-@@ -227,7 +235,13 @@
- : "r" ((USItype) (a)), \
- "r" ((USItype) (b)) __CLOBBER_CC );}
- #define UMUL_TIME 20
-+#endif
- #define UDIV_TIME 100
-+#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
-+#define count_leading_zeros(COUNT,X) ((COUNT) = __builtin_clz (X))
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+
- #endif /* __arm__ */
-
- #if defined (__hppa) && W_TYPE_SIZE == 32
---- glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c.ark 2006-03-11 22:56:43.000000000 +0100
-+++ glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c 2006-03-11 22:58:19.000000000 +0100
-@@ -0,0 +1,24 @@
-+/* __clz_tab -- support for longlong.h
-+ Copyright (C) 2004 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
-+/* Nothing required. */
-+#else
-+#include <stdlib/mp_clz_tab.c>
-+#endif
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
deleted file mode 100644
index f50d481..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
+++ /dev/null
@@ -1,760 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- /dev/null 2004-02-02 20:32:13.000000000 +0000
-+++ sysdeps/arm/memmove.S 2004-03-20 18:37:23.000000000 +0000
-@@ -0,0 +1,251 @@
-+/*
-+ * Optimized memmove implementation for ARM processors
-+ *
-+ * Author: Nicolas Pitre
-+ * Created: Dec 23, 2003
-+ * Copyright: (C) MontaVista Software, Inc.
-+ *
-+ * This file is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ */
-+
-+#include <sysdep.h>
-+
-+
-+/*
-+ * Endian independent macros for shifting bytes within registers.
-+ */
-+#ifndef __ARMEB__
-+#define pull lsr
-+#define push lsl
-+#else
-+#define pull lsl
-+#define push lsr
-+#endif
-+
-+/*
-+ * Enable data preload for architectures that support it (ARMv5 and above)
-+ */
-+#if defined(__ARM_ARCH_5__) || \
-+ defined(__ARM_ARCH_5T__) || \
-+ defined(__ARM_ARCH_5TE__)
-+#define PLD(code...) code
-+#else
-+#define PLD(code...)
-+#endif
-+
-+
-+/* char * memmove (char *dst, const char *src) */
-+ENTRY(memmove)
-+ subs ip, r0, r1
-+ cmphi r2, ip
-+ bls memcpy(PLT)
-+
-+ stmfd sp!, {r0, r4, lr}
-+ add r1, r1, r2
-+ add r0, r0, r2
-+ subs r2, r2, #4
-+ blt 25f
-+ ands ip, r0, #3
-+ PLD( pld [r1, #-4] )
-+ bne 26f
-+ ands ip, r1, #3
-+ bne 27f
-+
-+19: subs r2, r2, #4
-+ blt 24f
-+ subs r2, r2, #8
-+ blt 23f
-+ subs r2, r2, #16
-+ blt 22f
-+
-+ PLD( pld [r1, #-32] )
-+ PLD( subs r2, r2, #96 )
-+ stmfd sp!, {r5 - r8}
-+ PLD( blt 21f )
-+
-+ PLD( @ cache alignment )
-+ PLD( ands ip, r1, #31 )
-+ PLD( pld [r1, #-64] )
-+ PLD( beq 20f )
-+ PLD( cmp r2, ip )
-+ PLD( pld [r1, #-96] )
-+ PLD( blt 20f )
-+ PLD( cmp ip, #16 )
-+ PLD( sub r2, r2, ip )
-+ PLD( ldmgedb r1!, {r3 - r6} )
-+ PLD( stmgedb r0!, {r3 - r6} )
-+ PLD( beq 20f )
-+ PLD( and ip, ip, #15 )
-+ PLD( cmp ip, #8 )
-+ PLD( ldr r3, [r1, #-4]! )
-+ PLD( ldrge r4, [r1, #-4]! )
-+ PLD( ldrgt r5, [r1, #-4]! )
-+ PLD( str r3, [r0, #-4]! )
-+ PLD( strge r4, [r0, #-4]! )
-+ PLD( strgt r5, [r0, #-4]! )
-+
-+20: PLD( pld [r1, #-96] )
-+ PLD( pld [r1, #-128] )
-+21: ldmdb r1!, {r3, r4, ip, lr}
-+ subs r2, r2, #32
-+ stmdb r0!, {r3, r4, ip, lr}
-+ ldmdb r1!, {r3, r4, ip, lr}
-+ stmgedb r0!, {r3, r4, ip, lr}
-+ ldmgedb r1!, {r3, r4, ip, lr}
-+ stmgedb r0!, {r3, r4, ip, lr}
-+ ldmgedb r1!, {r3, r4, ip, lr}
-+ subges r2, r2, #32
-+ stmdb r0!, {r3, r4, ip, lr}
-+ bge 20b
-+ PLD( cmn r2, #96 )
-+ PLD( bge 21b )
-+ PLD( add r2, r2, #96 )
-+ tst r2, #31
-+ ldmfd sp!, {r5 - r8}
-+ ldmeqfd sp!, {r0, r4, pc}
-+
-+ tst r2, #16
-+22: ldmnedb r1!, {r3, r4, ip, lr}
-+ stmnedb r0!, {r3, r4, ip, lr}
-+
-+ tst r2, #8
-+23: ldmnedb r1!, {r3, r4}
-+ stmnedb r0!, {r3, r4}
-+
-+ tst r2, #4
-+24: ldrne r3, [r1, #-4]!
-+ strne r3, [r0, #-4]!
-+
-+25: ands r2, r2, #3
-+ ldmeqfd sp!, {r0, r4, pc}
-+
-+ cmp r2, #2
-+ ldrb r3, [r1, #-1]
-+ ldrgeb r4, [r1, #-2]
-+ ldrgtb ip, [r1, #-3]
-+ strb r3, [r0, #-1]
-+ strgeb r4, [r0, #-2]
-+ strgtb ip, [r0, #-3]
-+ ldmfd sp!, {r0, r4, pc}
-+
-+26: cmp ip, #2
-+ ldrb r3, [r1, #-1]!
-+ ldrgeb r4, [r1, #-1]!
-+ ldrgtb lr, [r1, #-1]!
-+ strb r3, [r0, #-1]!
-+ strgeb r4, [r0, #-1]!
-+ strgtb lr, [r0, #-1]!
-+ subs r2, r2, ip
-+ blt 25b
-+ ands ip, r1, #3
-+ beq 19b
-+
-+27: bic r1, r1, #3
-+ cmp ip, #2
-+ ldr r3, [r1]
-+ beq 35f
-+ blt 36f
-+
-+
-+ .macro backward_copy_shift push pull
-+
-+ cmp r2, #12
-+ PLD( pld [r1, #-4] )
-+ blt 33f
-+ subs r2, r2, #28
-+ stmfd sp!, {r5 - r9}
-+ blt 31f
-+
-+ PLD( subs r2, r2, #96 )
-+ PLD( pld [r1, #-32] )
-+ PLD( blt 30f )
-+ PLD( pld [r1, #-64] )
-+
-+ PLD( @ cache alignment )
-+ PLD( ands ip, r1, #31 )
-+ PLD( pld [r1, #-96] )
-+ PLD( beq 29f )
-+ PLD( cmp r2, ip )
-+ PLD( pld [r1, #-128] )
-+ PLD( blt 29f )
-+ PLD( sub r2, r2, ip )
-+28: PLD( mov r4, r3, push #\push )
-+ PLD( ldr r3, [r1, #-4]! )
-+ PLD( subs ip, ip, #4 )
-+ PLD( orr r4, r4, r3, pull #\pull )
-+ PLD( str r4, [r0, #-4]! )
-+ PLD( bgt 28b )
-+
-+29: PLD( pld [r1, #-128] )
-+30: mov lr, r3, push #\push
-+ ldmdb r1!, {r3 - r9, ip}
-+ subs r2, r2, #32
-+ orr lr, lr, ip, pull #\pull
-+ mov ip, ip, push #\push
-+ orr ip, ip, r9, pull #\pull
-+ mov r9, r9, push #\push
-+ orr r9, r9, r8, pull #\pull
-+ mov r8, r8, push #\push
-+ orr r8, r8, r7, pull #\pull
-+ mov r7, r7, push #\push
-+ orr r7, r7, r6, pull #\pull
-+ mov r6, r6, push #\push
-+ orr r6, r6, r5, pull #\pull
-+ mov r5, r5, push #\push
-+ orr r5, r5, r4, pull #\pull
-+ mov r4, r4, push #\push
-+ orr r4, r4, r3, pull #\pull
-+ stmdb r0!, {r4 - r9, ip, lr}
-+ bge 29b
-+ PLD( cmn r2, #96 )
-+ PLD( bge 30b )
-+ PLD( add r2, r2, #96 )
-+ cmn r2, #16
-+ blt 32f
-+31: mov r7, r3, push #\push
-+ ldmdb r1!, {r3 - r6}
-+ sub r2, r2, #16
-+ orr r7, r7, r6, pull #\pull
-+ mov r6, r6, push #\push
-+ orr r6, r6, r5, pull #\pull
-+ mov r5, r5, push #\push
-+ orr r5, r5, r4, pull #\pull
-+ mov r4, r4, push #\push
-+ orr r4, r4, r3, pull #\pull
-+ stmdb r0!, {r4 - r7}
-+32: adds r2, r2, #28
-+ ldmfd sp!, {r5 - r9}
-+ blt 34f
-+33: mov r4, r3, push #\push
-+ ldr r3, [r1, #-4]!
-+ subs r2, r2, #4
-+ orr r4, r4, r3, pull #\pull
-+ str r4, [r0, #-4]!
-+ bge 33b
-+34:
-+ .endm
-+
-+
-+ backward_copy_shift push=8 pull=24
-+ add r1, r1, #3
-+ b 25b
-+
-+35: backward_copy_shift push=16 pull=16
-+ add r1, r1, #2
-+ b 25b
-+
-+36: backward_copy_shift push=24 pull=8
-+ add r1, r1, #1
-+ b 25b
-+
-+ .size memmove, . - memmove
-+END(memmove)
-+libc_hidden_builtin_def (memmove)
---- /dev/null 2004-02-02 20:32:13.000000000 +0000
-+++ sysdeps/arm/bcopy.S 2004-03-20 18:37:48.000000000 +0000
-@@ -0,0 +1,255 @@
-+/*
-+ * Optimized memmove implementation for ARM processors
-+ *
-+ * Author: Nicolas Pitre
-+ * Created: Dec 23, 2003
-+ * Copyright: (C) MontaVista Software, Inc.
-+ *
-+ * This file is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ */
-+
-+#include <sysdep.h>
-+
-+
-+/*
-+ * Endian independent macros for shifting bytes within registers.
-+ */
-+#ifndef __ARMEB__
-+#define pull lsr
-+#define push lsl
-+#else
-+#define pull lsl
-+#define push lsr
-+#endif
-+
-+/*
-+ * Enable data preload for architectures that support it (ARMv5 and above)
-+ */
-+#if defined(__ARM_ARCH_5__) || \
-+ defined(__ARM_ARCH_5T__) || \
-+ defined(__ARM_ARCH_5TE__)
-+#define PLD(code...) code
-+#else
-+#define PLD(code...)
-+#endif
-+
-+dst .req r1
-+src .req r0
-+
-+/* void *bcopy (const char *src, char *dst, size_t size) */
-+ENTRY(bcopy)
-+ subs ip, dst, src
-+ cmphi r2, ip
-+ movls r3, r0
-+ movls r0, r1
-+ movls r1, r3
-+ bls memcpy(PLT)
-+
-+ stmfd sp!, {r4, lr}
-+ add src, src, r2
-+ add dst, dst, r2
-+ subs r2, r2, #4
-+ blt 25f
-+ ands ip, dst, #3
-+ PLD( pld [src, #-4] )
-+ bne 26f
-+ ands ip, src, #3
-+ bne 27f
-+
-+19: subs r2, r2, #4
-+ blt 24f
-+ subs r2, r2, #8
-+ blt 23f
-+ subs r2, r2, #16
-+ blt 22f
-+
-+ PLD( pld [src, #-32] )
-+ PLD( subs r2, r2, #96 )
-+ stmfd sp!, {r5 - r8}
-+ PLD( blt 21f )
-+
-+ PLD( @ cache alignment )
-+ PLD( ands ip, src, #31 )
-+ PLD( pld [src, #-64] )
-+ PLD( beq 20f )
-+ PLD( cmp r2, ip )
-+ PLD( pld [src, #-96] )
-+ PLD( blt 20f )
-+ PLD( cmp ip, #16 )
-+ PLD( sub r2, r2, ip )
-+ PLD( ldmgedb src!, {r3 - r6} )
-+ PLD( stmgedb dst!, {r3 - r6} )
-+ PLD( beq 20f )
-+ PLD( and ip, ip, #15 )
-+ PLD( cmp ip, #8 )
-+ PLD( ldr r3, [src, #-4]! )
-+ PLD( ldrge r4, [src, #-4]! )
-+ PLD( ldrgt r5, [src, #-4]! )
-+ PLD( str r3, [dst, #-4]! )
-+ PLD( strge r4, [dst, #-4]! )
-+ PLD( strgt r5, [dst, #-4]! )
-+
-+20: PLD( pld [src, #-96] )
-+ PLD( pld [src, #-128] )
-+21: ldmdb src!, {r3, r4, ip, lr}
-+ subs r2, r2, #32
-+ stmdb dst!, {r3, r4, ip, lr}
-+ ldmdb src!, {r3, r4, ip, lr}
-+ stmgedb dst!, {r3, r4, ip, lr}
-+ ldmgedb src!, {r3, r4, ip, lr}
-+ stmgedb dst!, {r3, r4, ip, lr}
-+ ldmgedb src!, {r3, r4, ip, lr}
-+ subges r2, r2, #32
-+ stmdb dst!, {r3, r4, ip, lr}
-+ bge 20b
-+ PLD( cmn r2, #96 )
-+ PLD( bge 21b )
-+ PLD( add r2, r2, #96 )
-+ tst r2, #31
-+ ldmfd sp!, {r5 - r8}
-+ ldmeqfd sp!, {r4, pc}
-+
-+ tst r2, #16
-+22: ldmnedb src!, {r3, r4, ip, lr}
-+ stmnedb dst!, {r3, r4, ip, lr}
-+
-+ tst r2, #8
-+23: ldmnedb src!, {r3, r4}
-+ stmnedb dst!, {r3, r4}
-+
-+ tst r2, #4
-+24: ldrne r3, [src, #-4]!
-+ strne r3, [dst, #-4]!
-+
-+25: ands r2, r2, #3
-+ ldmeqfd sp!, {dst, r4, pc}
-+
-+ cmp r2, #2
-+ ldrb r3, [src, #-1]
-+ ldrgeb r4, [src, #-2]
-+ ldrgtb ip, [src, #-3]
-+ strb r3, [dst, #-1]
-+ strgeb r4, [dst, #-2]
-+ strgtb ip, [dst, #-3]
-+ ldmfd sp!, {dst, r4, pc}
-+
-+26: cmp ip, #2
-+ ldrb r3, [src, #-1]!
-+ ldrgeb r4, [src, #-1]!
-+ ldrgtb lr, [src, #-1]!
-+ strb r3, [dst, #-1]!
-+ strgeb r4, [dst, #-1]!
-+ strgtb lr, [dst, #-1]!
-+ subs r2, r2, ip
-+ blt 25b
-+ ands ip, src, #3
-+ beq 19b
-+
-+27: bic src, src, #3
-+ cmp ip, #2
-+ ldr r3, [src]
-+ beq 35f
-+ blt 36f
-+
-+
-+ .macro backward_copy_shift push pull
-+
-+ cmp r2, #12
-+ PLD( pld [src, #-4] )
-+ blt 33f
-+ subs r2, r2, #28
-+ stmfd sp!, {r5 - r9}
-+ blt 31f
-+
-+ PLD( subs r2, r2, #96 )
-+ PLD( pld [src, #-32] )
-+ PLD( blt 30f )
-+ PLD( pld [src, #-64] )
-+
-+ PLD( @ cache alignment )
-+ PLD( ands ip, src, #31 )
-+ PLD( pld [src, #-96] )
-+ PLD( beq 29f )
-+ PLD( cmp r2, ip )
-+ PLD( pld [src, #-128] )
-+ PLD( blt 29f )
-+ PLD( sub r2, r2, ip )
-+28: PLD( mov r4, r3, push #\push )
-+ PLD( ldr r3, [src, #-4]! )
-+ PLD( subs ip, ip, #4 )
-+ PLD( orr r4, r4, r3, pull #\pull )
-+ PLD( str r4, [dst, #-4]! )
-+ PLD( bgt 28b )
-+
-+29: PLD( pld [src, #-128] )
-+30: mov lr, r3, push #\push
-+ ldmdb src!, {r3 - r9, ip}
-+ subs r2, r2, #32
-+ orr lr, lr, ip, pull #\pull
-+ mov ip, ip, push #\push
-+ orr ip, ip, r9, pull #\pull
-+ mov r9, r9, push #\push
-+ orr r9, r9, r8, pull #\pull
-+ mov r8, r8, push #\push
-+ orr r8, r8, r7, pull #\pull
-+ mov r7, r7, push #\push
-+ orr r7, r7, r6, pull #\pull
-+ mov r6, r6, push #\push
-+ orr r6, r6, r5, pull #\pull
-+ mov r5, r5, push #\push
-+ orr r5, r5, r4, pull #\pull
-+ mov r4, r4, push #\push
-+ orr r4, r4, r3, pull #\pull
-+ stmdb dst!, {r4 - r9, ip, lr}
-+ bge 29b
-+ PLD( cmn r2, #96 )
-+ PLD( bge 30b )
-+ PLD( add r2, r2, #96 )
-+ cmn r2, #16
-+ blt 32f
-+31: mov r7, r3, push #\push
-+ ldmdb src!, {r3 - r6}
-+ sub r2, r2, #16
-+ orr r7, r7, r6, pull #\pull
-+ mov r6, r6, push #\push
-+ orr r6, r6, r5, pull #\pull
-+ mov r5, r5, push #\push
-+ orr r5, r5, r4, pull #\pull
-+ mov r4, r4, push #\push
-+ orr r4, r4, r3, pull #\pull
-+ stmdb dst!, {r4 - r7}
-+32: adds r2, r2, #28
-+ ldmfd sp!, {r5 - r9}
-+ blt 34f
-+33: mov r4, r3, push #\push
-+ ldr r3, [src, #-4]!
-+ subs r2, r2, #4
-+ orr r4, r4, r3, pull #\pull
-+ str r4, [dst, #-4]!
-+ bge 33b
-+34:
-+ .endm
-+
-+
-+ backward_copy_shift push=8 pull=24
-+ add src, src, #3
-+ b 25b
-+
-+35: backward_copy_shift push=16 pull=16
-+ add src, src, #2
-+ b 25b
-+
-+36: backward_copy_shift push=24 pull=8
-+ add src, src, #1
-+ b 25b
-+
-+ .size bcopy, . - bcopy
-+END(bcopy)
-
---- /dev/null 2004-02-02 20:32:13.000000000 +0000
-+++ sysdeps/arm/memcpy.S 2004-05-02 14:33:22.000000000 +0100
-@@ -0,0 +1,242 @@
-+/*
-+ * Optimized memcpy implementation for ARM processors
-+ *
-+ * Author: Nicolas Pitre
-+ * Created: Dec 23, 2003
-+ * Copyright: (C) MontaVista Software, Inc.
-+ *
-+ * This file is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ */
-+
-+#include <sysdep.h>
-+
-+
-+/*
-+ * Endian independent macros for shifting bytes within registers.
-+ */
-+#ifndef __ARMEB__
-+#define pull lsr
-+#define push lsl
-+#else
-+#define pull lsl
-+#define push lsr
-+#endif
-+
-+/*
-+ * Enable data preload for architectures that support it (ARMv5 and above)
-+ */
-+#if defined(__ARM_ARCH_5__) || \
-+ defined(__ARM_ARCH_5T__) || \
-+ defined(__ARM_ARCH_5TE__)
-+#define PLD(code...) code
-+#else
-+#define PLD(code...)
-+#endif
-+
-+
-+/* char * memcpy (char *dst, const char *src) */
-+
-+ENTRY(memcpy)
-+ subs r2, r2, #4
-+ stmfd sp!, {r0, r4, lr}
-+ blt 7f
-+ ands ip, r0, #3
-+ PLD( pld [r1, #0] )
-+ bne 8f
-+ ands ip, r1, #3
-+ bne 9f
-+
-+1: subs r2, r2, #4
-+ blt 6f
-+ subs r2, r2, #8
-+ blt 5f
-+ subs r2, r2, #16
-+ blt 4f
-+
-+ PLD( subs r2, r2, #65 )
-+ stmfd sp!, {r5 - r8}
-+ PLD( blt 3f )
-+ PLD( pld [r1, #32] )
-+
-+ PLD( @ cache alignment )
-+ PLD( ands ip, r1, #31 )
-+ PLD( pld [r1, #64] )
-+ PLD( beq 2f )
-+ PLD( rsb ip, ip, #32 )
-+ PLD( cmp r2, ip )
-+ PLD( pld [r1, #96] )
-+ PLD( blt 2f )
-+ PLD( cmp ip, #16 )
-+ PLD( sub r2, r2, ip )
-+ PLD( ldmgeia r1!, {r3 - r6} )
-+ PLD( stmgeia r0!, {r3 - r6} )
-+ PLD( beq 2f )
-+ PLD( and ip, ip, #15 )
-+ PLD( cmp ip, #8 )
-+ PLD( ldr r3, [r1], #4 )
-+ PLD( ldrge r4, [r1], #4 )
-+ PLD( ldrgt r5, [r1], #4 )
-+ PLD( str r3, [r0], #4 )
-+ PLD( strge r4, [r0], #4 )
-+ PLD( strgt r5, [r0], #4 )
-+
-+2: PLD( pld [r1, #96] )
-+3: ldmia r1!, {r3 - r8, ip, lr}
-+ subs r2, r2, #32
-+ stmia r0!, {r3 - r8, ip, lr}
-+ bge 2b
-+ PLD( cmn r2, #65 )
-+ PLD( bge 3b )
-+ PLD( add r2, r2, #65 )
-+ tst r2, #31
-+ ldmfd sp!, {r5 - r8}
-+ ldmeqfd sp!, {r0, r4, pc}
-+
-+ tst r2, #16
-+4: ldmneia r1!, {r3, r4, ip, lr}
-+ stmneia r0!, {r3, r4, ip, lr}
-+
-+ tst r2, #8
-+5: ldmneia r1!, {r3, r4}
-+ stmneia r0!, {r3, r4}
-+
-+ tst r2, #4
-+6: ldrne r3, [r1], #4
-+ strne r3, [r0], #4
-+
-+7: ands r2, r2, #3
-+ ldmeqfd sp!, {r0, r4, pc}
-+
-+ cmp r2, #2
-+ ldrb r3, [r1], #1
-+ ldrgeb r4, [r1], #1
-+ ldrgtb ip, [r1]
-+ strb r3, [r0], #1
-+ strgeb r4, [r0], #1
-+ strgtb ip, [r0]
-+ ldmfd sp!, {r0, r4, pc}
-+
-+8: rsb ip, ip, #4
-+ cmp ip, #2
-+ ldrb r3, [r1], #1
-+ ldrgeb r4, [r1], #1
-+ ldrgtb lr, [r1], #1
-+ strb r3, [r0], #1
-+ strgeb r4, [r0], #1
-+ strgtb lr, [r0], #1
-+ subs r2, r2, ip
-+ blt 7b
-+ ands ip, r1, #3
-+ beq 1b
-+
-+9: bic r1, r1, #3
-+ cmp ip, #2
-+ ldr lr, [r1], #4
-+ beq 17f
-+ bgt 18f
-+
-+
-+ .macro forward_copy_shift pull push
-+
-+ cmp r2, #12
-+ PLD( pld [r1, #0] )
-+ blt 15f
-+ subs r2, r2, #28
-+ stmfd sp!, {r5 - r9}
-+ blt 13f
-+
-+ PLD( subs r2, r2, #97 )
-+ PLD( blt 12f )
-+ PLD( pld [r1, #32] )
-+
-+ PLD( @ cache alignment )
-+ PLD( rsb ip, r1, #36 )
-+ PLD( pld [r1, #64] )
-+ PLD( ands ip, ip, #31 )
-+ PLD( pld [r1, #96] )
-+ PLD( beq 11f )
-+ PLD( cmp r2, ip )
-+ PLD( pld [r1, #128] )
-+ PLD( blt 11f )
-+ PLD( sub r2, r2, ip )
-+10: PLD( mov r3, lr, pull #\pull )
-+ PLD( ldr lr, [r1], #4 )
-+ PLD( subs ip, ip, #4 )
-+ PLD( orr r3, r3, lr, push #\push )
-+ PLD( str r3, [r0], #4 )
-+ PLD( bgt 10b )
-+
-+11: PLD( pld [r1, #128] )
-+12: mov r3, lr, pull #\pull
-+ ldmia r1!, {r4 - r9, ip, lr}
-+ subs r2, r2, #32
-+ orr r3, r3, r4, push #\push
-+ mov r4, r4, pull #\pull
-+ orr r4, r4, r5, push #\push
-+ mov r5, r5, pull #\pull
-+ orr r5, r5, r6, push #\push
-+ mov r6, r6, pull #\pull
-+ orr r6, r6, r7, push #\push
-+ mov r7, r7, pull #\pull
-+ orr r7, r7, r8, push #\push
-+ mov r8, r8, pull #\pull
-+ orr r8, r8, r9, push #\push
-+ mov r9, r9, pull #\pull
-+ orr r9, r9, ip, push #\push
-+ mov ip, ip, pull #\pull
-+ orr ip, ip, lr, push #\push
-+ stmia r0!, {r3 - r9, ip}
-+ bge 11b
-+ PLD( cmn r2, #97 )
-+ PLD( bge 12b )
-+ PLD( add r2, r2, #97 )
-+ cmn r2, #16
-+ blt 14f
-+13: mov r3, lr, pull #\pull
-+ ldmia r1!, {r4 - r6, lr}
-+ sub r2, r2, #16
-+ orr r3, r3, r4, push #\push
-+ mov r4, r4, pull #\pull
-+ orr r4, r4, r5, push #\push
-+ mov r5, r5, pull #\pull
-+ orr r5, r5, r6, push #\push
-+ mov r6, r6, pull #\pull
-+ orr r6, r6, lr, push #\push
-+ stmia r0!, {r3 - r6}
-+14: adds r2, r2, #28
-+ ldmfd sp!, {r5 - r9}
-+ blt 16f
-+15: mov r3, lr, pull #\pull
-+ ldr lr, [r1], #4
-+ subs r2, r2, #4
-+ orr r3, r3, lr, push #\push
-+ str r3, [r0], #4
-+ bge 15b
-+16:
-+ .endm
-+
-+
-+ forward_copy_shift pull=8 push=24
-+ sub r1, r1, #3
-+ b 7b
-+
-+17: forward_copy_shift pull=16 push=16
-+ sub r1, r1, #2
-+ b 7b
-+
-+18: forward_copy_shift pull=24 push=8
-+ sub r1, r1, #1
-+ b 7b
-+
-+ .size memcpy, . - memcpy
-+END(memcpy)
-+libc_hidden_builtin_def (memcpy)
-+
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
deleted file mode 100644
index 199aaa6..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.4/elf/Versions.ark 2006-03-11 23:30:09.000000000 +0100
-+++ glibc-2.4/elf/Versions 2006-03-11 23:31:44.000000000 +0100
-@@ -63,5 +63,7 @@
- _dl_debug_state;
- # Pointer protection.
- __pointer_chk_guard;
-+ # for ldconfig
-+ _dl_cache_libcmp;
- }
- }
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf b/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
deleted file mode 100644
index ddd777d..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/local/lib
-include /etc/ld.so.conf.d/*
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
deleted file mode 100644
index 91c6781..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~ Thu May 27 13:16:33 1999
-+++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h Thu May 27 13:17:55 1999
-@@ -71,7 +71,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define _PATH_DEV "/dev/"
- #define _PATH_TMP "/tmp/"
--#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARDB "/var/lib/misc/"
- #define _PATH_VARRUN "/var/run/"
- #define _PATH_VARTMP "/var/tmp/"
-
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk b/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
deleted file mode 100644
index d2a28c2..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make
-
-include $(IN)
-
-all:
- rm -f $(OUT)
- touch $(OUT)
- for locale in $(SUPPORTED-LOCALES); do \
- [ $$locale = true ] && continue; \
- echo $$locale | sed 's,/, ,' >> $(OUT); \
- done
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
deleted file mode 100644
index 47e7ded..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _SYS_SELECT_H
-# error "Never use <bits/select.h> directly; include <sys/select.h> instead."
-#endif
-
-
-/* We don't use `memset' because this would require a prototype and
- the array isn't too big. */
-#define __FD_ZERO(s) \
- do { \
- unsigned int __i; \
- fd_set *__arr = (s); \
- for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \
- __FDS_BITS (__arr)[__i] = 0; \
- } while (0)
-#define __FD_SET(d, s) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d))
-#define __FD_CLR(d, s) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d))
-#define __FD_ISSET(d, s) ((__FDS_BITS (s)[__FDELT(d)] & __FDMASK(d)) != 0)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
deleted file mode 100644
index b3184d1..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* System-dependent timing definitions. Generic version.
- Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/*
- * Never include this file directly; use <time.h> instead.
- */
-
-#ifndef __need_timeval
-# ifndef _BITS_TIME_H
-# define _BITS_TIME_H 1
-
-/* ISO/IEC 9899:1990 7.12.1: <time.h>
- The macro `CLOCKS_PER_SEC' is the number per second of the value
- returned by the `clock' function. */
-/* CAE XSH, Issue 4, Version 2: <time.h>
- The value of CLOCKS_PER_SEC is required to be 1 million on all
- XSI-conformant systems. */
-# define CLOCKS_PER_SEC 1000000l
-
-# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
-/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
- presents the real value for clock ticks per second for the system. */
-# include <bits/types.h>
-extern long int __sysconf (int);
-# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */
-# endif
-
-# ifdef __USE_POSIX199309
-/* Identifier for system-wide realtime clock. */
-# define CLOCK_REALTIME 0
-/* Monotonic system-wide clock. */
-# define CLOCK_MONOTONIC 1
-/* High-resolution timer from the CPU. */
-# define CLOCK_PROCESS_CPUTIME_ID 2
-/* Thread-specific CPU-time clock. */
-# define CLOCK_THREAD_CPUTIME_ID 3
-
-/* Flag to indicate time is absolute. */
-# define TIMER_ABSTIME 1
-# endif
-
-# endif /* bits/time.h */
-#endif
-
-#ifdef __need_timeval
-# undef __need_timeval
-# ifndef _STRUCT_TIMEVAL
-# define _STRUCT_TIMEVAL 1
-# include <bits/types.h>
-
-/* A time value that is accurate to the nearest
- microsecond but also has a range of years. */
-struct timeval
- {
- __time_t tv_sec; /* Seconds. */
- __suseconds_t tv_usec; /* Microseconds. */
- };
-# endif /* struct timeval */
-#endif /* need timeval */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
deleted file mode 100644
index 65c8a9f..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* bits/types.h -- definitions of __*_t types underlying *_t types.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/*
- * Never include this file directly; use <sys/types.h> instead.
- */
-
-#ifndef _BITS_TYPES_H
-#define _BITS_TYPES_H 1
-
-#include <features.h>
-#include <bits/wordsize.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-/* Convenience types. */
-typedef unsigned char __u_char;
-typedef unsigned short int __u_short;
-typedef unsigned int __u_int;
-typedef unsigned long int __u_long;
-
-/* Fixed-size types, underlying types depend on word size and compiler. */
-typedef signed char __int8_t;
-typedef unsigned char __uint8_t;
-typedef signed short int __int16_t;
-typedef unsigned short int __uint16_t;
-typedef signed int __int32_t;
-typedef unsigned int __uint32_t;
-#if __WORDSIZE == 64
-typedef signed long int __int64_t;
-typedef unsigned long int __uint64_t;
-#elif defined __GLIBC_HAVE_LONG_LONG
-__extension__ typedef signed long long int __int64_t;
-__extension__ typedef unsigned long long int __uint64_t;
-#endif
-
-/* quad_t is also 64 bits. */
-#if __WORDSIZE == 64
-typedef long int __quad_t;
-typedef unsigned long int __u_quad_t;
-#elif defined __GLIBC_HAVE_LONG_LONG
-__extension__ typedef long long int __quad_t;
-__extension__ typedef unsigned long long int __u_quad_t;
-#else
-typedef struct
-{
- long __val[2];
-} __quad_t;
-typedef struct
-{
- __u_long __val[2];
-} __u_quad_t;
-#endif
-
-
-/* The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
- macros for each of the OS types we define below. The definitions
- of those macros must use the following macros for underlying types.
- We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
- variants of each of the following integer types on this machine.
-
- 16 -- "natural" 16-bit type (always short)
- 32 -- "natural" 32-bit type (always int)
- 64 -- "natural" 64-bit type (long or long long)
- LONG32 -- 32-bit type, traditionally long
- QUAD -- 64-bit type, always long long
- WORD -- natural type of __WORDSIZE bits (int or long)
- LONGWORD -- type of __WORDSIZE bits, traditionally long
-
- We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
- conventional uses of `long' or `long long' type modifiers match the
- types we define, even when a less-adorned type would be the same size.
- This matters for (somewhat) portably writing printf/scanf formats for
- these types, where using the appropriate l or ll format modifiers can
- make the typedefs and the formats match up across all GNU platforms. If
- we used `long' when it's 64 bits where `long long' is expected, then the
- compiler would warn about the formats not matching the argument types,
- and the programmer changing them to shut up the compiler would break the
- program's portability.
-
- Here we assume what is presently the case in all the GCC configurations
- we support: long long is always 64 bits, long is always word/address size,
- and int is always 32 bits. */
-
-#define __S16_TYPE short int
-#define __U16_TYPE unsigned short int
-#define __S32_TYPE int
-#define __U32_TYPE unsigned int
-#define __SLONGWORD_TYPE long int
-#define __ULONGWORD_TYPE unsigned long int
-#if __WORDSIZE == 32
-# define __SQUAD_TYPE __quad_t
-# define __UQUAD_TYPE __u_quad_t
-# define __SWORD_TYPE int
-# define __UWORD_TYPE unsigned int
-# define __SLONG32_TYPE long int
-# define __ULONG32_TYPE unsigned long int
-# define __S64_TYPE __quad_t
-# define __U64_TYPE __u_quad_t
-/* We want __extension__ before typedef's that use nonstandard base types
- such as `long long' in C89 mode. */
-# define __STD_TYPE __extension__ typedef
-#elif __WORDSIZE == 64
-# define __SQUAD_TYPE long int
-# define __UQUAD_TYPE unsigned long int
-# define __SWORD_TYPE long int
-# define __UWORD_TYPE unsigned long int
-# define __SLONG32_TYPE int
-# define __ULONG32_TYPE unsigned int
-# define __S64_TYPE long int
-# define __U64_TYPE unsigned long int
-/* No need to mark the typedef with __extension__. */
-# define __STD_TYPE typedef
-#else
-# error
-#endif
-#include <bits/typesizes.h> /* Defines __*_T_TYPE macros. */
-
-
-__STD_TYPE __DEV_T_TYPE __dev_t; /* Type of device numbers. */
-__STD_TYPE __UID_T_TYPE __uid_t; /* Type of user identifications. */
-__STD_TYPE __GID_T_TYPE __gid_t; /* Type of group identifications. */
-__STD_TYPE __INO_T_TYPE __ino_t; /* Type of file serial numbers. */
-__STD_TYPE __INO64_T_TYPE __ino64_t; /* Type of file serial numbers (LFS).*/
-__STD_TYPE __MODE_T_TYPE __mode_t; /* Type of file attribute bitmasks. */
-__STD_TYPE __NLINK_T_TYPE __nlink_t; /* Type of file link counts. */
-__STD_TYPE __OFF_T_TYPE __off_t; /* Type of file sizes and offsets. */
-__STD_TYPE __OFF64_T_TYPE __off64_t; /* Type of file sizes and offsets (LFS). */
-__STD_TYPE __PID_T_TYPE __pid_t; /* Type of process identifications. */
-__STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */
-__STD_TYPE __CLOCK_T_TYPE __clock_t; /* Type of CPU usage counts. */
-__STD_TYPE __RLIM_T_TYPE __rlim_t; /* Type for resource measurement. */
-__STD_TYPE __RLIM64_T_TYPE __rlim64_t; /* Type for resource measurement (LFS). */
-__STD_TYPE __ID_T_TYPE __id_t; /* General type for IDs. */
-__STD_TYPE __TIME_T_TYPE __time_t; /* Seconds since the Epoch. */
-__STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds. */
-__STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds. */
-
-__STD_TYPE __DADDR_T_TYPE __daddr_t; /* The type of a disk address. */
-__STD_TYPE __SWBLK_T_TYPE __swblk_t; /* Type of a swap block maybe? */
-__STD_TYPE __KEY_T_TYPE __key_t; /* Type of an IPC key. */
-
-/* Clock ID used in clock and timer functions. */
-__STD_TYPE __CLOCKID_T_TYPE __clockid_t;
-
-/* Timer ID returned by `timer_create'. */
-__STD_TYPE __TIMER_T_TYPE __timer_t;
-
-/* Type to represent block size. */
-__STD_TYPE __BLKSIZE_T_TYPE __blksize_t;
-
-/* Types from the Large File Support interface. */
-
-/* Type to count number of disk blocks. */
-__STD_TYPE __BLKCNT_T_TYPE __blkcnt_t;
-__STD_TYPE __BLKCNT64_T_TYPE __blkcnt64_t;
-
-/* Type to count file system blocks. */
-__STD_TYPE __FSBLKCNT_T_TYPE __fsblkcnt_t;
-__STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t;
-
-/* Type to count file system nodes. */
-__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t;
-__STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t;
-
-__STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error. */
-
-/* These few don't really vary by system, they always correspond
- to one of the other defined types. */
-typedef __off64_t __loff_t; /* Type of file sizes and offsets (LFS). */
-typedef __quad_t *__qaddr_t;
-typedef char *__caddr_t;
-
-/* Duplicates info from stdint.h but this is used in unistd.h. */
-__STD_TYPE __SWORD_TYPE __intptr_t;
-
-/* Duplicate info from sys/socket.h. */
-__STD_TYPE __U32_TYPE __socklen_t;
-
-
-#undef __STD_TYPE
-
-#endif /* bits/types.h */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
deleted file mode 100644
index e9226c4..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* bits/typesizes.h -- underlying types for *_t. Generic version.
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _BITS_TYPES_H
-# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef _BITS_TYPESIZES_H
-#define _BITS_TYPESIZES_H 1
-
-/* See <bits/types.h> for the meaning of these macros. This file exists so
- that <bits/types.h> need not vary across different GNU platforms. */
-
-#define __DEV_T_TYPE __UQUAD_TYPE
-#define __UID_T_TYPE __U32_TYPE
-#define __GID_T_TYPE __U32_TYPE
-#define __INO_T_TYPE __ULONGWORD_TYPE
-#define __INO64_T_TYPE __UQUAD_TYPE
-#define __MODE_T_TYPE __U32_TYPE
-#define __NLINK_T_TYPE __UWORD_TYPE
-#define __OFF_T_TYPE __SLONGWORD_TYPE
-#define __OFF64_T_TYPE __SQUAD_TYPE
-#define __PID_T_TYPE __S32_TYPE
-#define __RLIM_T_TYPE __ULONGWORD_TYPE
-#define __RLIM64_T_TYPE __UQUAD_TYPE
-#define __BLKCNT_T_TYPE __SLONGWORD_TYPE
-#define __BLKCNT64_T_TYPE __SQUAD_TYPE
-#define __FSBLKCNT_T_TYPE __ULONGWORD_TYPE
-#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
-#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
-#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
-#define __ID_T_TYPE __U32_TYPE
-#define __CLOCK_T_TYPE __SLONGWORD_TYPE
-#define __TIME_T_TYPE __SLONGWORD_TYPE
-#define __USECONDS_T_TYPE __U32_TYPE
-#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE
-#define __DADDR_T_TYPE __S32_TYPE
-#define __SWBLK_T_TYPE __SLONGWORD_TYPE
-#define __KEY_T_TYPE __S32_TYPE
-#define __CLOCKID_T_TYPE __S32_TYPE
-#define __TIMER_T_TYPE void *
-#define __BLKSIZE_T_TYPE __SLONGWORD_TYPE
-#define __FSID_T_TYPE struct { int __val[2]; }
-#define __SSIZE_T_TYPE __SWORD_TYPE
-
-/* Number of descriptors that can fit in an `fd_set'. */
-#define __FD_SETSIZE 1024
-
-
-#endif /* bits/typesizes.h */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
deleted file mode 100644
index 07e4758..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200
-+++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200
-@@ -844,10 +844,10 @@
- # Accept binutils 2.13 or newer.
- AC_CHECK_PROG_VER(AS, $AS, --version,
- [GNU assembler.* \([0-9]*\.[0-9.]*\)],
-- [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
-+ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as")
- AC_CHECK_PROG_VER(LD, $LD, --version,
- [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
-- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
-+ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld")
-
- # We need the physical current working directory. We cannot use the
- # "pwd -P" shell builtin since that's not portable. Instead we try to
---- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100
-+++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200
-@@ -4531,7 +4531,7 @@
- ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 2.1[3-9]*)
-+ 2.1[3-9]* | 2.2*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
-@@ -4594,7 +4594,7 @@
- ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 2.1[3-9]*)
-+ 2.1[3-9]* | 2.2*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
deleted file mode 100644
index 843c5e8..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
-
-Upstream-Status: Inappropriate [not used]
-
---- /tmp/stdio-lock.h 2008-03-04 18:51:15.555038993 +0100
-+++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h 2008-03-04 18:51:28.445035052 +0100
-@@ -50,6 +50,8 @@
- _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
- _IO_flockfile (_fp)
-
-+# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
-+
- # define _IO_release_lock(_fp) \
- _IO_funlockfile (_fp); \
- _IO_cleanup_region_end (0)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
deleted file mode 100644
index 9dba9d2..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
-
-Upstream-Status: Inappropriate [not used]
-
-
-Index: glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
-===================================================================
---- glibc-2.6.1.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-09-12 18:08:18.000000000 -0700
-+++ glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-09-12 18:08:28.000000000 -0700
-@@ -45,7 +45,6 @@
- #include <sys/mman.h>
-
- #include <linux/version.h>
--#include <asm/page.h>
- #include <sys/sysctl.h>
-
- #define PATH_ARM_SYSTYPE "/etc/arm_systype"
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
deleted file mode 100644
index a0e55bf..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org Tue Oct 31 17:37:21 2006
-Return-Path: <libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org>
-Delivered-To: listarch-libc-ports at sources dot redhat dot com
-Received: (qmail 17273 invoked by alias); 31 Oct 2006 17:37:20 -0000
-Received: (qmail 17262 invoked by uid 22791); 31 Oct 2006 17:37:19 -0000
-X-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00,TW_CP
-X-Spam-Check-By: sourceware.org
-Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Tue, 31 Oct 2006 17:37:11 +0000
-Received: from drow by nevyn.them.org with local (Exim 4.54) id 1GexXw-0007Dj-30; Tue, 31 Oct 2006 12:37:08 -0500
-Date: Tue, 31 Oct 2006 12:37:08 -0500
-From: Daniel Jacobowitz <drow at false dot org>
-To: Mike Frysinger <vapier at gentoo dot org>
-Cc: libc-ports at sourceware dot org, Philip Balister <philip dot balister at gmail dot com>
-Subject: Re: Problem with glibc-2.5 on ARM
-Message-ID: <20061031173708.GJ20468@nevyn.them.org>
-References: <499146270610241149ibe030e0nd9d6b177a95b346e@mail.gmail.com> <499146270610241254u7cadf63ej2edf05cedbc5266f@mail.gmail.com> <20061024195837.GA20181@nevyn.them.org> <200610291954.27022.vapier@gentoo.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <200610291954 dot 27022 dot vapier at gentoo dot org>
-User-Agent: Mutt/1.5.13 (2006-08-11)
-X-IsSubscribed: yes
-Mailing-List: contact libc-ports-help at sourceware dot org; run by ezmlm
-Precedence: bulk
-List-Subscribe: <mailto:libc-ports-subscribe at sourceware dot org>
-List-Post: <mailto:libc-ports at sourceware dot org>
-List-Help: <mailto:libc-ports-help at sourceware dot org>, <http://sourceware dot org/lists dot html#faqs>
-Sender: libc-ports-owner at sourceware dot org
-Delivered-To: mailing list libc-ports at sourceware dot org
-
-On Sun, Oct 29, 2006 at 07:54:25PM -0500, Mike Frysinger wrote:
-> On Tuesday 24 October 2006 15:58, Daniel Jacobowitz wrote:
-> > ARM is going to need a slightly different version of that file, I
-> > guess.
->
-> would declaring req with attribute packed not help ?
-> -mike
-
-Nope. "struct rtgenmsg" would still have size 4.
-
-Philip, are you still at all interested in this for the old ABI?
-I don't have time to test this patch right now, but I think it
-will work.
-
---
-Daniel Jacobowitz
-CodeSourcery
-
-2006-10-31 Daniel Jacobowitz <dan@codesourcery.com>
-
- * sysdeps/unix/sysv/linux/arm/check_pf.c: New file.
- * sysdeps/unix/sysv/linux/arm/eabi/check_pf.c: New file.
-
-Upstream-Status: Inappropriate [not used]
-
-Index: sysdeps/unix/sysv/linux/arm/check_pf.c
-===================================================================
-RCS file: sysdeps/unix/sysv/linux/arm/check_pf.c
-diff -N sysdeps/unix/sysv/linux/arm/check_pf.c
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ sysdeps/unix/sysv/linux/arm/check_pf.c 31 Oct 2006 17:29:58 -0000
-@@ -0,0 +1,274 @@
-+/* Determine protocol families for which interfaces exist. ARM Linux version.
-+ Copyright (C) 2003, 2006 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <ifaddrs.h>
-+#include <netdb.h>
-+#include <stddef.h>
-+#include <string.h>
-+#include <time.h>
-+#include <unistd.h>
-+#include <sys/socket.h>
-+
-+#include <asm/types.h>
-+#include <linux/netlink.h>
-+#include <linux/rtnetlink.h>
-+
-+#include <not-cancel.h>
-+#include <kernel-features.h>
-+
-+
-+#ifndef IFA_F_TEMPORARY
-+# define IFA_F_TEMPORARY IFA_F_SECONDARY
-+#endif
-+#ifndef IFA_F_HOMEADDRESS
-+# define IFA_F_HOMEADDRESS 0
-+#endif
-+
-+
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+ struct in6addrinfo **in6ai, size_t *in6ailen)
-+{
-+ struct req
-+ {
-+ struct nlmsghdr nlh;
-+ struct rtgenmsg g;
-+ } req;
-+ struct sockaddr_nl nladdr;
-+
-+ /* struct rtgenmsg consists of a single byte but the ARM ABI rounds
-+ it up to a word. Clear the padding explicitly here. */
-+ assert (sizeof (req.g) == 4);
-+ memset (&req.g, '\0', sizeof (req.g));
-+
-+ req.nlh.nlmsg_len = sizeof (req);
-+ req.nlh.nlmsg_type = RTM_GETADDR;
-+ req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
-+ req.nlh.nlmsg_pid = 0;
-+ req.nlh.nlmsg_seq = time (NULL);
-+ req.g.rtgen_family = AF_UNSPEC;
-+
-+ memset (&nladdr, '\0', sizeof (nladdr));
-+ nladdr.nl_family = AF_NETLINK;
-+
-+ if (TEMP_FAILURE_RETRY (__sendto (fd, (void *) &req, sizeof (req), 0,
-+ (struct sockaddr *) &nladdr,
-+ sizeof (nladdr))) < 0)
-+ return -1;
-+
-+ *seen_ipv4 = false;
-+ *seen_ipv6 = false;
-+
-+ bool done = false;
-+ char buf[4096];
-+ struct iovec iov = { buf, sizeof (buf) };
-+ struct in6ailist
-+ {
-+ struct in6addrinfo info;
-+ struct in6ailist *next;
-+ } *in6ailist = NULL;
-+ size_t in6ailistlen = 0;
-+
-+ do
-+ {
-+ struct msghdr msg =
-+ {
-+ (void *) &nladdr, sizeof (nladdr),
-+ &iov, 1,
-+ NULL, 0,
-+ 0
-+ };
-+
-+ ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
-+ if (read_len < 0)
-+ return -1;
-+
-+ if (msg.msg_flags & MSG_TRUNC)
-+ return -1;
-+
-+ struct nlmsghdr *nlmh;
-+ for (nlmh = (struct nlmsghdr *) buf;
-+ NLMSG_OK (nlmh, (size_t) read_len);
-+ nlmh = (struct nlmsghdr *) NLMSG_NEXT (nlmh, read_len))
-+ {
-+ if (nladdr.nl_pid != 0 || (pid_t) nlmh->nlmsg_pid != pid
-+ || nlmh->nlmsg_seq != req.nlh.nlmsg_seq)
-+ continue;
-+
-+ if (nlmh->nlmsg_type == RTM_NEWADDR)
-+ {
-+ struct ifaddrmsg *ifam = (struct ifaddrmsg *) NLMSG_DATA (nlmh);
-+
-+ switch (ifam->ifa_family)
-+ {
-+ case AF_INET:
-+ *seen_ipv4 = true;
-+ break;
-+ case AF_INET6:
-+ *seen_ipv6 = true;
-+
-+ if (ifam->ifa_flags & (IFA_F_DEPRECATED
-+ | IFA_F_TEMPORARY
-+ | IFA_F_HOMEADDRESS))
-+ {
-+ struct rtattr *rta = IFA_RTA (ifam);
-+ size_t len = (nlmh->nlmsg_len
-+ - NLMSG_LENGTH (sizeof (*ifam)));
-+ void *local = NULL;
-+ void *address = NULL;
-+ while (RTA_OK (rta, len))
-+ {
-+ switch (rta->rta_type)
-+ {
-+ case IFA_LOCAL:
-+ local = RTA_DATA (rta);
-+ break;
-+
-+ case IFA_ADDRESS:
-+ address = RTA_DATA (rta);
-+ break;
-+ }
-+
-+ rta = RTA_NEXT (rta, len);
-+ }
-+
-+ struct in6ailist *newp = alloca (sizeof (*newp));
-+ newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
-+ ? in6ai_deprecated : 0)
-+ | ((ifam->ifa_flags
-+ & IFA_F_TEMPORARY)
-+ ? in6ai_temporary : 0)
-+ | ((ifam->ifa_flags
-+ & IFA_F_HOMEADDRESS)
-+ ? in6ai_homeaddress : 0));
-+ memcpy (newp->info.addr, address ?: local,
-+ sizeof (newp->info.addr));
-+ newp->next = in6ailist;
-+ in6ailist = newp;
-+ ++in6ailistlen;
-+ }
-+ break;
-+ default:
-+ /* Ignore. */
-+ break;
-+ }
-+ }
-+ else if (nlmh->nlmsg_type == NLMSG_DONE)
-+ /* We found the end, leave the loop. */
-+ done = true;
-+ }
-+ }
-+ while (! done);
-+
-+ close_not_cancel_no_status (fd);
-+
-+ if (in6ailist != NULL)
-+ {
-+ *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+ if (*in6ai == NULL)
-+ return -1;
-+
-+ *in6ailen = in6ailistlen;
-+
-+ do
-+ {
-+ (*in6ai)[--in6ailistlen] = in6ailist->info;
-+ in6ailist = in6ailist->next;
-+ }
-+ while (in6ailist != NULL);
-+ }
-+
-+ return 0;
-+}
-+
-+
-+/* We don't know if we have NETLINK support compiled in in our
-+ Kernel. */
-+#if __ASSUME_NETLINK_SUPPORT == 0
-+/* Define in ifaddrs.h. */
-+extern int __no_netlink_support attribute_hidden;
-+#else
-+# define __no_netlink_support 0
-+#endif
-+
-+
-+void
-+attribute_hidden
-+__check_pf (bool *seen_ipv4, bool *seen_ipv6,
-+ struct in6addrinfo **in6ai, size_t *in6ailen)
-+{
-+ *in6ai = NULL;
-+ *in6ailen = 0;
-+
-+ if (! __no_netlink_support)
-+ {
-+ int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+
-+ struct sockaddr_nl nladdr;
-+ memset (&nladdr, '\0', sizeof (nladdr));
-+ nladdr.nl_family = AF_NETLINK;
-+
-+ socklen_t addr_len = sizeof (nladdr);
-+
-+ if (fd >= 0
-+ && __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+ && __getsockname (fd, (struct sockaddr *) &nladdr, &addr_len) == 0
-+ && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+ in6ai, in6ailen) == 0)
-+ /* It worked. */
-+ return;
-+
-+ if (fd >= 0)
-+ __close (fd);
-+
-+#if __ASSUME_NETLINK_SUPPORT == 0
-+ /* Remember that there is no netlink support. */
-+ __no_netlink_support = 1;
-+#else
-+ /* We cannot determine what interfaces are available. Be
-+ pessimistic. */
-+ *seen_ipv4 = true;
-+ *seen_ipv6 = true;
-+#endif
-+ }
-+
-+#if __ASSUME_NETLINK_SUPPORT == 0
-+ /* No netlink. Get the interface list via getifaddrs. */
-+ struct ifaddrs *ifa = NULL;
-+ if (getifaddrs (&ifa) != 0)
-+ {
-+ /* We cannot determine what interfaces are available. Be
-+ pessimistic. */
-+ *seen_ipv4 = true;
-+ *seen_ipv6 = true;
-+ return;
-+ }
-+
-+ struct ifaddrs *runp;
-+ for (runp = ifa; runp != NULL; runp = runp->ifa_next)
-+ if (runp->ifa_addr->sa_family == PF_INET)
-+ *seen_ipv4 = true;
-+ else if (runp->ifa_addr->sa_family == PF_INET6)
-+ *seen_ipv6 = true;
-+
-+ (void) freeifaddrs (ifa);
-+#endif
-+}
-Index: sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
-===================================================================
-RCS file: sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
-diff -N sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ sysdeps/unix/sysv/linux/arm/eabi/check_pf.c 31 Oct 2006 17:29:58 -0000
-@@ -0,0 +1 @@
-+#include <sysdeps/unix/sysv/linux/check_pf.c>
-
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
deleted file mode 100644
index 1601310..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000
-+++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000
-@@ -110,7 +110,7 @@
- # environments where the executed program might not have permissions
- # to write to the console/tty. But only bash 3.x supports the pipefail
- # option, and we don't bother to handle the case for older bash versions.
--if set -o pipefail 2> /dev/null; then
-+if false; then
- try_trace() {
- eval $add_env '"$@"' | cat
- }
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
deleted file mode 100644
index c303c64..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch moves ld.so.cache from /etc to /var/run. This is for devices
-where /etc is JFFS2 or CRAMFS but /var is a ramdisk.
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Upstream-Status: Inappropriate [not used]
-
---- libc/sysdeps/generic/dl-cache.h~ldsocache-varrun
-+++ libc/sysdeps/generic/dl-cache.h
-@@ -29,7 +29,7 @@
- #endif
-
- #ifndef LD_SO_CACHE
--# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
-+# define LD_SO_CACHE "/var/run/ld.so.cache"
- #endif
-
- #ifndef add_system_dir
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
deleted file mode 100644
index 687235c..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2007-02-15 Khem Raj <kraj@xxxxxxxxxx>
-
- * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
- * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-
-Upstream-Status: Inappropriate [not used]
-
-Index: sysdeps/unix/sysv/linux/i386/sysdep.h
-===================================================================
---- sysdeps/unix/sysv/linux/i386/sysdep.h (revision 1469)
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h (working copy)
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
- /usr/include/asm/unistd.h
-Index: nptl/sysdeps/pthread/pt-initfini.c
-===================================================================
---- nptl/sysdeps/pthread/pt-initfini.c (revision 1469)
-+++ nptl/sysdeps/pthread/pt-initfini.c (working copy)
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch b/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
deleted file mode 100644
index 2599e16..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
-section if a --version-script sets _RLD_MAP to local. This is apparently
-a binutils bug, but libc shouldn't segfault in this case.
-
-see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
-
-Upstream-Status: Inappropriate [not used]
-
-9/19/2010 - added by Qing He <qing.he@intel.com>
----
-diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
---- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
-+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
-@@ -70,7 +70,8 @@
- /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
- with the run-time address of the r_debug structure */
- #define ELF_MACHINE_DEBUG_SETUP(l,r) \
--do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
-+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
-+ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
- *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
- (ElfW(Addr)) (r); \
- } while (0)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
deleted file mode 100644
index 7e3d9bb..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.4/nptl/sysdeps/pthread/configure.in.ark 2006-03-12 00:41:40.000000000 +0100
-+++ glibc-2.4/nptl/sysdeps/pthread/configure.in 2006-03-12 00:44:08.000000000 +0100
-@@ -45,5 +45,6 @@
- AC_MSG_ERROR([the compiler must support C cleanup handling])
- fi
- else
-- AC_MSG_ERROR(forced unwind support is required)
-+ AC_MSG_WARN([forced unwind support is required, can't be verified while crosscompiling])
-+ AC_DEFINE(HAVE_FORCED_UNWIND)
- fi
---- glibc-2.4/nptl/sysdeps/pthread/configure.ark 2006-03-12 00:42:47.000000000 +0100
-+++ glibc-2.4/nptl/sysdeps/pthread/configure 2006-03-12 00:44:08.000000000 +0100
-@@ -153,7 +153,10 @@
- { (exit 1); exit 1; }; }
- fi
- else
-- { { echo "$as_me:$LINENO: error: forced unwind support is required" >&5
--echo "$as_me: error: forced unwind support is required" >&2;}
-- { (exit 1); exit 1; }; }
-+ { echo "$as_me:$LINENO: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&5
-+echo "$as_me: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&2;}
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_FORCED_UNWIND 1
-+_ACEOF
-+
- fi
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
deleted file mode 100644
index 8017e49..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- nscd/nscd.init
-+++ nscd/nscd.init
-@@ -48,9 +48,8 @@
-
- start () {
- [ -d /var/run/nscd ] || mkdir /var/run/nscd
-- [ -d /var/db/nscd ] || mkdir /var/db/nscd
- echo -n $"Starting $prog: "
-- daemon /usr/sbin/nscd
-+ /usr/sbin/nscd
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
-@@ -67,12 +66,10 @@
- # a non-privileged user
- rm -f /var/run/nscd/nscd.pid
- rm -f /var/run/nscd/socket
-- success $"$prog shutdown"
-- else
-- failure $"$prog shutdown"
- fi
-- echo
-- return $RETVAL
-+ echo "Done."
-+ # If nscd did not run, return 0 according to LSB.
-+ return 0
- }
-
- restart() {
-@@ -104,7 +101,8 @@
- ;;
- force-reload | reload)
- echo -n $"Reloading $prog: "
-- killproc /usr/sbin/nscd -HUP
-+ # Use killall, initscripts-1.0-r115 don't support -HUP yet.
-+ killall -HUP /usr/sbin/nscd
- RETVAL=$?
- echo
- ;;
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
deleted file mode 100644
index bbc75d1..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
-+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
-@@ -25,6 +25,9 @@
- #include <sysdep.h>
- #include <ldsodefs.h>
-
-+#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
-+
-+
- static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
- static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
- static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
-+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
-@@ -25,6 +25,8 @@
- #include <sysdep.h>
- #include <ldsodefs.h>
-
-+#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
-+
- static const float almost_half = 0.50000006; /* 0.5 + 2^-24 */
- static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
- static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
deleted file mode 100644
index 585bb62..0000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-Index: glibc-2.9/Makerules
-===================================================================
---- glibc-2.9.orig/Makerules 2009-09-14 16:39:21.000000000 +0100
-+++ glibc-2.9/Makerules 2009-09-14 16:39:50.000000000 +0100
-@@ -173,6 +173,8 @@
- # it's used in sysd-rules, below.
- $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \
- %.sym $(common-before-compile)
-+ rm -f $(@:.h=.h.d)
-+ rm -f $(@:.h.d=.h)
- $(AWK) -f $< $(filter %.sym,$^) \
- | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \
- -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)'
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
deleted file mode 100644
index 3745955..0000000
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-SECTION = "libs"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-
-STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
-
-do_configure () {
- sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
- chmod +x ${S}/configure
- find ${S} -name "configure" | xargs touch
- ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
- --without-cvs --disable-sanity-checks \
- --with-headers=${STAGING_DIR_TARGET}${includedir} \
- --enable-hacker-mode
- if grep -q GLIBC_2.3 ${S}/ChangeLog; then
- # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
- # Fortunately, we don't need errlist-compat.c, since we just need .h files,
- # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
- # Another workaround might be to tell configure to not use any cross options to $(CC).
- # The real fix would be to get install-headers to not generate errlist-compat.c.
- make sysdeps/gnu/errlist.c
- mkdir -p stdio-common
- touch stdio-common/errlist-compat.c
- fi
-}
-
-do_compile () {
- :
-}
-
-do_install () {
- oe_runmake cross-compiling=yes install_root=${D} \
- includedir='${includedir}' prefix='${prefix}' \
- install-bootstrap-headers=yes install-headers
-
- oe_runmake csu/subdir_lib
- # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
- # so do them by hand. We can tolerate an empty stubs.h for the moment.
- # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
- mkdir -p ${D}${includedir}/gnu/
- touch ${D}${includedir}/gnu/stubs.h
- cp ${S}/include/features.h ${D}${includedir}/features.h
-
- if [ -e ${B}/bits/stdio_lim.h ]; then
- cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/
- fi
- mkdir -p ${D}${libdir}/
- install -m 644 csu/crt[1in].o ${D}${libdir}
- ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
- -o ${D}${libdir}/libc.so
-
- # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
- for t in linux asm asm-generic; do
- ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
- done
-}
-
-do_siteconfig () {
- :
-}
-
-do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
diff --git a/meta/recipes-core/glibc/glibc-initial_2.10.1.bb b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
deleted file mode 100644
index bc3d7e4..0000000
--- a/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require glibc_${PV}.bb
-require glibc-initial.inc
-
-do_install_locale() {
- :
-}
-
-do_configure_prepend () {
- unset CFLAGS
-}
diff --git a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb
deleted file mode 100644
index 1ddc40e..0000000
--- a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-INHIBIT_DEFAULT_DEPS = "1"
-LICENSE = "LGPL"
-
-BPN = "glibc"
-
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
-# is set. The idea is to avoid running localedef on the target (at first boot)
-# to decrease initial boot time and avoid localedef being killed by the OOM
-# killer which used to effectively break i18n on machines with < 128MB RAM.
-
-# default to disabled
-ENABLE_BINARY_LOCALE_GENERATION ?= "0"
-ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-locale-nativesdk = "0"
-
-#enable locale generation on these arches
-# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
-BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
-
-# set "1" to use cross-localedef for locale generation
-# set "0" for qemu emulation of native localedef for locale generation
-LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
-
-PR = "r1"
-
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-
-PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
-
-PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg"
-
-PACKAGES_DYNAMIC = "locale-base-* \
- glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
-
-
-DESCRIPTION_localedef = "glibc: compile locale definition files"
-
-FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
-FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
-
-LOCALETREESRC = "${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}"
-
-do_install () {
- mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
- cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
- cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir}
- cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
- cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
- cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
- cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
-}
-
-inherit libc-package
-
-do_install[depends] += "virtual/libc${PKGSUFFIX}:do_populate_sysroot"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
deleted file mode 100644
index c1c3853..0000000
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# For now, we will skip building of a gcc package if it is a uclibc one
-# and our build is not a uclibc one, and we skip a glibc one if our build
-# is a uclibc build.
-#
-# See the note in gcc/gcc_3.4.0.oe
-#
-
-python __anonymous () {
- import bb, re
- uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
- if uc_os:
- raise bb.parse.SkipPackage("incompatible with target %s" %
- bb.data.getVar('TARGET_OS', d, 1))
-}
-
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \
- ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \
- libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \
- ${PN}-pcprofile"
-
-libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \
- ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \
- ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \
- ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* \
- ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*"
-
-# The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc
-# Solution: Make them both the same thing, then it doesn't matter
-
-glibcfiles = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig \
- ${libexecdir}/* ${datadir}/zoneinfo"
-glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
- ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
- ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
-glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
- ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
-
-FILES_glibc = "${glibcfiles}"
-FILES_${PN} = "${glibcfiles}"
-FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
-FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
-FILES_glibc-extra-nss = "${base_libdir}/libnss*"
-FILES_sln = "${base_sbindir}/sln"
-FILES_glibc-dev = "${glibcdevfiles}"
-FILES_${PN}-dev = "${glibcdevfiles}"
-FILES_glibc-dbg = "${glibcdbgfiles}"
-FILES_${PN}-dbg = "${glibcdbgfiles}"
-FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
-FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
-FILES_glibc-gconv = "${libdir}/gconv/*"
-FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv"
-RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
-FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so"
-FILES_glibc-thread-db = "${base_libdir}/libthread_db*"
-RPROVIDES_glibc-dev += "libc-dev"
-
-SUMMARY_sln = "The static ln."
-DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."
-SUMMARY_nscd = "Name service cache daemon"
-DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services."
-SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries"
-DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services.
-SUMMARY_ldd = "print shared library dependencies"
-DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line."
-SUMMARY_glibc-utils = "Miscellaneous utilities provided by glibc"
-DESCRIPTION_glibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..."
-
-EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
-
-inherit libc-common
-
-do_install_locale () {
- dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}
- install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
- cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
- cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
- mv ${D}${libdir}/gconv ${dest}${libdir}
- cp -fpPR ${D}${libdir}/* ${dest}${libdir}
- mv ${D}${datadir}/i18n ${dest}${datadir}
- cp -fpPR ${D}${datadir}/* ${dest}${datadir}
- cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
-}
-
-addtask do_install_locale after do_install before do_populate_sysroot
-
-PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
-
-glibc_package_preprocess () {
- rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
-}
-
diff --git a/meta/recipes-core/glibc/glibc-stage.inc b/meta/recipes-core/glibc/glibc-stage.inc
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
deleted file mode 100644
index 57d693c..0000000
--- a/meta/recipes-core/glibc/glibc.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-BUGTRACKER = "http://sources.redhat.com/bugzilla/"
-SECTION = "libs"
-LICENSE = "LGPLv2.1+ & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
- file://elf/cache.c;beginline=1;endline=17;md5=926aac25497b1de7d630b4749005d208 \
- file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
- file://bits/types.h;beginline=1;endline=18;md5=267938e7c0538e76f734551ec6ea908d"
-# nptl needs unwind support in gcc, which can't be built without glibc.
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
-RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
-#this leads to circular deps, so lets not add it yet
-#RDEPENDS_ldd += " bash"
-#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
-PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES += "virtual/libintl virtual/libiconv"
-
-STAGINGCC = "gcc-cross-intermediate"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
-PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
-
-TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
-
-# siteconfig.bbclass runs configure which needs a working compiler
-# For the compiler to work we need a working libc yet libc isn't
-# in the sysroots directory at this point. This means the libc.so
-# linker script won't work as the --sysroot setting isn't correct.
-# Here we create a hacked up libc linker script and pass in the right
-# flags to let configure work. Ugly.
-EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'"
-siteconfig_do_siteconfig_gencache_prepend = " \
- mkdir -p ${WORKDIR}/site_config_libc; \
- cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \
- sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \
-"
-
-inherit autotools
-
-GLIBC_EXTRA_OECONF ?= ""
-INHIBIT_DEFAULT_DEPS = "1"
-
-do_rig_locales() {
- # If indicated, only build a limited selection of locales
- if [ "x${LIMIT_BUILT_LOCALES}" != "x" ]; then
- INFILE="${S}/localedata/SUPPORTED"
- OUTFILE="${S}/localedata/SUPPORTED.tmp"
- head -n 3 $INFILE > $OUTFILE
- for i in ${LIMIT_BUILT_LOCALES}; do
- echo
- grep $i $INFILE >> $OUTFILE || true
- done
- head --lines=-1 $OUTFILE > $INFILE
- tail --lines=1 $OUTFILE | sed 's#\\##' >> $INFILE
- fi
-}
-
-addtask rig_locales before do_compile after do_configure
-
-ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
deleted file mode 100644
index e76f3c0..0000000
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ /dev/null
@@ -1,161 +0,0 @@
-require glibc.inc
-
-ARM_INSTRUCTION_SET = "arm"
-
-PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-
-PR = "r7"
-
-# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
-
-GLIBC_ADDONS ?= "ports,nptl,libidn"
-
-GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-#
-# For now, we will skip building of a gcc package if it is a uclibc one
-# and our build is not a uclibc one, and we skip a glibc one if our build
-# is a uclibc build.
-#
-# See the note in gcc/gcc_3.4.0.oe
-#
-
-python __anonymous () {
- import bb, re
- uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
- if uc_os:
- raise bb.parse.SkipPackage("incompatible with target %s" %
- bb.data.getVar('TARGET_OS', d, 1))
-}
-
-RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
-
-# file://noinfo.patch;patch=1
-# file://ldconfig.patch;patch=1;pnum=0
-# file://arm-machine-gmon.patch;patch=1;pnum=0
-# file://arm-ioperm.patch;patch=1;pnum=0
-# file://ldd.patch;patch=1;pnum=0
-SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.bz2 \
- ${GNU_MIRROR}/glibc/glibc-ports-${PV}.tar.bz2 \
- ${GNU_MIRROR}/glibc/glibc-libidn-${PV}.tar.bz2 \
- file://nscd-init.patch;striplevel=0 \
- file://arm-memcpy.patch \
- file://arm-longlong.patch \
- file://fhs-linux-paths.patch \
- file://dl-cache-libcmp.patch \
- file://ldsocache-varrun.patch \
- file://nptl-crosscompile.patch \
- file://glibc-check_pf.patch;striplevel=0 \
- file://ldd-unbash.patch \
- file://glibc-arm-IO-acquire-lock-fix.diff \
- file://mips-rld-map-check.patch \
- file://generic-bits_select.h \
- file://generic-bits_types.h \
- file://generic-bits_typesizes.h \
- file://generic-bits_time.h \
- file://etc/ld.so.conf \
- file://generate-supported.mk \
- file://march-i686.patch;striplevel=0 \
- file://rulesfix.patch \
- file://glibc-2.9-enable-binutils-2.2.patch"
-
-# Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch"
-SRC_URI_append_sh4 = " file://no-z-defs.patch"
-
-#powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff"
-
-S = "${WORKDIR}/glibc-${PV}"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
-# We need this for nativesdk
-export libc_cv_slibdir = "${base_libdir}"
-
-EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
- --without-cvs --disable-profile --disable-debug --without-gd \
- --enable-clocale=gnu \
- --enable-add-ons=${GLIBC_ADDONS} \
- --with-headers=${STAGING_INCDIR} \
- --without-selinux \
- ${GLIBC_EXTRA_OECONF}"
-
-EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
-
-do_munge() {
- # Integrate ports and libidn into tree
- mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
- mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
-
- # Ports isn't really working... Fix it
- # Some of this is rather dirty, but it seems to be the only
- # quick way to get this cruft to compile
- rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
- ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
- cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
- cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
- cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
- cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
- cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
- cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
- cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
- # Copy in generic stuff for not yet implemented headers
- for i in ${S}/bits/*.h; do
- F=`basename $i`
- [ "$F" = "local_lim.h" ] && continue
- [ "$F" = "errno.h" ] && continue
- test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
- done
- # This is harmful; we need to get the one from nptl/sysdeps/pthreads
- rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
- # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
- rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
- # Obsoleted by sysdeps/gnu/bits/utmp.h
- rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
-}
-
-addtask munge before do_patch after do_unpack
-
-
-do_configure () {
-# /var/db was not included to FHS
- sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
-# version check and doesn't really help with anything
- if [ -z "`which rpcgen`" ]; then
- echo "rpcgen not found. Install glibc-devel."
- exit 1
- fi
- (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
- CPPFLAGS="" oe_runconf
-}
-
-rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
- yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
- rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
-
-do_compile () {
- # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
- unset LDFLAGS
- base_do_compile
- (
- cd ${S}/sunrpc/rpcsvc
- for r in ${rpcsvc}; do
- h=`echo $r|sed -e's,\.x$,.h,'`
- rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
- done
- )
-}
-
-require glibc-stage.inc
-
-require glibc-package.inc
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-core/glibc/site_config/funcs b/meta/recipes-core/glibc/site_config/funcs
deleted file mode 100644
index ccc8539..0000000
--- a/meta/recipes-core/glibc/site_config/funcs
+++ /dev/null
@@ -1,474 +0,0 @@
-a64l
-abs
-access
-__adjtimex
-alarm
-alphasort
-argz_append
-__argz_count
-argz_create_sep
-argz_insert
-__argz_next
-argz_next
-__argz_stringify
-argz_stringify
-asprintf
-atexit
-atof
-atoi
-bcmp
-bcopy
-bindresvport
-bind_textdomain_codeset
-btowc
-bzero
-calloc
-canonicalize_file_name
-catgets
-cfgetospeed
-cfsetispeed
-cfsetspeed
-chmod
-chown
-chroot
-clock
-close
-closedir
-closelog
-confstr
-connect
-daemon
-dcgettext
-difftime
-dirfd
-dirname
-dngettext
-dup2
-ecvt
-endgrent
-endmntent
-endpwent
-endutent
-endutxent
-epoll_ctl
-err
-ether_hostton
-ether_ntohost
-euidaccess
-execv
-fchdir
-fchmod
-fchmodat
-fchown
-fchownat
-fcntl
-fcvt
-fdatasync
-fdopendir
-feof_unlocked
-fgets_unlocked
-fgetxattr
-finite
-flistxattr
-flock
-flockfile
-fnmatch
-fork
-fpathconf
-__fpending
-fprintf
-free
-freeaddrinfo
-freeifaddrs
-fseeko
-__fsetlocking
-fsetxattr
-fstat64
-fstat
-fstatfs
-fsync
-ftello
-ftime
-ftruncate
-funlockfile
-futimes
-futimesat
-gai_strerror
-gcvt
-getaddrinfo
-getc_unlocked
-getcwd
-getdelim
-getdomainname
-getdtablesize
-getegid
-getenv
-geteuid
-getgid
-getgrent
-getgrent_r
-getgrgid_r
-getgrnam
-getgrnam_r
-getgrouplist
-getgroups
-gethostbyaddr_r
-gethostbyname2
-gethostbyname
-gethostbyname_r
-gethostent
-gethostid
-gethostname
-getifaddrs
-getline
-getloadavg
-getmntent
-getmsg
-getnameinfo
-getnetbyaddr_r
-getnetgrent_r
-getopt
-getopt_long
-getopt_long_only
-getpagesize
-getpass
-getpeername
-getpgrp
-getpid
-getppid
-getprotoent_r
-getpwent
-getpwent_r
-getpwnam
-getpwnam_r
-getpwuid
-getpwuid_r
-getresuid
-getrlimit
-getrusage
-getservbyname
-getservbyname_r
-getservbyport_r
-getservent
-getservent_r
-getspnam
-getspnam_r
-gettimeofday
-getttyent
-getttynam
-getuid
-getusershell
-getutent
-getutid
-getutline
-getutmp
-getutmpx
-getutxent
-getutxid
-getutxline
-getwd
-getxattr
-glob
-gmtime
-gmtime_r
-grantpt
-group_member
-herror
-hstrerror
-iconv
-iconv_open
-if_freenameindex
-if_indextoname
-if_nameindex
-if_nametoindex
-index
-inet_addr
-inet_aton
-inet_ntoa
-inet_ntop
-inet_pton
-initgroups
-innetgr
-iruserok
-isascii
-isatty
-isblank
-isgraph
-isinf
-isnan
-isprint
-isspace
-iswalnum
-iswcntrl
-iswctype
-iswprint
-iswspace
-iswupper
-isxdigit
-kill
-killpg
-lchown
-lckpwdf
-lgetxattr
-link
-listxattr
-llistxattr
-localtime
-localtime_r
-lockf
-lrand48
-lsearch
-lseek64
-lsetxattr
-lstat
-mallinfo
-malloc
-mblen
-mbrlen
-mbrtowc
-mbsinit
-mbsrtowcs
-mbtowc
-memalign
-memchr
-memcmp
-memcpy
-memmove
-mempcpy
-memrchr
-memset
-mkdir
-mkdirat
-mkdtemp
-mkfifo
-mknod
-mkstemp64
-mkstemp
-mktime
-mlock
-mmap
-mtrace
-munlock
-munmap
-nanosleep
-nice
-nl_langinfo
-ntp_adjtime
-ntp_gettime
-_obstack_free
-on_exit
-open64
-open
-openat
-opendir
-openlog
-pathconf
-pipe
-poll
-popen
-posix_memalign
-prctl
-pread
-printf
-__progname
-pselect
-pthread_mutex_lock
-ptsname
-putenv
-putgrent
-putpwent
-putspent
-pututline
-pututxline
-putwc
-pwrite
-qsort
-raise
-rand
-random
-rand_r
-read
-readdir
-readdir_r
-readlink
-realloc
-realpath
-re_comp
-recvmsg
-re_exec
-regcomp
-regexec
-remove
-rename
-re_search
-rmdir
-rpmatch
-rresvport_af
-ruserok
-ruserok_af
-sbrk
-scandir
-sched_setscheduler
-sched_yield
-__secure_getenv
-select
-semctl
-semget
-sendmsg
-setbuf
-setbuffer
-setegid
-setenv
-seteuid
-setgid
-setgroups
-sethostname
-setitimer
-_setjmp
-setjmp
-setlinebuf
-setlocale
-setmntent
-setpgid
-setpgrp
-setpriority
-setregid
-setresgid
-setresuid
-setreuid
-setrlimit
-setsid
-setsockopt
-settimeofday
-setuid
-setutent
-setutxent
-setvbuf
-setxattr
-sgetspent
-shmat
-shmctl
-shmdt
-shmget
-shutdown
-sigaction
-sigaddset
-sigaltstack
-sigblock
-sigemptyset
-sighold
-siginterrupt
-signal
-sigprocmask
-sigset
-sigsetmask
-sigstack
-sigsuspend
-sigvec
-snprintf
-socket
-socketpair
-sprintf
-srand48
-srand
-srandom
-sscanf
-stat
-statfs
-statvfs
-stime
-stpcpy
-strcasecmp
-strcasestr
-strchr
-strchrnul
-strcmp
-strcspn
-strdup
-strerror
-strerror_r
-strftime
-strlen
-strncasecmp
-strncmp
-strndup
-strnlen
-strpbrk
-strptime
-strrchr
-strsep
-strsignal
-strspn
-strstr
-strtod
-strtoimax
-strtok_r
-strtol
-strtoll
-strtoul
-strtoull
-strtoumax
-strverscmp
-strxfrm
-symlink
-sync
-sysconf
-sysctl
-sysinfo
-syslog
-_sys_siglist
-sys_siglist
-system
-tcgetattr
-tcgetpgrp
-tcsetattr
-tcsetpgrp
-time
-timegm
-times
-timezone
-tmpnam
-towlower
-towupper
-truncate
-tsearch
-ttyname
-tzset
-ulimit
-umask
-uname
-unlink
-unsetenv
-unshare
-updwtmp
-updwtmpx
-usleep
-ustat
-utime
-utimes
-utmpname
-utmpxname
-valloc
-vasprintf
-verrx
-vfork
-vfprintf
-vfscanf
-vhangup
-vprintf
-vsnprintf
-vsprintf
-wait3
-wait4
-waitpid
-wcrtomb
-wcscoll
-wcsdup
-wcslen
-wctob
-wctomb
-wctype
-wcwidth
-wmemchr
-wmemcpy
-wmempcpy
diff --git a/meta/recipes-core/glibc/site_config/headers b/meta/recipes-core/glibc/site_config/headers
deleted file mode 100644
index 609ab53..0000000
--- a/meta/recipes-core/glibc/site_config/headers
+++ /dev/null
@@ -1,156 +0,0 @@
-aio.h
-alloca.h
-argz.h
-arpa/inet.h
-arpa/nameser.h
-asm/byteorder.h
-asm/ioctls.h
-asm/page.h
-asm/types.h
-assert.h
-byteswap.h
-crypt.h
-ctype.h
-dirent.h
-dlfcn.h
-elf.h
-endian.h
-err.h
-errno.h
-execinfo.h
-fcntl.h
-features.h
-float.h
-fstab.h
-ftw.h
-getopt.h
-glob.h
-grp.h
-iconv.h
-ifaddrs.h
-inttypes.h
-langinfo.h
-lastlog.h
-libgen.h
-libintl.h
-limits.h
-linux/capability.h
-linux/fd.h
-linux/fs.h
-linux/hayesesp.h
-linux/hdreg.h
-linux/icmp.h
-linux/in6.h
-linux/joystick.h
-linux/ptrace.h
-linux/serial.h
-linux/sonypi.h
-linux/unistd.h
-linux/utsname.h
-linux/version.h
-locale.h
-malloc.h
-math.h
-mcheck.h
-memory.h
-mntent.h
-mqueue.h
-netdb.h
-net/if.h
-netinet/ether.h
-netinet/in.h
-netinet/ip6.h
-netinet/ip.h
-netinet/tcp.h
-netinet/udp.h
-netipx/ipx.h
-net/route.h
-paths.h
-poll.h
-pthread.h
-pty.h
-pwd.h
-regex.h
-resolv.h
-rpc/rpc.h
-rpc/types.h
-sched.h
-scsi/scsi.h
-search.h
-semaphore.h
-setjmp.h
-sgtty.h
-shadow.h
-signal.h
-stdarg.h
-stdbool.h
-stdc
-stddef.h
-stdint.h
-stdio.h
-stdlib.h
-string.h
-strings.h
-stropts.h
-sys/bitypes.h
-sys/cdefs.h
-sys/dir.h
-sys/epoll.h
-sysexits.h
-sys/fcntl.h
-sys/file.h
-sys/fsuid.h
-sys/ioctl.h
-sys/ipc.h
-syslog.h
-sys/mman.h
-sys/mount.h
-sys/mtio.h
-sys/param.h
-sys/poll.h
-sys/prctl.h
-sys/ptrace.h
-sys/queue.h
-sys/reg.h
-sys/resource.h
-sys/select.h
-sys/sem.h
-sys/shm.h
-sys/signal.h
-sys/socket.h
-sys/socketvar.h
-sys/soundcard.h
-sys/statfs.h
-sys/stat.h
-sys/statvfs.h
-sys/stropts.h
-sys/swap.h
-sys/sysctl.h
-sys/sysinfo.h
-sys/sysmacros.h
-sys/termios.h
-sys/timeb.h
-sys/time.h
-sys/times.h
-sys/timex.h
-sys/types.h
-sys/uio.h
-sys/un.h
-sys/unistd.h
-sys/user.h
-sys/utsname.h
-sys/vfs.h
-sys/wait.h
-termio.h
-termios.h
-time.h
-ttyent.h
-ulimit.h
-unistd.h
-ustat.h
-utime.h
-utmp.h
-utmpx.h
-values.h
-wchar.h
-wctype.h
diff --git a/meta/recipes-core/glibc/site_config/types b/meta/recipes-core/glibc/site_config/types
deleted file mode 100644
index 178bd85..0000000
--- a/meta/recipes-core/glibc/site_config/types
+++ /dev/null
@@ -1,21 +0,0 @@
-char
-char *
-double
-float
-int
-long
-long double
-long int
-long long
-long long int
-short
-short int
-signed char
-unsigned char
-unsigned int
-unsigned long
-unsigned long int
-unsigned long long int
-unsigned short
-unsigned short int
-void *
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 03/22] libzypp: Fix variable substitution problem in do_archgen step
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
2011-08-01 7:35 ` [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS Saul Wold
2011-08-01 7:35 ` [PATCH 02/22] glibc: deleted Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 04/22] docbook-sgml-dtd-native: Write a bak file for shared state Saul Wold
` (19 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
The do_archgen step creates a script that utilizes the variable name
${ARCH}. However, we also utilize and define ${ARCH} so instead of
having the following in the script:
COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH"
We get something like:
COMPAT_WITH="powerpc,${COMPAT} $COMPAT_WITH"
Just renaming the variable in the script to not conflict with ${ARCH}
fixes the issue.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 6555bd4..a9ed639 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -111,9 +111,9 @@ do_archgen () {
shift ; continue;;
esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
- ARCH="_$1"
+ CARCH="_$1"
else
- ARCH="IdString(\"$1\")"
+ CARCH="IdString(\"$1\")"
fi
shift
COMPAT=""
@@ -129,7 +129,7 @@ do_archgen () {
COMPAT="${arch_val},$COMPAT"
fi
done
- COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH"
+ COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
done
for each_compat in ${COMPAT_WITH} ; do
echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 04/22] docbook-sgml-dtd-native: Write a bak file for shared state
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (2 preceding siblings ...)
2011-08-01 7:35 ` [PATCH 03/22] libzypp: Fix variable substitution problem in do_archgen step Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 05/22] docbook-dsssl-stylesheets-native: " Saul Wold
` (18 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
index 542600a..1b357b5 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
@@ -20,7 +20,7 @@ SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip
# The .zip file extracts to the current dir
S = "${WORKDIR}"
-INC_PR = "r2"
+INC_PR = "r3"
SSTATEPOSTINSTFUNCS += "docbook_sgml_dtd_sstate_postinst"
SYSROOT_PREPROCESS_FUNCS += "docbook_sgml_dtd_sysroot_preprocess"
@@ -45,6 +45,9 @@ docbook_sgml_dtd_sstate_postinst () {
# Ensure that the catalog file sgml-docbook.cat is properly
# updated when the package is installed from sstate cache.
${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \
+ --add ${sysconfdir}/sgml/sgml-docbook.bak \
+ ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
+ ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \
--add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
fi
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 05/22] docbook-dsssl-stylesheets-native: Write a bak file for shared state
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (3 preceding siblings ...)
2011-08-01 7:35 ` [PATCH 04/22] docbook-sgml-dtd-native: Write a bak file for shared state Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 06/22] openjade-native: " Saul Wold
` (17 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../docbook-dsssl-stylesheets-native_1.79.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index a776ea5..c70e76d 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf
DEPENDS = "sgml-common-native"
-PR = "r3"
+PR = "r4"
SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
@@ -45,6 +45,9 @@ docbook_dsssl_stylesheets_sstate_postinst () {
# Ensure that the catalog file sgml-docbook.cat is properly
# updated when the package is installed from sstate cache.
${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
+ --add ${sysconfdir}/sgml/sgml-docbook.bak \
+ ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+ ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
--add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
fi
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 06/22] openjade-native: Write a bak file for shared state
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (4 preceding siblings ...)
2011-08-01 7:35 ` [PATCH 05/22] docbook-dsssl-stylesheets-native: " Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:35 ` [PATCH 07/22] sgml-common-native: Read a catalog backup to repopulate sgml-docbook.cat Saul Wold
` (16 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../openjade/openjade-native_1.3.2.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index da59406..c71f22a 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r3"
+PR = "r4"
DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common"
@@ -69,6 +69,9 @@ openjade_sstate_postinst() {
# Ensure that the catalog file sgml-docbook.cat is properly
# updated when the package is installed from sstate cache.
${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
+ --add ${sysconfdir}/sgml/sgml-docbook.bak \
+ ${sysconfdir}/sgml/openjade-${PV}.cat
+ ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
--add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/openjade-${PV}.cat
fi
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 07/22] sgml-common-native: Read a catalog backup to repopulate sgml-docbook.cat
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (5 preceding siblings ...)
2011-08-01 7:35 ` [PATCH 06/22] openjade-native: " Saul Wold
@ 2011-08-01 7:35 ` Saul Wold
2011-08-01 7:36 ` [PATCH 08/22] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling Saul Wold
` (15 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:35 UTC (permalink / raw)
To: openembedded-core
This reads the sgml-docbook.bak and adds the entries into sgml-docbook.cat since
this occurs out of order during shared state sysroot populate.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../sgml-common/sgml-common-native_0.6.3.bb | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
index 2c8d874..af7e104 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
+++ b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
@@ -13,7 +13,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b"
SECTION = "base"
-PR = "r0"
+PR = "r1"
require sgml-common_${PV}.bb
inherit native
@@ -21,6 +21,8 @@ inherit native
S = "${WORKDIR}/sgml-common-${PV}"
SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle"
+SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst"
+
do_install_append() {
# install-catalog script contains hard-coded references to
@@ -46,3 +48,17 @@ sgml_common_native_mangle () {
# Remove ${D} path from catalog file created by install-catalog script
sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog
}
+
+sgml_common_sstate_postinst() {
+ if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+ then
+ if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then
+ for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do
+ if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then
+ ${bindir}/install-catalog \
+ --add ${sysconfdir}/sgml/sgml-docbook.cat $catalog
+ fi
+ done
+ fi
+ fi
+}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 08/22] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (6 preceding siblings ...)
2011-08-01 7:35 ` [PATCH 07/22] sgml-common-native: Read a catalog backup to repopulate sgml-docbook.cat Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 09/22] tune/arch-powerpc64: Remove support for soft-float from ppc64 Saul Wold
` (14 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
When figuring out how to set TUNE_CCARGS we should look for 'm64' not
'n64' in TUNE_FEATURES.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
.../machine/include/powerpc/arch-powerpc64.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a99f18d..e55910c 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -1,6 +1,6 @@
TUNEVALID[m64] = "Power ELF64 standard ABI"
TUNE_CONFLICTS[m64] = "m32"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-m64", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
AVAILTUNES += "powerpc64 powerpc64-nf"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 09/22] tune/arch-powerpc64: Remove support for soft-float from ppc64
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (7 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 08/22] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU Saul Wold
` (13 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
All 64-bit PPC processors support hard-float so no need to support
soft-float.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
.../machine/include/powerpc/arch-powerpc64.inc | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index e55910c..a965d59 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -1,10 +1,8 @@
TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32"
+TUNE_CONFLICTS[m64] = "m32 nf"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
-AVAILTUNES += "powerpc64 powerpc64-nf"
+AVAILTUNES += "powerpc64"
TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
BASE_LIB_tune-powerpc64 = "lib64"
-TUNE_FEATURES_tune-powerpc64-nf ?= "m64 fpu-soft"
-BASE_LIB_tune-powerpc64-nf = "lib64"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (8 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 09/22] tune/arch-powerpc64: Remove support for soft-float from ppc64 Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 11/22] tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard fpu Saul Wold
` (12 subsequent siblings)
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
Its more likely that we explicitly set soft-floating point support for a
given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 8cc76ab..013755d 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
-PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
+PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 11/22] tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard fpu.
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (9 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 12/22] sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS Saul Wold
` (11 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Malcolm Crossley <malcolm.crossley@ge.com>
Signed-off-by: Malcolm Crossley <malcolm.crossley@ge.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/conf/machine/include/tune-ppce500mc.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index a4cdb1f..73217dd 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -7,5 +7,5 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc
TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "", d)}"
AVAILTUNES += "ppce500mc"
-TUNE_FEATURES_tune-ppce500mc = "m32 hard-fpu ppce500mc"
+TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 12/22] sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (10 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 11/22] tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard fpu Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice Saul Wold
` (10 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
Its possible we get duplications if we explicity add TUNE_PKGARCH to
PACKAGE_ARCHS so instead just add a sanity check to verify it.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/classes/sanity.bbclass | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index b054146..999e15d 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -375,8 +375,10 @@ def check_sanity(e):
elif oeroot.find (' ') != -1:
messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space."
- # Check that we don't have duplicate entries in PACKAGE_ARCHS
+ # Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS
pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
+ tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+ tunefound = False
seen = {}
dups = []
@@ -385,9 +387,15 @@ def check_sanity(e):
dups.append(pa)
else:
seen[pa] = 1
+ if pa == tunepkg:
+ tunefound = True
+
if len(dups):
messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
+ if tunefound == False:
+ messages = messages + "Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (%s)." % tunepkg
+
if messages != "":
raise_sanity_error(messages)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (11 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 12/22] sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 14/22] libzypp: Bump PR Saul Wold
` (9 subsequent siblings)
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/sanity.bbclass | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 999e15d..dc11c9e 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -383,12 +383,14 @@ def check_sanity(e):
dups = []
for pa in pkgarchs.split():
- if seen.get(pa, 0) == 1:
+ if pa == tunepkg:
+ tunefound = True
+ if seen.get(pa, 0) == 1:
+ pkgarchs.remove(pa)
+ elif seen.get(pa, 0) == 1:
dups.append(pa)
else:
seen[pa] = 1
- if pa == tunepkg:
- tunefound = True
if len(dups):
messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 14/22] libzypp: Bump PR
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (12 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH Saul Wold
` (8 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index a9ed639..6e8fe16 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
-PR = "r11"
+PR = "r12"
SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
file://no-doc.patch \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (13 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 14/22] libzypp: Bump PR Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 9:06 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages Saul Wold
` (7 subsequent siblings)
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Based on Kumar Gala <galak@kernel.crashing.org>'s patch.
By default we use ppc, or ppc64. Each tune either specifies their
manual version or can use the PPC_PKGARCH to specify a new prefix
if they support both float and no-float variants.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/conf/machine/include/powerpc/arch-powerpc.inc | 3 ++-
.../machine/include/powerpc/arch-powerpc64.inc | 1 +
meta/conf/machine/include/tune-ppc603e.inc | 4 ++--
meta/conf/machine/include/tune-ppce300c2.inc | 5 +++--
meta/conf/machine/include/tune-ppce500.inc | 5 +++--
meta/conf/machine/include/tune-ppce500mc.inc | 5 +++--
meta/conf/machine/include/tune-ppce500v2.inc | 5 +++--
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 013755d..2621932 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -8,6 +8,7 @@ DEFAULTTUNE ?= "powerpc"
TUNEVALID[m32] = "Power ELF32 standard ABI"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
+PPC_PKGARCH = "ppc"
TUNEVALID[fpu-hard] = "Use hardware FPU."
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"
@@ -20,7 +21,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
-TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
+TUNE_PKGARCH ?= "${PPC_PKGARCH}${PPCPKGSFX_FPU}"
# Basic tune definitions
AVAILTUNES += "powerpc powerpc-nf"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a965d59..0a104a2 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -2,6 +2,7 @@ TUNEVALID[m64] = "Power ELF64 standard ABI"
TUNE_CONFLICTS[m64] = "m32 nf"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
+PPC_PKGARCH = "ppc64"
AVAILTUNES += "powerpc64"
TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 7c05394..2eec64b 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "ppc603e", "", d)}"
+PPC_PKGARCH_tune-ppc603e = "ppc603e"
AVAILTUNES += "ppc603e"
TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
-PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"
+PACKAGE_EXTRA_ARCHS_tune-ppc603e = "ppc ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index bad2611..7763d86 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -4,8 +4,9 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2", "${TUNE_ARCH}", d)}"
+PPC_PKGARCH_tune-ppce300c2 = "ppce300c2"
+TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
AVAILTUNES += "ppce300c2"
TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
-PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "powerpc-nf ppce300c2"
+PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "ppc-nf ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index c34d631..4399e3c 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -4,12 +4,13 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "ppce500", "", d)}"
+PPC_PKGARCH_tune-ppce500 = "ppce500"
+TUNE_PKGARCH_tune-ppce500 = "ppce500"
TUNEVALID[spe] = "Enable SPE ABI extensions"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
-TARGET_FPU = "ppc-efs"
+TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500", "spe" ], "ppc-efs", "", d)}"
AVAILTUNES += "ppce500"
TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 73217dd..076f04c 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -4,8 +4,9 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "", d)}"
+PPC_PKGARCH_tune-ppce500mc = "ppce500mc"
+TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
AVAILTUNES += "ppce500mc"
TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
-PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc"
+PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "ppc ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 819d68a..2fef6d0 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -4,12 +4,13 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "ppce500v2", "", d)}"
+PPC_PKGARCH_tune-ppce500v2 = "ppce500v2"
+TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
TUNEVALID[spe] = "Enable SPE ABI extensions"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
-TARGET_FPU = "ppc-efd"
+TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2", "spe" ], "ppc-efd", "", d)}"
AVAILTUNES += "ppce500v2"
TUNE_FEATURES_tune-ppce500v2 = "m32 spe ppce500v2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (14 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:06 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
` (6 subsequent siblings)
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
The sdknative packages were not being introduced into the list of available
packages properly. Fix this by always introducing it and avoiding a sed of
one type to another.
Also fix a number of minor issues with the RPM behavior when building sdk
images.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 19 +++++++++----------
meta/classes/populate_sdk_deb.bbclass | 11 ++---------
meta/classes/populate_sdk_rpm.bbclass | 11 ++---------
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 0377100..856dfb0 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -32,14 +32,12 @@ package_update_index_rpm () {
eval archs=\${${archvar}}
packagedirs=""
packagedirs_sdk=""
- for arch in $archs; do
- sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
- extension="-nativesdk"
- if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
- extension=""
- fi
+ if [ "${SDK_ARCH}-nativesdk" != "-nativesdk" ]; then
+ packagedirs_sdk="${DEPLOY_DIR_RPM}/${SDK_ARCH}-nativesdk"
+ fi
+ for arch in $archs ; do
packagedirs="${DEPLOY_DIR_RPM}/$arch $packagedirs"
- packagedirs_sdk="${DEPLOY_DIR_RPM}/$sdkarch$extension $packagedirs_sdk"
+ packagedirs_sdk="${DEPLOY_DIR_RPM}/$arch $packagedirs_sdk"
rm -rf ${DEPLOY_DIR_RPM}/$arch/solvedb
rm -rf ${DEPLOY_DIR_RPM}/$sdkarch$extension/solvedb
@@ -95,6 +93,7 @@ package_update_index_rpm () {
#
package_generate_rpm_conf () {
printf "_solve_dbpath " > ${RPMCONF_TARGET_BASE}.macro
+ printf "_solve_dbpath " > ${RPMCONF_HOST_BASE}.macro
o_colon_t=false
o_colon_h=false
@@ -238,7 +237,7 @@ package_install_internal_rpm () {
echo "Unable to find package $pkg ($ml_pkg)!"
exit 1
fi
- echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
+ echo $pkg_name >> ${target_rootfs}/install/install.manifest
done
fi
fi
@@ -258,7 +257,7 @@ package_install_internal_rpm () {
echo "Unable to find package $pkg ($ml_pkg)!"
exit 1
fi
- echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
+ echo $pkg_name >> ${target_rootfs}/install/install.manifest
done
fi
@@ -303,7 +302,7 @@ package_install_internal_rpm () {
# Dump the full set of recommends...
${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
- -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${confbase}.macro`" \
+ -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
-D "__dbi_txn create nofsync private" \
-qa --qf "[%{RECOMMENDS}\n]" | sort -u > ${target_rootfs}/install/recommend
# Did we add more to the list?
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index a5b6384..9acc52d 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -34,16 +34,9 @@ fakeroot populate_sdk_deb () {
export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
- INSTALL_ARCHS_DEB=""
+ INSTALL_ARCHS_DEB="${SDK_ARCH}-nativesdk"
for arch in ${PACKAGE_ARCHS}; do
- sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
- extension="-nativesdk"
- if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
- extension=""
- fi
- if [ -e ${DEPLOY_DIR_DEB}/$sdkarch$extension ]; then
- INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $sdkarch$extension"
- fi
+ INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $arch"
done
export INSTALL_ARCHS_DEB
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index da308c1..8196542 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -53,16 +53,9 @@ fakeroot populate_sdk_rpm () {
export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
- export INSTALL_PLATFORM_EXTRA_RPM=""
+ export INSTALL_PLATFORM_EXTRA_RPM="${SDK_ARCH}-nativesdk"
for arch in ${PACKAGE_ARCHS}; do
- sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
- extension="-nativesdk"
- if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
- extension=""
- fi
- if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then
- INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM"
- fi
+ INSTALL_PLATFORM_EXTRA_RPM="$arch $INSTALL_PLATFORM_EXTRA_RPM"
done
export INSTALL_PLATFORM_EXTRA_RPM
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (15 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 9:00 ` Richard Purdie
2011-08-01 9:09 ` Phil Blundell
2011-08-01 7:36 ` [PATCH 18/22] rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE Saul Wold
` (5 subsequent siblings)
22 siblings, 2 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
We need to add the tune-* override in order for more complicated tune
features to function properly.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/conf/bitbake.conf | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9c80f11..11dfb6d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -637,9 +637,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
#
# This works for functions as well, they are really just environment variables.
# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
+OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${TUNEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
DISTROOVERRIDES ?= "${DISTRO}"
MACHINEOVERRIDES ?= "${MACHINE}"
+TUNEOVERRIDES ?= "tune-${DEFAULTTUNE}"
CPU_FEATURES ?= ""
CPU_FEATURES_arm ?= "vfp"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 18/22] rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (16 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 19/22] package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo Saul Wold
` (4 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Earlier iterations of the multilib patch used "TUNENAME", which was later
renamed to DEFAULTTUNE. This file was missed in the rename.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/rootfs_rpm.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 4db5e98..dfe4612 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -217,7 +217,7 @@ python () {
overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1]
localdata.setVar("OVERRIDES", overrides)
# TEMP: OVERRIDES isn't working right
- localdata.setVar("TUNENAME", localdata.getVar("TUNENAME_virtclass-multilib-" + eext[1], False) or "")
+ localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "")
ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or ""
#bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 19/22] package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (17 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 18/22] rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 7:36 ` [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case Saul Wold
` (3 subsequent siblings)
22 siblings, 0 replies; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/package_deb.bbclass | 6 +++---
meta/classes/package_ipk.bbclass | 6 +++---
meta/classes/package_rpm.bbclass | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index fb502cb..8e363f8 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -116,7 +116,7 @@ package_install_internal_deb () {
local archs="${INSTALL_ARCHS_DEB}"
local package_to_install="${INSTALL_PACKAGES_NORMAL_DEB}"
local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_DEB}"
- local package_lingusa="${INSTALL_PACKAGES_LINGUAS_DEB}"
+ local package_linguas="${INSTALL_PACKAGES_LINGUAS_DEB}"
local task="${INSTALL_TASK_DEB}"
rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
@@ -155,12 +155,12 @@ package_install_internal_deb () {
# Uclibc builds don't provide this stuff..
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
- if [ ! -z "${package_lingusa}" ]; then
+ if [ ! -z "${package_linguas}" ]; then
apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
if [ $? -ne 0 ]; then
exit 1
fi
- for i in ${package_lingusa}; do
+ for i in ${package_linguas}; do
apt-get install $i --force-yes --allow-unauthenticated
if [ $? -ne 0 ]; then
exit 1
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index b7afa83..16574e9 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -99,7 +99,7 @@ package_install_internal_ipk() {
local conffile="${INSTALL_CONF_IPK}"
local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}"
local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}"
- local package_lingusa="${INSTALL_PACKAGES_LINGUAS_IPK}"
+ local package_linguas="${INSTALL_PACKAGES_LINGUAS_IPK}"
local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}"
local task="${INSTALL_TASK_IPK}"
@@ -111,8 +111,8 @@ package_install_internal_ipk() {
# Uclibc builds don't provide this stuff...
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
- if [ ! -z "${package_lingusa}" ]; then
- for i in ${package_lingusa}; do
+ if [ ! -z "${package_linguas}" ]; then
+ for i in ${package_linguas}; do
opkg-cl ${ipkg_args} install $i
done
fi
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 856dfb0..4593876 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -193,7 +193,7 @@ package_install_internal_rpm () {
local confbase="${INSTALL_CONFBASE_RPM}"
local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}"
local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
- local package_lingusa="${INSTALL_PACKAGES_LINGUAS_RPM}"
+ local package_linguas="${INSTALL_PACKAGES_LINGUAS_RPM}"
local providename="${INSTALL_PROVIDENAME_RPM}"
local task="${INSTALL_TASK_RPM}"
@@ -222,8 +222,8 @@ package_install_internal_rpm () {
# Uclibc builds don't provide this stuff...
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
- if [ ! -z "${package_lingusa}" ]; then
- for pkg in ${package_lingusa}; do
+ if [ ! -z "${package_linguas}" ]; then
+ for pkg in ${package_linguas}; do
echo "Processing $pkg..."
archvar=base_package_archs
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (18 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 19/22] package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:10 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 21/22] external-*toolchain: remove glibc-utils provide Saul Wold
` (2 subsequent siblings)
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
arch all 1
arch any 6
arch noarch 11
arch arm 16
arch armv4 21
arch armv4t 26
arch armv5 31
arch armv5t 36
arch armv5-vfp 41
arch armv5t-vfp 46
arch armv5e 51
arch armv5te 56
arch armv5e-vfp 61
arch armv5te-vfp 66
arch armv6-vfp 71
arch armv6t-vfp 76
arch armv7-vfp 81
arch armv7t2-vfp 86
arch armv7a-vfp 91
arch armv7at2-vfp 96
arch armv7a-vfp-neon 101
arch armv7at2-vfp-neon 106
arch beagleboard 111
Which leads to a failing do_rootfs
The fix might look like it's in the wrong line, but it's only place in the .inc where it works.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/conf/machine/include/arm/arch-armv7a.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index ce9cee5..6ac2950 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -17,7 +17,7 @@ TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
# VFP Tunes
AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon
@@ -39,7 +39,7 @@ TUNE_FEATURES_tune-armv7atb-neon ?= "${TUNE_FEATURES_tune-armv7at-neon} bigendia
PACKAGE_EXTRA_ARCHS_tune-armv7ab = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7ab-vfp"
PACKAGE_EXTRA_ARCHS_tune-armv7atb = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7ab-vfp armv7at2b-vfp"
PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7ab-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab-vfp-neon armv7at2b-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab armv7ab-vfp-neon armv7at2b-vfp-neon"
# Big Endian + VFP
AVAILTUNES += "armv7ahfb armv7athfb armv7ahfb-neon armv7athfb-neon"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 21/22] external-*toolchain: remove glibc-utils provide
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (19 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:11 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode Saul Wold
2011-08-01 13:20 ` [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Richard Purdie
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
This was causing a multiple providers error
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../meta/external-csl-toolchain_2008q3-72.bb | 4 ++--
meta/recipes-core/meta/external-poky-toolchain.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
index a874c8b..1cd45d2 100644
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
@@ -16,9 +16,9 @@ PROVIDES = "\
virtual/libiconv \
glibc-thread-db \
virtual/linux-libc-headers "
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
+RPROVIDES = "libsegfault glibc-thread-db"
PACKAGES_DYNAMIC = "glibc-gconv-*"
-PR = "r1"
+PR = "r2"
#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
diff --git a/meta/recipes-core/meta/external-poky-toolchain.bb b/meta/recipes-core/meta/external-poky-toolchain.bb
index 5507746..b4b4418 100644
--- a/meta/recipes-core/meta/external-poky-toolchain.bb
+++ b/meta/recipes-core/meta/external-poky-toolchain.bb
@@ -9,10 +9,10 @@ PROVIDES = "\
virtual/libintl \
virtual/libiconv \
virtual/linux-libc-headers "
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+RPROVIDES = "libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
PACKAGES_DYNAMIC = "glibc-gconv-*"
INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
# License applies to this recipe code, not the toolchain itself
LICENSE = "MIT"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (20 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 21/22] external-*toolchain: remove glibc-utils provide Saul Wold
@ 2011-08-01 7:36 ` Saul Wold
2011-08-01 13:14 ` Richard Purdie
2011-08-01 13:20 ` [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Richard Purdie
22 siblings, 1 reply; 53+ messages in thread
From: Saul Wold @ 2011-08-01 7:36 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This will decouple the compiling in thumb mode from having thumb
capable cores.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../conf/machine/include/arm/feature-arm-thumb.inc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index e7d392e..533eab9 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -4,9 +4,11 @@
# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
# but requires more instructions (140% for 70% smaller code) so may be
# slower.
-TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
-ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
+ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
+
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
# Note armv7 will hit on armv7a as well
--
1.7.3.4
^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
@ 2011-08-01 9:00 ` Richard Purdie
2011-08-01 9:09 ` Phil Blundell
1 sibling, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 9:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> We need to add the tune-* override in order for more complicated tune
> features to function properly.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/conf/bitbake.conf | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9c80f11..11dfb6d 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -637,9 +637,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
> #
> # This works for functions as well, they are really just environment variables.
> # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
> -OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> +OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${TUNEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> DISTROOVERRIDES ?= "${DISTRO}"
> MACHINEOVERRIDES ?= "${MACHINE}"
> +TUNEOVERRIDES ?= "tune-${DEFAULTTUNE}"
>
> CPU_FEATURES ?= ""
> CPU_FEATURES_arm ?= "vfp"
This is a really bad idea and evidently hasn't been tested or thought
through :(
Why? The problem is you can't "unset" an override. This means you will
lock DEFAULTTUNE's values into the system and if you then want to change
to a different multilib the result will be confused at best.
So I'm afraid this is going to need a rethink.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH
2011-08-01 7:36 ` [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH Saul Wold
@ 2011-08-01 9:06 ` Richard Purdie
0 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 9:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> Based on Kumar Gala <galak@kernel.crashing.org>'s patch.
>
> By default we use ppc, or ppc64. Each tune either specifies their
> manual version or can use the PPC_PKGARCH to specify a new prefix
> if they support both float and no-float variants.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/conf/machine/include/powerpc/arch-powerpc.inc | 3 ++-
> .../machine/include/powerpc/arch-powerpc64.inc | 1 +
> meta/conf/machine/include/tune-ppc603e.inc | 4 ++--
> meta/conf/machine/include/tune-ppce300c2.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500mc.inc | 5 +++--
> meta/conf/machine/include/tune-ppce500v2.inc | 5 +++--
> 7 files changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> index 013755d..2621932 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> @@ -8,6 +8,7 @@ DEFAULTTUNE ?= "powerpc"
> TUNEVALID[m32] = "Power ELF32 standard ABI"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
> +PPC_PKGARCH = "ppc"
>
> TUNEVALID[fpu-hard] = "Use hardware FPU."
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"
> @@ -20,7 +21,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
>
> PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>
> -TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
> +TUNE_PKGARCH ?= "${PPC_PKGARCH}${PPCPKGSFX_FPU}"
>
> # Basic tune definitions
> AVAILTUNES += "powerpc powerpc-nf"
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index a965d59..0a104a2 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -2,6 +2,7 @@ TUNEVALID[m64] = "Power ELF64 standard ABI"
> TUNE_CONFLICTS[m64] = "m32 nf"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
> +PPC_PKGARCH = "ppc64"
>
> AVAILTUNES += "powerpc64"
> TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
> diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
> index 7c05394..2eec64b 100644
> --- a/meta/conf/machine/include/tune-ppc603e.inc
> +++ b/meta/conf/machine/include/tune-ppc603e.inc
> @@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
>
> TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
> -TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "ppc603e", "", d)}"
> +PPC_PKGARCH_tune-ppc603e = "ppc603e"
I was going to ask how this is meant to work without overrides, then I
saw the later patch (which are queued in the wrong order). I suspect you
need to use syntax like:
PPC_PKGARCH ??= "${@d.getvar(bb.data.expand("PPC_PKGARCH_tune-${DEFAULTTUNE}"), True) or d.getvar("PPC_PKGARCH", True)}"
above and then this will work without overrides.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
2011-08-01 9:00 ` Richard Purdie
@ 2011-08-01 9:09 ` Phil Blundell
2011-08-01 14:36 ` Mark Hatle
1 sibling, 1 reply; 53+ messages in thread
From: Phil Blundell @ 2011-08-01 9:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> We need to add the tune-* override in order for more complicated tune
> features to function properly.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/conf/bitbake.conf | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9c80f11..11dfb6d 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -637,9 +637,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
> #
> # This works for functions as well, they are really just environment variables.
> # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
> -OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> +OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${TUNEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> DISTROOVERRIDES ?= "${DISTRO}"
> MACHINEOVERRIDES ?= "${MACHINE}"
> +TUNEOVERRIDES ?= "tune-${DEFAULTTUNE}"
What exactly are the "more complicated tune features" that require this?
It's not obvious to me that this is a good idea.
p.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 7:36 ` [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU Saul Wold
@ 2011-08-01 13:03 ` Richard Purdie
2011-08-01 14:13 ` Kumar Gala
2011-08-02 18:31 ` Kumar Gala
0 siblings, 2 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Kumar Gala <galak@kernel.crashing.org>
>
> Its more likely that we explicitly set soft-floating point support for a
> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> index 8cc76ab..013755d 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>
> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>
> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>
> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
Whilst the change itself may or may not be ok, it would need to change
the various boards that are already setting or not setting fpu-hard as a
feature so as it stands this change is incomplete.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 7:36 ` [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice Saul Wold
@ 2011-08-01 13:03 ` Richard Purdie
2011-08-01 13:28 ` Koen Kooi
2011-08-01 14:11 ` Kumar Gala
0 siblings, 2 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/classes/sanity.bbclass | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 999e15d..dc11c9e 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -383,12 +383,14 @@ def check_sanity(e):
> dups = []
>
> for pa in pkgarchs.split():
> - if seen.get(pa, 0) == 1:
> + if pa == tunepkg:
> + tunefound = True
> + if seen.get(pa, 0) == 1:
> + pkgarchs.remove(pa)
> + elif seen.get(pa, 0) == 1:
> dups.append(pa)
> else:
> seen[pa] = 1
> - if pa == tunepkg:
> - tunefound = True
>
> if len(dups):
> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
How about we don't put duplicates in there in the first place?
Which board/tune files is this occurring with?
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages
2011-08-01 7:36 ` [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages Saul Wold
@ 2011-08-01 13:06 ` Richard Purdie
2011-08-01 14:47 ` Mark Hatle
0 siblings, 1 reply; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> The sdknative packages were not being introduced into the list of available
> packages properly. Fix this by always introducing it and avoiding a sed of
> one type to another.
>
> Also fix a number of minor issues with the RPM behavior when building sdk
> images.
I'm afraid this change looks wrong to me. Firstly, all arch packages are
"all", not "all-nativesdk". You're also cutting down the arch list to a
single sdk entry rather than the intended package_archs list.
"all" == "all-nativesdk" as things stand might be wrong for various
other reasons I can think of but it is what would currently be
generated.
All things considered, this issue needs more work.
Cheers,
Richard
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/classes/package_rpm.bbclass | 19 +++++++++----------
> meta/classes/populate_sdk_deb.bbclass | 11 ++---------
> meta/classes/populate_sdk_rpm.bbclass | 11 ++---------
> 3 files changed, 13 insertions(+), 28 deletions(-)
>
> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
> index 0377100..856dfb0 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -32,14 +32,12 @@ package_update_index_rpm () {
> eval archs=\${${archvar}}
> packagedirs=""
> packagedirs_sdk=""
> - for arch in $archs; do
> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
> - extension="-nativesdk"
> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
> - extension=""
> - fi
> + if [ "${SDK_ARCH}-nativesdk" != "-nativesdk" ]; then
> + packagedirs_sdk="${DEPLOY_DIR_RPM}/${SDK_ARCH}-nativesdk"
> + fi
> + for arch in $archs ; do
> packagedirs="${DEPLOY_DIR_RPM}/$arch $packagedirs"
> - packagedirs_sdk="${DEPLOY_DIR_RPM}/$sdkarch$extension $packagedirs_sdk"
> + packagedirs_sdk="${DEPLOY_DIR_RPM}/$arch $packagedirs_sdk"
>
> rm -rf ${DEPLOY_DIR_RPM}/$arch/solvedb
> rm -rf ${DEPLOY_DIR_RPM}/$sdkarch$extension/solvedb
> @@ -95,6 +93,7 @@ package_update_index_rpm () {
> #
> package_generate_rpm_conf () {
> printf "_solve_dbpath " > ${RPMCONF_TARGET_BASE}.macro
> + printf "_solve_dbpath " > ${RPMCONF_HOST_BASE}.macro
> o_colon_t=false
> o_colon_h=false
>
> @@ -238,7 +237,7 @@ package_install_internal_rpm () {
> echo "Unable to find package $pkg ($ml_pkg)!"
> exit 1
> fi
> - echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
> + echo $pkg_name >> ${target_rootfs}/install/install.manifest
> done
> fi
> fi
> @@ -258,7 +257,7 @@ package_install_internal_rpm () {
> echo "Unable to find package $pkg ($ml_pkg)!"
> exit 1
> fi
> - echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
> + echo $pkg_name >> ${target_rootfs}/install/install.manifest
> done
> fi
>
> @@ -303,7 +302,7 @@ package_install_internal_rpm () {
> # Dump the full set of recommends...
> ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
> --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
> - -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${confbase}.macro`" \
> + -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
> -D "__dbi_txn create nofsync private" \
> -qa --qf "[%{RECOMMENDS}\n]" | sort -u > ${target_rootfs}/install/recommend
> # Did we add more to the list?
> diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
> index a5b6384..9acc52d 100644
> --- a/meta/classes/populate_sdk_deb.bbclass
> +++ b/meta/classes/populate_sdk_deb.bbclass
> @@ -34,16 +34,9 @@ fakeroot populate_sdk_deb () {
> export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
> export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
> export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
> - INSTALL_ARCHS_DEB=""
> + INSTALL_ARCHS_DEB="${SDK_ARCH}-nativesdk"
> for arch in ${PACKAGE_ARCHS}; do
> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
> - extension="-nativesdk"
> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
> - extension=""
> - fi
> - if [ -e ${DEPLOY_DIR_DEB}/$sdkarch$extension ]; then
> - INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $sdkarch$extension"
> - fi
> + INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $arch"
> done
> export INSTALL_ARCHS_DEB
>
> diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
> index da308c1..8196542 100644
> --- a/meta/classes/populate_sdk_rpm.bbclass
> +++ b/meta/classes/populate_sdk_rpm.bbclass
> @@ -53,16 +53,9 @@ fakeroot populate_sdk_rpm () {
> export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
> export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
> export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
> - export INSTALL_PLATFORM_EXTRA_RPM=""
> + export INSTALL_PLATFORM_EXTRA_RPM="${SDK_ARCH}-nativesdk"
> for arch in ${PACKAGE_ARCHS}; do
> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
> - extension="-nativesdk"
> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
> - extension=""
> - fi
> - if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then
> - INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM"
> - fi
> + INSTALL_PLATFORM_EXTRA_RPM="$arch $INSTALL_PLATFORM_EXTRA_RPM"
> done
> export INSTALL_PLATFORM_EXTRA_RPM
>
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case
2011-08-01 7:36 ` [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case Saul Wold
@ 2011-08-01 13:10 ` Richard Purdie
2011-08-01 13:35 ` Koen Kooi
0 siblings, 1 reply; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:10 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
>
> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
>
> arch all 1
> arch any 6
> arch noarch 11
> arch arm 16
> arch armv4 21
> arch armv4t 26
> arch armv5 31
> arch armv5t 36
> arch armv5-vfp 41
> arch armv5t-vfp 46
> arch armv5e 51
> arch armv5te 56
> arch armv5e-vfp 61
> arch armv5te-vfp 66
> arch armv6-vfp 71
> arch armv6t-vfp 76
> arch armv7-vfp 81
> arch armv7t2-vfp 86
> arch armv7a-vfp 91
> arch armv7at2-vfp 96
> arch armv7a-vfp-neon 101
> arch armv7at2-vfp-neon 106
> arch beagleboard 111
>
> Which leads to a failing do_rootfs
>
> The fix might look like it's in the wrong line, but it's only place in the .inc where it works.
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/conf/machine/include/arm/arch-armv7a.inc | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index ce9cee5..6ac2950 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -17,7 +17,7 @@ TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
> PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
> PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
> PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
> -PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
> +PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
Nearly :)
You need to add it to the PACKAGE_EXTRA_ARCHS_tune-armv7a and
PACKAGE_EXTRA_ARCHS_tune-armv7at lines.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 21/22] external-*toolchain: remove glibc-utils provide
2011-08-01 7:36 ` [PATCH 21/22] external-*toolchain: remove glibc-utils provide Saul Wold
@ 2011-08-01 13:11 ` Richard Purdie
0 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> This was causing a multiple providers error
What kind of multiple providers error? This change doesn't feel right to
me and likely breaks external toolchains.
Cheers,
Richard
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../meta/external-csl-toolchain_2008q3-72.bb | 4 ++--
> meta/recipes-core/meta/external-poky-toolchain.bb | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
> index a874c8b..1cd45d2 100644
> --- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
> +++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
> @@ -16,9 +16,9 @@ PROVIDES = "\
> virtual/libiconv \
> glibc-thread-db \
> virtual/linux-libc-headers "
> -RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
> +RPROVIDES = "libsegfault glibc-thread-db"
> PACKAGES_DYNAMIC = "glibc-gconv-*"
> -PR = "r1"
> +PR = "r2"
>
> #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
>
> diff --git a/meta/recipes-core/meta/external-poky-toolchain.bb b/meta/recipes-core/meta/external-poky-toolchain.bb
> index 5507746..b4b4418 100644
> --- a/meta/recipes-core/meta/external-poky-toolchain.bb
> +++ b/meta/recipes-core/meta/external-poky-toolchain.bb
> @@ -9,10 +9,10 @@ PROVIDES = "\
> virtual/libintl \
> virtual/libiconv \
> virtual/linux-libc-headers "
> -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
> +RPROVIDES = "libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
> PACKAGES_DYNAMIC = "glibc-gconv-*"
> INHIBIT_DEFAULT_DEPS = "1"
> -PR = "r1"
> +PR = "r2"
>
> # License applies to this recipe code, not the toolchain itself
> LICENSE = "MIT"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-01 7:36 ` [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode Saul Wold
@ 2011-08-01 13:14 ` Richard Purdie
2011-08-01 17:46 ` Khem Raj
2011-08-05 10:59 ` Phil Blundell
0 siblings, 2 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Khem Raj <raj.khem@gmail.com>
>
> This will decouple the compiling in thumb mode from having thumb
> capable cores.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../conf/machine/include/arm/feature-arm-thumb.inc | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> index e7d392e..533eab9 100644
> --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> @@ -4,9 +4,11 @@
> # encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
> # but requires more instructions (140% for 70% smaller code) so may be
> # slower.
> -TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
> -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> +TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
> +ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> +
> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
> OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
>
> # Note armv7 will hit on armv7a as well
The original change committed into master in my absence is broken. This
patch is just making things even worse and more broken :(
I suspect what people really wanted was:
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
` (21 preceding siblings ...)
2011-08-01 7:36 ` [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode Saul Wold
@ 2011-08-01 13:20 ` Richard Purdie
22 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-01 13:20 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 00:35 -0700, Saul Wold wrote:
> This set of patches are what have been pulled together for the
> M3 RC1 build. They include patches to multi-lib and tuning changes
> put last week.
>
> There are also 2 changes from Josh for bitbake, not included here,
> which are included in stage/master_under_test.
>
> There are competing changes from Martin and Khem for the ARM fix, the
> first change from Martin did not seem to solve (or there is a different
> issue that I have not evaluated). I am building Khem's change, but it
> also seems to fail in eglibc, so ARM is still an issue
I've sent some feedback on the patches in this series, I've taken about
half the patches, the others are going to need some further work I'm
afraid :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 13:03 ` Richard Purdie
@ 2011-08-01 13:28 ` Koen Kooi
2011-08-01 14:11 ` Kumar Gala
1 sibling, 0 replies; 53+ messages in thread
From: Koen Kooi @ 2011-08-01 13:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 1 aug. 2011, om 15:03 heeft Richard Purdie het volgende geschreven:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>> meta/classes/sanity.bbclass | 8 +++++---
>> 1 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
>> index 999e15d..dc11c9e 100644
>> --- a/meta/classes/sanity.bbclass
>> +++ b/meta/classes/sanity.bbclass
>> @@ -383,12 +383,14 @@ def check_sanity(e):
>> dups = []
>>
>> for pa in pkgarchs.split():
>> - if seen.get(pa, 0) == 1:
>> + if pa == tunepkg:
>> + tunefound = True
>> + if seen.get(pa, 0) == 1:
>> + pkgarchs.remove(pa)
>> + elif seen.get(pa, 0) == 1:
>> dups.append(pa)
>> else:
>> seen[pa] = 1
>> - if pa == tunepkg:
>> - tunefound = True
>>
>> if len(dups):
>> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
>
> How about we don't put duplicates in there in the first place?
AIUI this is fatal in OE classic as well, so there really shouldn't be any duplicates in PACKAGE_(EXTRA_)ARCHS
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case
2011-08-01 13:10 ` Richard Purdie
@ 2011-08-01 13:35 ` Koen Kooi
0 siblings, 0 replies; 53+ messages in thread
From: Koen Kooi @ 2011-08-01 13:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 1 aug. 2011, om 15:10 heeft Richard Purdie het volgende geschreven:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Koen Kooi <koen@dominion.thruhere.net>
>>
>> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
>>
>> arch all 1
>> arch any 6
>> arch noarch 11
>> arch arm 16
>> arch armv4 21
>> arch armv4t 26
>> arch armv5 31
>> arch armv5t 36
>> arch armv5-vfp 41
>> arch armv5t-vfp 46
>> arch armv5e 51
>> arch armv5te 56
>> arch armv5e-vfp 61
>> arch armv5te-vfp 66
>> arch armv6-vfp 71
>> arch armv6t-vfp 76
>> arch armv7-vfp 81
>> arch armv7t2-vfp 86
>> arch armv7a-vfp 91
>> arch armv7at2-vfp 96
>> arch armv7a-vfp-neon 101
>> arch armv7at2-vfp-neon 106
>> arch beagleboard 111
>>
>> Which leads to a failing do_rootfs
>>
>> The fix might look like it's in the wrong line, but it's only place in the .inc where it works.
>>
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/conf/machine/include/arm/arch-armv7a.inc | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
>> index ce9cee5..6ac2950 100644
>> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
>> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
>> @@ -17,7 +17,7 @@ TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
>> PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
>> PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
>> PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
>> -PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
>> +PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
>
> Nearly :)
>
> You need to add it to the PACKAGE_EXTRA_ARCHS_tune-armv7a and
> PACKAGE_EXTRA_ARCHS_tune-armv7at lines.
I tried adding it to those and it didn't show up in 'bitbake -e'. A new try today:
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
-PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp testv7a"
PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp testv7at"
PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
koen@dominion:/OE/tentacle/sources/openembedded-core/meta$ bitbake -e | grep testv
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6-vfp armv6t-vfp armv7-vfp armv7t2-vfp armv7a-vfp armv7at2-vfp testv7at armv7a armv7a-vfp-neon armv7at2-vfp-neon beagleboard"
ipkgarchs="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6-vfp armv6t-vfp armv7-vfp armv7t2-vfp armv7a-vfp armv7at2-vfp testv7at armv7a armv7a-vfp-neon armv7at2-vfp-neon beagleboard"
So it doesn't work in 'armv7a', but it does work in 'armv7at'. I'll send an updated patch.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 13:03 ` Richard Purdie
2011-08-01 13:28 ` Koen Kooi
@ 2011-08-01 14:11 ` Kumar Gala
2011-08-01 17:34 ` Khem Raj
1 sibling, 1 reply; 53+ messages in thread
From: Kumar Gala @ 2011-08-01 14:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>> meta/classes/sanity.bbclass | 8 +++++---
>> 1 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
>> index 999e15d..dc11c9e 100644
>> --- a/meta/classes/sanity.bbclass
>> +++ b/meta/classes/sanity.bbclass
>> @@ -383,12 +383,14 @@ def check_sanity(e):
>> dups = []
>>
>> for pa in pkgarchs.split():
>> - if seen.get(pa, 0) == 1:
>> + if pa == tunepkg:
>> + tunefound = True
>> + if seen.get(pa, 0) == 1:
>> + pkgarchs.remove(pa)
>> + elif seen.get(pa, 0) == 1:
>> dups.append(pa)
>> else:
>> seen[pa] = 1
>> - if pa == tunepkg:
>> - tunefound = True
>>
>> if len(dups):
>> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
>
> How about we don't put duplicates in there in the first place?
>
> Which board/tune files is this occurring with?
Yeah, not sure about this one, I added the sanity check to find this early. Ran into issues with my PPC patch set and took a while to find (thus figured a sanity check made sense to check early on).
- k
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 13:03 ` Richard Purdie
@ 2011-08-01 14:13 ` Kumar Gala
2011-08-01 14:50 ` Mark Hatle
2011-08-02 18:31 ` Kumar Gala
1 sibling, 1 reply; 53+ messages in thread
From: Kumar Gala @ 2011-08-01 14:13 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Kumar Gala <galak@kernel.crashing.org>
>>
>> Its more likely that we explicitly set soft-floating point support for a
>> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
>> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>>
>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>> ---
>> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> index 8cc76ab..013755d 100644
>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>>
>> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>>
>> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
>> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>>
>> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
>
> Whilst the change itself may or may not be ok, it would need to change
> the various boards that are already setting or not setting fpu-hard as a
> feature so as it stands this change is incomplete.
Which boards are you speaking of? I'm not aware of any that set soft float at this point for PPC.
- k
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override
2011-08-01 9:09 ` Phil Blundell
@ 2011-08-01 14:36 ` Mark Hatle
0 siblings, 0 replies; 53+ messages in thread
From: Mark Hatle @ 2011-08-01 14:36 UTC (permalink / raw)
To: openembedded-core
On 8/1/11 4:09 AM, Phil Blundell wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Mark Hatle <mark.hatle@windriver.com>
>>
>> We need to add the tune-* override in order for more complicated tune
>> features to function properly.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta/conf/bitbake.conf | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 9c80f11..11dfb6d 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -637,9 +637,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
>> #
>> # This works for functions as well, they are really just environment variables.
>> # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
>> -OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
>> +OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${TUNEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
>> DISTROOVERRIDES ?= "${DISTRO}"
>> MACHINEOVERRIDES ?= "${MACHINE}"
>> +TUNEOVERRIDES ?= "tune-${DEFAULTTUNE}"
>
> What exactly are the "more complicated tune features" that require this?
> It's not obvious to me that this is a good idea.
See the other patch that Richard commented on. My understanding was that the
value of the OVERRIDES could change during the multilib configurations. Seems
that I was wrong here.
The concept behind this was to be able to specify certain values based on an
override instead of having to do inline python.. but it appears that simply
won't work.
(Values such as package_extra_arch, pkgarch, etc..)
--Mark
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages
2011-08-01 13:06 ` Richard Purdie
@ 2011-08-01 14:47 ` Mark Hatle
0 siblings, 0 replies; 53+ messages in thread
From: Mark Hatle @ 2011-08-01 14:47 UTC (permalink / raw)
To: openembedded-core
On 8/1/11 8:06 AM, Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Mark Hatle <mark.hatle@windriver.com>
>>
>> The sdknative packages were not being introduced into the list of available
>> packages properly. Fix this by always introducing it and avoiding a sed of
>> one type to another.
>>
>> Also fix a number of minor issues with the RPM behavior when building sdk
>> images.
>
> I'm afraid this change looks wrong to me. Firstly, all arch packages are
> "all", not "all-nativesdk". You're also cutting down the arch list to a
> single sdk entry rather than the intended package_archs list.
>
> "all" == "all-nativesdk" as things stand might be wrong for various
> other reasons I can think of but it is what would currently be
> generated.
No, that's not what is happening at all. The original sed was completely broken
and wouldn't always work.
The arch list being processed is the target arch list.. typically it's something
like:
all any noarch powerpc ppc603e qemuppc
Before the system was trying to do a search/replace on "HOST_ARCH" and replace
it with SDK_ARCH.. this is kind of insane.. because there is no guaranty that
HOST_ARCH will even be in the arch list. So instead the patch simply adds
SDK_ARCH-nativesdk, and then processes the list as normal.. the result is:
x86_64-nativesdk all any noarch powerpc ppc603e qemuppc
before it would have been (assuming the sed even worked)
all any noarch x86_64-nativesdk ppc603e qemuppc
so any packages with arch of "powerpc" would have been missed and the install
failed.. (or if powerpc didn't exist, it would end up without x86_64-nativesdk
even in the list.. which is how I found the problem.)
> All things considered, this issue needs more work.
>
> Cheers,
>
> Richard
>
>
>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta/classes/package_rpm.bbclass | 19 +++++++++----------
>> meta/classes/populate_sdk_deb.bbclass | 11 ++---------
>> meta/classes/populate_sdk_rpm.bbclass | 11 ++---------
>> 3 files changed, 13 insertions(+), 28 deletions(-)
>>
>> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
>> index 0377100..856dfb0 100644
>> --- a/meta/classes/package_rpm.bbclass
>> +++ b/meta/classes/package_rpm.bbclass
>> @@ -32,14 +32,12 @@ package_update_index_rpm () {
>> eval archs=\${${archvar}}
>> packagedirs=""
>> packagedirs_sdk=""
>> - for arch in $archs; do
>> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
>> - extension="-nativesdk"
>> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
>> - extension=""
>> - fi
>> + if [ "${SDK_ARCH}-nativesdk" != "-nativesdk" ]; then
>> + packagedirs_sdk="${DEPLOY_DIR_RPM}/${SDK_ARCH}-nativesdk"
>> + fi
>> + for arch in $archs ; do
>> packagedirs="${DEPLOY_DIR_RPM}/$arch $packagedirs"
>> - packagedirs_sdk="${DEPLOY_DIR_RPM}/$sdkarch$extension $packagedirs_sdk"
>> + packagedirs_sdk="${DEPLOY_DIR_RPM}/$arch $packagedirs_sdk"
>>
>> rm -rf ${DEPLOY_DIR_RPM}/$arch/solvedb
>> rm -rf ${DEPLOY_DIR_RPM}/$sdkarch$extension/solvedb
>> @@ -95,6 +93,7 @@ package_update_index_rpm () {
>> #
>> package_generate_rpm_conf () {
>> printf "_solve_dbpath " > ${RPMCONF_TARGET_BASE}.macro
>> + printf "_solve_dbpath " > ${RPMCONF_HOST_BASE}.macro
>> o_colon_t=false
>> o_colon_h=false
>>
>> @@ -238,7 +237,7 @@ package_install_internal_rpm () {
>> echo "Unable to find package $pkg ($ml_pkg)!"
>> exit 1
>> fi
>> - echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
>> + echo $pkg_name >> ${target_rootfs}/install/install.manifest
>> done
>> fi
>> fi
>> @@ -258,7 +257,7 @@ package_install_internal_rpm () {
>> echo "Unable to find package $pkg ($ml_pkg)!"
>> exit 1
>> fi
>> - echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
>> + echo $pkg_name >> ${target_rootfs}/install/install.manifest
>> done
>> fi
>>
>> @@ -303,7 +302,7 @@ package_install_internal_rpm () {
>> # Dump the full set of recommends...
>> ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
>> --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
>> - -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${confbase}.macro`" \
>> + -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
>> -D "__dbi_txn create nofsync private" \
>> -qa --qf "[%{RECOMMENDS}\n]" | sort -u > ${target_rootfs}/install/recommend
>> # Did we add more to the list?
>> diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
>> index a5b6384..9acc52d 100644
>> --- a/meta/classes/populate_sdk_deb.bbclass
>> +++ b/meta/classes/populate_sdk_deb.bbclass
>> @@ -34,16 +34,9 @@ fakeroot populate_sdk_deb () {
>> export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
>> export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
>> export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
>> - INSTALL_ARCHS_DEB=""
>> + INSTALL_ARCHS_DEB="${SDK_ARCH}-nativesdk"
>> for arch in ${PACKAGE_ARCHS}; do
>> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
>> - extension="-nativesdk"
>> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
>> - extension=""
>> - fi
>> - if [ -e ${DEPLOY_DIR_DEB}/$sdkarch$extension ]; then
>> - INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $sdkarch$extension"
>> - fi
>> + INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $arch"
>> done
>> export INSTALL_ARCHS_DEB
>>
>> diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
>> index da308c1..8196542 100644
>> --- a/meta/classes/populate_sdk_rpm.bbclass
>> +++ b/meta/classes/populate_sdk_rpm.bbclass
>> @@ -53,16 +53,9 @@ fakeroot populate_sdk_rpm () {
>> export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
>> export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
>> export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
>> - export INSTALL_PLATFORM_EXTRA_RPM=""
>> + export INSTALL_PLATFORM_EXTRA_RPM="${SDK_ARCH}-nativesdk"
>> for arch in ${PACKAGE_ARCHS}; do
>> - sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
>> - extension="-nativesdk"
>> - if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
>> - extension=""
>> - fi
>> - if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then
>> - INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM"
>> - fi
>> + INSTALL_PLATFORM_EXTRA_RPM="$arch $INSTALL_PLATFORM_EXTRA_RPM"
>> done
>> export INSTALL_PLATFORM_EXTRA_RPM
>>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 14:13 ` Kumar Gala
@ 2011-08-01 14:50 ` Mark Hatle
2011-08-01 15:57 ` Kumar Gala
0 siblings, 1 reply; 53+ messages in thread
From: Mark Hatle @ 2011-08-01 14:50 UTC (permalink / raw)
To: openembedded-core
On 8/1/11 9:13 AM, Kumar Gala wrote:
>
> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>
>> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>>> From: Kumar Gala <galak@kernel.crashing.org>
>>>
>>> Its more likely that we explicitly set soft-floating point support for a
>>> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
>>> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>>>
>>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>>> ---
>>> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>> index 8cc76ab..013755d 100644
>>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>>>
>>> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>>>
>>> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
>>> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>>>
>>> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
>>
>> Whilst the change itself may or may not be ok, it would need to change
>> the various boards that are already setting or not setting fpu-hard as a
>> feature so as it stands this change is incomplete.
>
> Which boards are you speaking of? I'm not aware of any that set soft float at this point for PPC.
It shouldn't be the board setting it to soft-fp, but instead the tune.
Something like qemuppc can use the nf 603e tune.
--Mark
> - k
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 14:50 ` Mark Hatle
@ 2011-08-01 15:57 ` Kumar Gala
0 siblings, 0 replies; 53+ messages in thread
From: Kumar Gala @ 2011-08-01 15:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Aug 1, 2011, at 9:50 AM, Mark Hatle wrote:
> On 8/1/11 9:13 AM, Kumar Gala wrote:
>>
>> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>>
>>> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>>>> From: Kumar Gala <galak@kernel.crashing.org>
>>>>
>>>> Its more likely that we explicitly set soft-floating point support for a
>>>> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
>>>> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>>>>
>>>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>>>> ---
>>>> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
>>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>>
>>>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>>> index 8cc76ab..013755d 100644
>>>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>>>> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>>>>
>>>> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>>>>
>>>> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
>>>> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>>>>
>>>> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
>>>
>>> Whilst the change itself may or may not be ok, it would need to change
>>> the various boards that are already setting or not setting fpu-hard as a
>>> feature so as it stands this change is incomplete.
>>
>> Which boards are you speaking of? I'm not aware of any that set soft float at this point for PPC.
>
> It shouldn't be the board setting it to soft-fp, but instead the tune.
> Something like qemuppc can use the nf 603e tune.
>
> --Mark
Right, and the tune files we have do this already, tune-ppce300c2.inc.
TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
So, see no reason not to apply this.
- k
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 14:11 ` Kumar Gala
@ 2011-08-01 17:34 ` Khem Raj
2011-08-01 18:51 ` Kumar Gala
0 siblings, 1 reply; 53+ messages in thread
From: Khem Raj @ 2011-08-01 17:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On (01/08/11 09:11), Kumar Gala wrote:
>
> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>
> > On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> >> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >> ---
> >> meta/classes/sanity.bbclass | 8 +++++---
> >> 1 files changed, 5 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> >> index 999e15d..dc11c9e 100644
> >> --- a/meta/classes/sanity.bbclass
> >> +++ b/meta/classes/sanity.bbclass
> >> @@ -383,12 +383,14 @@ def check_sanity(e):
> >> dups = []
> >>
> >> for pa in pkgarchs.split():
> >> - if seen.get(pa, 0) == 1:
> >> + if pa == tunepkg:
> >> + tunefound = True
> >> + if seen.get(pa, 0) == 1:
> >> + pkgarchs.remove(pa)
> >> + elif seen.get(pa, 0) == 1:
> >> dups.append(pa)
> >> else:
> >> seen[pa] = 1
> >> - if pa == tunepkg:
> >> - tunefound = True
> >>
> >> if len(dups):
> >> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
> >
> > How about we don't put duplicates in there in the first place?
> >
> > Which board/tune files is this occurring with?
>
> Yeah, not sure about this one, I added the sanity check to find this early. Ran into issues with my PPC patch set and took a while to find (thus figured a sanity check made sense to check early on).
I think the issue is when TUNE_PKGARCH does not end up in the
PACKAGE_ARCHS and then package managers dont pick the ipks/rpms/debs
which are under that dir in deploy/ipk.
Usually we have been doing += to PACKAGE_EXTRA_ARCH
variable in layers but with latest tune overhaul += does not work
and we have to do _append/_prepend. I dont know if that is Kumar's
original problem
>
> - k
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
-Khem
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-01 13:14 ` Richard Purdie
@ 2011-08-01 17:46 ` Khem Raj
2011-08-05 10:59 ` Phil Blundell
1 sibling, 0 replies; 53+ messages in thread
From: Khem Raj @ 2011-08-01 17:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On (01/08/11 14:14), Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> > From: Khem Raj <raj.khem@gmail.com>
> >
> > This will decouple the compiling in thumb mode from having thumb
> > capable cores.
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > .../conf/machine/include/arm/feature-arm-thumb.inc | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > index e7d392e..533eab9 100644
> > --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > @@ -4,9 +4,11 @@
> > # encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
> > # but requires more instructions (140% for 70% smaller code) so may be
> > # slower.
> > -TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
> > -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> > +TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
> > +ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
> > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> > +
> > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
> > OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
> >
> > # Note armv7 will hit on armv7a as well
this patch was wrong anyway. The one from Martin was better which was
pushed to help arm builds going.
>
> The original change committed into master in my absence is broken.i
This commit is what was pushed e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2
how is it broken ?
> patch is just making things even worse and more broken :(
>
> I suspect what people really wanted was:
>
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
-Khem
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 17:34 ` Khem Raj
@ 2011-08-01 18:51 ` Kumar Gala
2011-08-01 18:59 ` Khem Raj
0 siblings, 1 reply; 53+ messages in thread
From: Kumar Gala @ 2011-08-01 18:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Aug 1, 2011, at 12:34 PM, Khem Raj wrote:
> On (01/08/11 09:11), Kumar Gala wrote:
>>
>> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>>
>>> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>>> ---
>>>> meta/classes/sanity.bbclass | 8 +++++---
>>>> 1 files changed, 5 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
>>>> index 999e15d..dc11c9e 100644
>>>> --- a/meta/classes/sanity.bbclass
>>>> +++ b/meta/classes/sanity.bbclass
>>>> @@ -383,12 +383,14 @@ def check_sanity(e):
>>>> dups = []
>>>>
>>>> for pa in pkgarchs.split():
>>>> - if seen.get(pa, 0) == 1:
>>>> + if pa == tunepkg:
>>>> + tunefound = True
>>>> + if seen.get(pa, 0) == 1:
>>>> + pkgarchs.remove(pa)
>>>> + elif seen.get(pa, 0) == 1:
>>>> dups.append(pa)
>>>> else:
>>>> seen[pa] = 1
>>>> - if pa == tunepkg:
>>>> - tunefound = True
>>>>
>>>> if len(dups):
>>>> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
>>>
>>> How about we don't put duplicates in there in the first place?
>>>
>>> Which board/tune files is this occurring with?
>>
>> Yeah, not sure about this one, I added the sanity check to find this early. Ran into issues with my PPC patch set and took a while to find (thus figured a sanity check made sense to check early on).
>
> I think the issue is when TUNE_PKGARCH does not end up in the
> PACKAGE_ARCHS and then package managers dont pick the ipks/rpms/debs
> which are under that dir in deploy/ipk.
> Usually we have been doing += to PACKAGE_EXTRA_ARCH
> variable in layers but with latest tune overhaul += does not work
> and we have to do _append/_prepend. I dont know if that is Kumar's
> original problem
Yeah, its why I added the sanity check to make sure TUNE_PKGARCH was in the PACKAGE_ARCHS list.
- k
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 18:51 ` Kumar Gala
@ 2011-08-01 18:59 ` Khem Raj
2011-08-02 13:39 ` Richard Purdie
0 siblings, 1 reply; 53+ messages in thread
From: Khem Raj @ 2011-08-01 18:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Aug 1, 2011 at 11:51 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
>
> On Aug 1, 2011, at 12:34 PM, Khem Raj wrote:
>
>> On (01/08/11 09:11), Kumar Gala wrote:
>>>
>>> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>>>
>>>> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>>>> ---
>>>>> meta/classes/sanity.bbclass | 8 +++++---
>>>>> 1 files changed, 5 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
>>>>> index 999e15d..dc11c9e 100644
>>>>> --- a/meta/classes/sanity.bbclass
>>>>> +++ b/meta/classes/sanity.bbclass
>>>>> @@ -383,12 +383,14 @@ def check_sanity(e):
>>>>> dups = []
>>>>>
>>>>> for pa in pkgarchs.split():
>>>>> - if seen.get(pa, 0) == 1:
>>>>> + if pa == tunepkg:
>>>>> + tunefound = True
>>>>> + if seen.get(pa, 0) == 1:
>>>>> + pkgarchs.remove(pa)
>>>>> + elif seen.get(pa, 0) == 1:
>>>>> dups.append(pa)
>>>>> else:
>>>>> seen[pa] = 1
>>>>> - if pa == tunepkg:
>>>>> - tunefound = True
>>>>>
>>>>> if len(dups):
>>>>> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
>>>>
>>>> How about we don't put duplicates in there in the first place?
>>>>
>>>> Which board/tune files is this occurring with?
>>>
>>> Yeah, not sure about this one, I added the sanity check to find this early. Ran into issues with my PPC patch set and took a while to find (thus figured a sanity check made sense to check early on).
>>
>> I think the issue is when TUNE_PKGARCH does not end up in the
>> PACKAGE_ARCHS and then package managers dont pick the ipks/rpms/debs
>> which are under that dir in deploy/ipk.
>> Usually we have been doing += to PACKAGE_EXTRA_ARCH
>> variable in layers but with latest tune overhaul += does not work
>> and we have to do _append/_prepend. I dont know if that is Kumar's
>> original problem
>
> Yeah, its why I added the sanity check to make sure TUNE_PKGARCH was in the PACKAGE_ARCHS list.
right now ppc is bitten by this issue. I cannt build images for qemuppc
in oe-core atm since TUNE_PKGARCH = "powerpcppc603e" and therefore ipks
are put in the subdir with same name which opkg does not know about
powerpcppc603e as a PACKAGE_ARCH so doesnt search this subdir for
packages.
>
> - k
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice
2011-08-01 18:59 ` Khem Raj
@ 2011-08-02 13:39 ` Richard Purdie
0 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-02 13:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 11:59 -0700, Khem Raj wrote:
> On Mon, Aug 1, 2011 at 11:51 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
> >
> > On Aug 1, 2011, at 12:34 PM, Khem Raj wrote:
> >
> >> On (01/08/11 09:11), Kumar Gala wrote:
> >>>
> >>> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
> >>>
> >>>> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> >>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >>>>> ---
> >>>>> meta/classes/sanity.bbclass | 8 +++++---
> >>>>> 1 files changed, 5 insertions(+), 3 deletions(-)
> >>>>>
> >>>>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> >>>>> index 999e15d..dc11c9e 100644
> >>>>> --- a/meta/classes/sanity.bbclass
> >>>>> +++ b/meta/classes/sanity.bbclass
> >>>>> @@ -383,12 +383,14 @@ def check_sanity(e):
> >>>>> dups = []
> >>>>>
> >>>>> for pa in pkgarchs.split():
> >>>>> - if seen.get(pa, 0) == 1:
> >>>>> + if pa == tunepkg:
> >>>>> + tunefound = True
> >>>>> + if seen.get(pa, 0) == 1:
> >>>>> + pkgarchs.remove(pa)
> >>>>> + elif seen.get(pa, 0) == 1:
> >>>>> dups.append(pa)
> >>>>> else:
> >>>>> seen[pa] = 1
> >>>>> - if pa == tunepkg:
> >>>>> - tunefound = True
> >>>>>
> >>>>> if len(dups):
> >>>>> messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
> >>>>
> >>>> How about we don't put duplicates in there in the first place?
> >>>>
> >>>> Which board/tune files is this occurring with?
> >>>
> >>> Yeah, not sure about this one, I added the sanity check to find this early. Ran into issues with my PPC patch set and took a while to find (thus figured a sanity check made sense to check early on).
> >>
> >> I think the issue is when TUNE_PKGARCH does not end up in the
> >> PACKAGE_ARCHS and then package managers dont pick the ipks/rpms/debs
> >> which are under that dir in deploy/ipk.
> >> Usually we have been doing += to PACKAGE_EXTRA_ARCH
> >> variable in layers but with latest tune overhaul += does not work
> >> and we have to do _append/_prepend. I dont know if that is Kumar's
> >> original problem
> >
> > Yeah, its why I added the sanity check to make sure TUNE_PKGARCH was in the PACKAGE_ARCHS list.
>
> right now ppc is bitten by this issue. I cannt build images for qemuppc
> in oe-core atm since TUNE_PKGARCH = "powerpcppc603e" and therefore ipks
> are put in the subdir with same name which opkg does not know about
> powerpcppc603e as a PACKAGE_ARCH so doesnt search this subdir for
> packages.
I'm fine with the sanity check, thats great and I merged that. What I
don't like is automagically removing duplicates. The variable is order
sensitive and who do we know which one to remove?
Cheers,
Rcichard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-01 13:03 ` Richard Purdie
2011-08-01 14:13 ` Kumar Gala
@ 2011-08-02 18:31 ` Kumar Gala
2011-08-02 22:36 ` Richard Purdie
1 sibling, 1 reply; 53+ messages in thread
From: Kumar Gala @ 2011-08-02 18:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer, Richard Purdie
On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Kumar Gala <galak@kernel.crashing.org>
>>
>> Its more likely that we explicitly set soft-floating point support for a
>> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
>> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>>
>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>> ---
>> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> index 8cc76ab..013755d 100644
>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>>
>> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>>
>> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
>> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>>
>> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
>
> Whilst the change itself may or may not be ok, it would need to change
> the various boards that are already setting or not setting fpu-hard as a
> feature so as it stands this change is incomplete.
>
> Cheers,
>
> Richard
Maybe I misunderstood when I first read this, did you mean we should remove explicitly setting 'fpu-hard' on the boards / tune files that are doing this?
- k
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU
2011-08-02 18:31 ` Kumar Gala
@ 2011-08-02 22:36 ` Richard Purdie
0 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-02 22:36 UTC (permalink / raw)
To: Kumar Gala; +Cc: Patches and discussions about the oe-core layer
On Tue, 2011-08-02 at 13:31 -0500, Kumar Gala wrote:
> On Aug 1, 2011, at 8:03 AM, Richard Purdie wrote:
>
> > On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> >> From: Kumar Gala <galak@kernel.crashing.org>
> >>
> >> Its more likely that we explicitly set soft-floating point support for a
> >> given target than hard. So use 'fpu-soft' in TUNE_FEATURES rather than
> >> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
> >>
> >> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> >> ---
> >> meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 +-
> >> 1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> >> index 8cc76ab..013755d 100644
> >> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> >> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> >> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
> >>
> >> ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
> >>
> >> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
> >> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
> >>
> >> TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
> >
> > Whilst the change itself may or may not be ok, it would need to change
> > the various boards that are already setting or not setting fpu-hard as a
> > feature so as it stands this change is incomplete.
>
> Maybe I misunderstood when I first read this, did you mean we should
> remove explicitly setting 'fpu-hard' on the boards / tune files that
> are doing this?
Yes, that is what I meant.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-01 13:14 ` Richard Purdie
2011-08-01 17:46 ` Khem Raj
@ 2011-08-05 10:59 ` Phil Blundell
2011-08-05 11:39 ` Richard Purdie
1 sibling, 1 reply; 53+ messages in thread
From: Phil Blundell @ 2011-08-05 10:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-08-01 at 14:14 +0100, Richard Purdie wrote:
> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> > From: Khem Raj <raj.khem@gmail.com>
> >
> > This will decouple the compiling in thumb mode from having thumb
> > capable cores.
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > .../conf/machine/include/arm/feature-arm-thumb.inc | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > index e7d392e..533eab9 100644
> > --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > @@ -4,9 +4,11 @@
> > # encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
> > # but requires more instructions (140% for 70% smaller code) so may be
> > # slower.
> > -TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
> > -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> > +TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
> > +ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
> > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> > +
> > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
> > OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
> >
> > # Note armv7 will hit on armv7a as well
>
> The original change committed into master in my absence is broken. This
> patch is just making things even worse and more broken :(
What's the current situation with this? As far as I can tell from the
git log, there doesn't appear to have been any significant change in
this area since last week: the head of feature-arm-thumb.inc is still at
the allegedly-broken commit e23f9ce92.
Does anybody have a summary of what exactly is broken at the moment and
what is being done about it?
thanks
p.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-05 10:59 ` Phil Blundell
@ 2011-08-05 11:39 ` Richard Purdie
2011-08-05 14:34 ` Phil Blundell
0 siblings, 1 reply; 53+ messages in thread
From: Richard Purdie @ 2011-08-05 11:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-05 at 11:59 +0100, Phil Blundell wrote:
> On Mon, 2011-08-01 at 14:14 +0100, Richard Purdie wrote:
> > On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> > > From: Khem Raj <raj.khem@gmail.com>
> > >
> > > This will decouple the compiling in thumb mode from having thumb
> > > capable cores.
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ---
> > > .../conf/machine/include/arm/feature-arm-thumb.inc | 6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > > index e7d392e..533eab9 100644
> > > --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > > +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> > > @@ -4,9 +4,11 @@
> > > # encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
> > > # but requires more instructions (140% for 70% smaller code) so may be
> > > # slower.
> > > -TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
> > > -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> > > +TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
> > > +ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
> > > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> > > +
> > > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
> > > OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
> > >
> > > # Note armv7 will hit on armv7a as well
> >
> > The original change committed into master in my absence is broken. This
> > patch is just making things even worse and more broken :(
>
> What's the current situation with this? As far as I can tell from the
> git log, there doesn't appear to have been any significant change in
> this area since last week: the head of feature-arm-thumb.inc is still at
> the allegedly-broken commit e23f9ce92.
>
> Does anybody have a summary of what exactly is broken at the moment and
> what is being done about it?
ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
Master has the above. This means it can set -mthumb for machines that don't have the thumb feature which seems wrong to me. I suspect it should be:
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
or if gcc can't cope with that,
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "", d)}"
instead.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-05 11:39 ` Richard Purdie
@ 2011-08-05 14:34 ` Phil Blundell
2011-08-05 15:23 ` Khem Raj
0 siblings, 1 reply; 53+ messages in thread
From: Phil Blundell @ 2011-08-05 14:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-05 at 12:39 +0100, Richard Purdie wrote:
> ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
>
> Master has the above. This means it can set -mthumb for machines that don't have the thumb feature which seems wrong to me. I suspect it should be:
Agreed, it does seem as though any bb.utils.contains() where the "true"
and "false" arms are identical must be wrong.
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
>
> or if gcc can't cope with that,
>
> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "", d)}"
I think either of those should be fine.
p.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-05 14:34 ` Phil Blundell
@ 2011-08-05 15:23 ` Khem Raj
2011-08-05 16:23 ` Richard Purdie
0 siblings, 1 reply; 53+ messages in thread
From: Khem Raj @ 2011-08-05 15:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Friday, August 05, 2011 03:34:43 PM Phil Blundell wrote:
> On Fri, 2011-08-05 at 12:39 +0100, Richard Purdie wrote:
> > ARM_THUMB_M_OPT = "${@['-mno-thumb',
> > '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> > Master has the above. This means it can set -mthumb for machines that
don't have the thumb feature which seems wrong to me. I suspect it should be:
> Agreed, it does seem as though any bb.utils.contains() where the "true"
> and "false" arms are identical must be wrong.
>
> > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
> >
> > or if gcc can't cope with that,
> >
> > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > "${ARM_THUMB_M_OPT}", "", d)}"
> I think either of those should be fine.
>
I prefer the latter since it will have one option less in gcc commandline
saving a minute bit of time spent in parsing cmdline.
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode
2011-08-05 15:23 ` Khem Raj
@ 2011-08-05 16:23 ` Richard Purdie
0 siblings, 0 replies; 53+ messages in thread
From: Richard Purdie @ 2011-08-05 16:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-05 at 08:23 -0700, Khem Raj wrote:
> On Friday, August 05, 2011 03:34:43 PM Phil Blundell wrote:
> > On Fri, 2011-08-05 at 12:39 +0100, Richard Purdie wrote:
> > > ARM_THUMB_M_OPT = "${@['-mno-thumb',
> > > '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
> > > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > > "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
> > > Master has the above. This means it can set -mthumb for machines that
> don't have the thumb feature which seems wrong to me. I suspect it should be:
> > Agreed, it does seem as though any bb.utils.contains() where the "true"
> > and "false" arms are identical must be wrong.
> >
> > > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > > "${ARM_THUMB_M_OPT}", "-mno-thumb", d)}"
> > >
> > > or if gcc can't cope with that,
> > >
> > > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb",
> > > "${ARM_THUMB_M_OPT}", "", d)}"
> > I think either of those should be fine.
> >
>
> I prefer the latter since it will have one option less in gcc commandline
> saving a minute bit of time spent in parsing cmdline.
Since nobody sent me a patch I've just merged a patch to do the latter.
Cheers,
Richard
^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2011-08-05 16:28 UTC | newest]
Thread overview: 53+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-01 7:35 [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Saul Wold
2011-08-01 7:35 ` [PATCH 01/22] meta-environment: set correct *MULTIMACH_TARGET_SYS Saul Wold
2011-08-01 7:35 ` [PATCH 02/22] glibc: deleted Saul Wold
2011-08-01 7:35 ` [PATCH 03/22] libzypp: Fix variable substitution problem in do_archgen step Saul Wold
2011-08-01 7:35 ` [PATCH 04/22] docbook-sgml-dtd-native: Write a bak file for shared state Saul Wold
2011-08-01 7:35 ` [PATCH 05/22] docbook-dsssl-stylesheets-native: " Saul Wold
2011-08-01 7:35 ` [PATCH 06/22] openjade-native: " Saul Wold
2011-08-01 7:35 ` [PATCH 07/22] sgml-common-native: Read a catalog backup to repopulate sgml-docbook.cat Saul Wold
2011-08-01 7:36 ` [PATCH 08/22] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling Saul Wold
2011-08-01 7:36 ` [PATCH 09/22] tune/arch-powerpc64: Remove support for soft-float from ppc64 Saul Wold
2011-08-01 7:36 ` [PATCH 10/22] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 14:13 ` Kumar Gala
2011-08-01 14:50 ` Mark Hatle
2011-08-01 15:57 ` Kumar Gala
2011-08-02 18:31 ` Kumar Gala
2011-08-02 22:36 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 11/22] tune-ppce500mc: Adjust PowerPC e500mc tune file to correctly set hard fpu Saul Wold
2011-08-01 7:36 ` [PATCH 12/22] sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS Saul Wold
2011-08-01 7:36 ` [PATCH 13/22] sanity: Dont throw a warning if TUNE_PKGARCH is in PACKAGE_ARCHS twice Saul Wold
2011-08-01 13:03 ` Richard Purdie
2011-08-01 13:28 ` Koen Kooi
2011-08-01 14:11 ` Kumar Gala
2011-08-01 17:34 ` Khem Raj
2011-08-01 18:51 ` Kumar Gala
2011-08-01 18:59 ` Khem Raj
2011-08-02 13:39 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 14/22] libzypp: Bump PR Saul Wold
2011-08-01 7:36 ` [PATCH 15/22] tune/powerpc: Cleanup setting of TUNE_PKGARCH Saul Wold
2011-08-01 9:06 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 16/22] populate_sdk: Fix the introduction of sdknative packages Saul Wold
2011-08-01 13:06 ` Richard Purdie
2011-08-01 14:47 ` Mark Hatle
2011-08-01 7:36 ` [PATCH 17/22] bitbake.conf: Add default tune-${DEFAULTTUNE} override Saul Wold
2011-08-01 9:00 ` Richard Purdie
2011-08-01 9:09 ` Phil Blundell
2011-08-01 14:36 ` Mark Hatle
2011-08-01 7:36 ` [PATCH 18/22] rootfs_rpm.bbclass: Fix multilib configurations to use DEFAULTTUNE Saul Wold
2011-08-01 7:36 ` [PATCH 19/22] package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typo Saul Wold
2011-08-01 7:36 ` [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case Saul Wold
2011-08-01 13:10 ` Richard Purdie
2011-08-01 13:35 ` Koen Kooi
2011-08-01 7:36 ` [PATCH 21/22] external-*toolchain: remove glibc-utils provide Saul Wold
2011-08-01 13:11 ` Richard Purdie
2011-08-01 7:36 ` [PATCH 22/22] feature-arm-thumb: Take ARM_INSTRUCTION_SET into account to decide thumb mode Saul Wold
2011-08-01 13:14 ` Richard Purdie
2011-08-01 17:46 ` Khem Raj
2011-08-05 10:59 ` Phil Blundell
2011-08-05 11:39 ` Richard Purdie
2011-08-05 14:34 ` Phil Blundell
2011-08-05 15:23 ` Khem Raj
2011-08-05 16:23 ` Richard Purdie
2011-08-01 13:20 ` [CONSOLIDATED PATCH 00/22] Fixes Multi-Lib & M3 Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox