Remove exclude hack in insane.bbclass and replace it with something a little less foul. This involces adding INSANE_SKIP_package=1 statements to the relevant .bb files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1197 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
539b0f853a
commit
4292e8199b
|
@ -56,3 +56,7 @@ FILES_${PN} += "${datadir} \
|
|||
FILES_${PN}-dev = "${incdir} \
|
||||
${libdir}/*.a \
|
||||
${libdir}/pkgconfig"
|
||||
|
||||
# The networkmanager package needs to be split into app/lib/dev packages. For
|
||||
# now, silence insane.
|
||||
INSANE_SKIP_${PN} = "1"
|
||||
|
|
|
@ -101,7 +101,7 @@ def package_qa_check_rdepends(pkg, workdir, d):
|
|||
|
||||
bb.data.setVar('ROOT', '', localdata)
|
||||
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
|
||||
pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
|
||||
pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, True)
|
||||
if not pkgname:
|
||||
pkgname = pkg
|
||||
bb.data.setVar('PKG', pkgname, localdata)
|
||||
|
@ -134,12 +134,7 @@ python do_package_qa () {
|
|||
return
|
||||
|
||||
for package in packages.split():
|
||||
# Nasty hack for now until we can mark exclusions in the packages.
|
||||
# db has a unusual versioning scheme. Cannot fix this.
|
||||
# gcc contains symlinks to other packages. Cannot fix.
|
||||
# elfutils has symlinks to point to correct .so files. Cannot fix.
|
||||
# networkmanager needs to be split into app/lib packages. Can fix.
|
||||
if package in [ 'db', 'gcc', 'elfutils', 'networkmanager' ]:
|
||||
if bb.data.getVar('INSANE_SKIP_' + package, d, True):
|
||||
bb.note("Package: %s (skipped)" % package)
|
||||
continue
|
||||
|
||||
|
|
|
@ -95,3 +95,6 @@ do_install_append() {
|
|||
mv "${D}/${prefix}/docs" "${D}/${docdir}"
|
||||
fi
|
||||
}
|
||||
|
||||
# The db package contains symlinks that trip up insane
|
||||
INSANE_SKIP_db = "1"
|
||||
|
|
|
@ -34,3 +34,6 @@ do_stage () {
|
|||
install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
|
||||
install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
|
||||
}
|
||||
|
||||
# The elfutils package contains symlinks that trip up insane
|
||||
INSANE_SKIP_elfutils = "1"
|
||||
|
|
|
@ -107,3 +107,6 @@ do_install () {
|
|||
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
|
||||
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
|
||||
}
|
||||
|
||||
# The gcc package contains symlinks that trip up insane
|
||||
INSANE_SKIP_${PN} = "1"
|
||||
|
|
Loading…
Reference in New Issue