summaryrefslogtreecommitdiff
path: root/uclibc
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
committerChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
commit2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch)
treecab0f25aca03f6162bd268a401945fbfbb63bff9 /uclibc
parent5df179157f90b18f437c6978efb451f515e3d1c9 (diff)
Merges.
2004/05/22 12:46:48-04:00 local!kergoth Bugfixes per the recent FILESDIR cleanup. 2004/05/22 01:03:38-04:00 local!kergoth Run a perl script against the repo to kill off direct FILESDIR usage in favor of relative file:// paths in SRC_URI, and WORKDIR references in functions. 2004/05/21 23:07:58-04:00 local!kergoth Switch file:// FILESDIR uris in SRC_URI to the new relative path format. BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'uclibc')
-rw-r--r--uclibc/uclibc_0.9.26.oe8
1 files changed, 4 insertions, 4 deletions
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 973c8eba1f..d5fc3006a3 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -48,7 +48,8 @@ UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE} \
- http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2"
+ http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2 \
+ file://uClibc.config.${TARGET_ARCH}"
S = "${WORKDIR}/uClibc-${PV}"
@@ -68,8 +69,8 @@ uclibcbuild_do_patch() {
echo "#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))" \
>> ${WORKDIR}/linux/include/linux/version.h
- if [ -f ${FILESDIR}/uClibc.config.${TARGET_ARCH} ]; then
- cp ${FILESDIR}/uClibc.config.${TARGET_ARCH} ${S}/.config
+ if [ -f ${WORKDIR}/uClibc.config.${TARGET_ARCH} ]; then
+ cp ${WORKDIR}/uClibc.config.${TARGET_ARCH} ${S}/.config
else
echo ERROR: No target specific config for ${TARGET_ARCH}
return 1
@@ -141,4 +142,3 @@ do_install() {
# This conflicts with the c++ version of this header
rm -f ${D}/${prefix}/include/bits/atomicity.h
}
-