summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2006-05-09 20:24:21 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-09 20:24:21 +0000
commit6325e2da3ea5554b646d0c2a2a22525c28ebac72 (patch)
treee3121e897b2ca32b8786cb4abc998675ad5b5d50
parentb58b0666bd3687b7fa8a5bcbf6930b8a541b2628 (diff)
parent8d0d6b946b90e54a50434dd077834be065b619d7 (diff)
merge of 7cbb3ccbaa04f56674778282d171edc3a8768a03
and ef9a174e11d467426c07d4dbdc2228657fffd132
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb5
-rw-r--r--packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb3
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index c8f1d56841..d009f2714c 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -84,6 +84,11 @@ do_munge() {
# Integrate ports into tree
mv ${WORKDIR}/ports ${S}
+ # Need to copy some extra folder content for sh arch. - OE bug #954
+ case ${TARGET_ARCH} in
+ sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;;
+ esac
+
# http://www.handhelds.org/hypermail/oe/51/5135.html
# Some files were moved around between directories on
# 2005-12-21, which means that any attempt to check out
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 65e3f8b25b..2f471223e6 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
LICENSE = "GPL"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
file://keyboard.patch;patch=1"
@@ -41,6 +41,7 @@ do_configure () {
cp -pPR include/asm/arch-ebsa285 include/asm/arch
elif test "$ARCH" = "sh"; then
cp -pPR include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
+ cp -pPR include/asm/cpu/* include/asm
fi
}