summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package.bbclass26
-rw-r--r--meta/conf/bitbake.conf5
2 files changed, 21 insertions, 10 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9edcc1e5ed..6365748956 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -177,8 +177,10 @@ runstrip() {
177 ro=1 177 ro=1
178 chmod +w "$1" 178 chmod +w "$1"
179 } 179 }
180 '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg"
180 '${STRIP}' "$1" 181 '${STRIP}' "$1"
181 st=$? 182 st=$?
183 '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1"
182 test -n "$ro" && chmod -w "$1" 184 test -n "$ro" && chmod -w "$1"
183 if test $st -ne 0 185 if test $st -ne 0
184 then 186 then
@@ -249,6 +251,21 @@ python populate_packages () {
249 bb.error("%s is listed in PACKAGES mutliple times. Undefined behaviour will result." % pkg) 251 bb.error("%s is listed in PACKAGES mutliple times. Undefined behaviour will result." % pkg)
250 pkgs += pkg 252 pkgs += pkg
251 253
254 if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
255 stripfunc = ""
256 for root, dirs, files in os.walk(dvar):
257 for f in files:
258 file = os.path.join(root, f)
259 if not os.path.islink(file) and isexec(file):
260 stripfunc += "\trunstrip %s || st=1\n" % (file)
261 if not stripfunc == "":
262 from bb import build
263 localdata = bb.data.createCopy(d)
264 # strip
265 bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
266 bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
267 bb.build.exec_func('RUNSTRIP', localdata)
268
252 for pkg in packages.split(): 269 for pkg in packages.split():
253 localdata = bb.data.createCopy(d) 270 localdata = bb.data.createCopy(d)
254 root = os.path.join(workdir, "install", pkg) 271 root = os.path.join(workdir, "install", pkg)
@@ -273,7 +290,6 @@ python populate_packages () {
273 bb.mkdirhier(root) 290 bb.mkdirhier(root)
274 filesvar = bb.data.getVar('FILES', localdata, 1) or "" 291 filesvar = bb.data.getVar('FILES', localdata, 1) or ""
275 files = filesvar.split() 292 files = filesvar.split()
276 stripfunc = ""
277 for file in files: 293 for file in files:
278 if os.path.isabs(file): 294 if os.path.isabs(file):
279 file = '.' + file 295 file = '.' + file
@@ -293,17 +309,9 @@ python populate_packages () {
293 fpath = os.path.join(root,file) 309 fpath = os.path.join(root,file)
294 dpath = os.path.dirname(fpath) 310 dpath = os.path.dirname(fpath)
295 bb.mkdirhier(dpath) 311 bb.mkdirhier(dpath)
296 if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file):
297 stripfunc += "\trunstrip %s || st=1\n" % fpath
298 ret = bb.movefile(file,fpath) 312 ret = bb.movefile(file,fpath)
299 if ret is None or ret == 0: 313 if ret is None or ret == 0:
300 raise bb.build.FuncFailed("File population failed") 314 raise bb.build.FuncFailed("File population failed")
301 if not stripfunc == "":
302 from bb import build
303 # strip
304 bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
305 bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
306 bb.build.exec_func('RUNSTRIP', localdata)
307 del localdata 315 del localdata
308 os.chdir(workdir) 316 os.chdir(workdir)
309 317
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 529405a3eb..6c15ef71b4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -102,7 +102,7 @@ PROVIDES = ""
102PROVIDES_prepend = "${P} ${PF} ${PN} " 102PROVIDES_prepend = "${P} ${PF} ${PN} "
103RPROVIDES = "" 103RPROVIDES = ""
104 104
105PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" 105PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
106FILES = "" 106FILES = ""
107FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ 107FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
108 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 108 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -118,6 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
118 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ 118 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
119 /lib/*.a /lib/*.o ${datadir}/aclocal" 119 /lib/*.a /lib/*.o ${datadir}/aclocal"
120FILES_${PN}-locale = "${datadir}/locale" 120FILES_${PN}-locale = "${datadir}/locale"
121FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
122 /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
121 123
122# File manifest 124# File manifest
123 125
@@ -222,6 +224,7 @@ export AR = "${HOST_PREFIX}ar"
222export AS = "${HOST_PREFIX}as" 224export AS = "${HOST_PREFIX}as"
223export RANLIB = "${HOST_PREFIX}ranlib" 225export RANLIB = "${HOST_PREFIX}ranlib"
224export STRIP = "${HOST_PREFIX}strip" 226export STRIP = "${HOST_PREFIX}strip"
227export OBJCOPY = "${HOST_PREFIX}objcopy"
225 228
226export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" 229export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
227export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" 230export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"