summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-07-31 11:46:42 +0000
committerKoen Kooi <koen@openembedded.org>2006-07-31 11:46:42 +0000
commit09436056f94e7103d436177bdaea7c3bd9493913 (patch)
treeda9cb1ef73327d2c7fd2b53bcdb48cc11d177349
parent60a95145ce57c6116be31bd197a406e368102fc4 (diff)
parentab200f3815379c7d4f7e790e5b60c02d6fdf866f (diff)
merge of 'acd8498e4573491722380c035bd7b58de78410ee'
and 'd7cc6ec7ff432b7592af0d14fbe1777a3bebd543'
-rw-r--r--classes/package.bbclass6
-rw-r--r--conf/bitbake.conf4
-rw-r--r--packages/linux/linux-openzaurus_2.6.17.bb4
3 files changed, 8 insertions, 6 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 39e6a06b41..2791e4bcfa 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -177,10 +177,12 @@ runstrip() {
ro=1
chmod +w "$1"
}
- '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg"
+ mkdir $(dirname "$1")/.debug
+ debugfile="$(dirname "$1")/.debug/$(basename "$1")"
+ '${OBJCOPY}' --only-keep-debug "$1" "$debugfile"
'${STRIP}' "$1"
st=$?
- '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1"
+ '${OBJCOPY}' --add-gnu-debuglink="$debugfile" "$1"
test -n "$ro" && chmod -w "$1"
if test $st -ne 0
then
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4d99f0885e..f12cca15f0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -118,8 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
/lib/*.a /lib/*.o ${datadir}/aclocal"
FILES_${PN}-locale = "${datadir}/locale"
-FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
- /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
+ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
# File manifest
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 3a1847409e..822cfca0bf 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r12"
+PR = "r14"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -28,7 +28,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
file://00-hostap.patch;patch=1;status=merged \
file://10-pcnet.patch;patch=1;status=merged \
${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \
- ${RPSRC}/asoc_fixes2-r1.patch;patch=1 \
+ ${RPSRC}/asoc_fixes2-r2.patch;patch=1 \
${RPSRC}/hx2750_base-r27.patch;patch=1 \
${RPSRC}/hx2750_bl-r7.patch;patch=1 \
${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \