From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 31 Jul 2006 09:57:55 +0000 (+0000)
Subject: Change -dbg objects to use .debug directory. Fixes various FILES issues.
X-Git-Tag: Release-2010-05/1~9453^2~1041^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab200f3815379c7d4f7e790e5b60c02d6fdf866f;p=openembedded.git

Change -dbg objects to use .debug directory. Fixes various FILES issues.
---

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