From dbaf3ad84ce22ced9e05ee5e85cf71574d054526 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 12 Nov 2011 12:27:30 +0100 Subject: [PATCH] classes: remove duplicate classes (From meta-openembedded rev: 5260401eb0cfe37a7358296866b4b43a167817ff) Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- .../meta-oe/classes/gnomebase.bbclass | 32 ------- meta-openembedded/meta-oe/classes/mime.bbclass | 58 ------------ .../meta-oe/classes/qmake_base.bbclass | 105 --------------------- 3 files changed, 195 deletions(-) delete mode 100644 meta-openembedded/meta-oe/classes/gnomebase.bbclass delete mode 100644 meta-openembedded/meta-oe/classes/mime.bbclass delete mode 100644 meta-openembedded/meta-oe/classes/qmake_base.bbclass diff --git a/meta-openembedded/meta-oe/classes/gnomebase.bbclass b/meta-openembedded/meta-oe/classes/gnomebase.bbclass deleted file mode 100644 index 5a332a0..0000000 --- a/meta-openembedded/meta-oe/classes/gnomebase.bbclass +++ /dev/null @@ -1,32 +0,0 @@ -def gnome_verdir(v): - import re - m = re.match("^([0-9]+)\.([0-9]+)", v) - return "%s.%s" % (m.group(1), m.group(2)) - -SECTION ?= "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive" - -DEPENDS += "gnome-common" - -FILES_${PN} += "${datadir}/application-registry \ - ${datadir}/mime-info \ - ${datadir}/mime/packages \ - ${datadir}/mime/application \ - ${datadir}/gnome-2.0 \ - ${datadir}/polkit* \ - ${datadir}/GConf \ - ${datadir}/glib-2.0/schemas \ -" - -FILES_${PN}-doc += "${datadir}/devhelp" - -inherit autotools pkgconfig - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_install_append() { - rm -rf ${D}${localstatedir}/lib/scrollkeeper/* - rm -rf ${D}${localstatedir}/scrollkeeper/* - rm -f ${D}${datadir}/applications/*.cache -} - diff --git a/meta-openembedded/meta-oe/classes/mime.bbclass b/meta-openembedded/meta-oe/classes/mime.bbclass deleted file mode 100644 index d73c2cb..0000000 --- a/meta-openembedded/meta-oe/classes/mime.bbclass +++ /dev/null @@ -1,58 +0,0 @@ -DEPENDS += "shared-mime-info-native shared-mime-info" - -EXTRA_OECONF += "--disable-update-mimedb" - -mime_postinst() { -if [ "$1" = configure ]; then - if [ -x ${bindir}/update-mime-database ] ; then - echo "Updating MIME database... this may take a while." - update-mime-database $D${datadir}/mime - else - echo "Missing ${bindir}/update-mime-database, update of mime database failed!" - exit 1 - fi -fi -} - -mime_postrm() { -if [ "$1" = remove ] || [ "$1" = upgrade ]; then - if [ -x ${bindir}/update-mime-database ] ; then - echo "Updating MIME database... this may take a while." - update-mime-database $D${datadir}/mime - else - echo "Missing ${bindir}/update-mime-database, update of mime database failed!" - exit 1 - fi -fi -} - -python ppopulate_packages_append () { - import os.path, re - packages = bb.data.getVar('PACKAGES', d, 1).split() - pkgdest = bb.data.getVar('PKGDEST', d, 1) - - for pkg in packages: - mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) - mimes = [] - mime_re = re.compile(".*\.xml$") - if os.path.exists(mime_dir): - for f in os.listdir(mime_dir): - if mime_re.match(f): - mimes.append(f) - if mimes != []: - bb.note("adding mime postinst and postrm scripts to %s" % pkg) - postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) - if not postinst: - postinst = '#!/bin/sh\n' - postinst += bb.data.getVar('mime_postinst', d, 1) - bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) - postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += bb.data.getVar('mime_postrm', d, 1) - bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) - bb.note("adding freedesktop-mime-info dependency to %s" % pkg) - rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - rdepends.append("freedesktop-mime-info") - bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) -} diff --git a/meta-openembedded/meta-oe/classes/qmake_base.bbclass b/meta-openembedded/meta-oe/classes/qmake_base.bbclass deleted file mode 100644 index aa8c05b..0000000 --- a/meta-openembedded/meta-oe/classes/qmake_base.bbclass +++ /dev/null @@ -1,105 +0,0 @@ - -OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" -QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" - -# We override this completely to eliminate the -e normally passed in -EXTRA_OEMAKE = ' MAKEFLAGS= ' - -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," - -# do not export STRIP to the environment -STRIP[unexport] = "1" - -# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 - -oe_qmake_mkspecs () { - mkdir -p mkspecs/${OE_QMAKE_PLATFORM} - for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do - if [ -L $f ]; then - lnk=`readlink $f` - if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then - ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - done -} - -do_generate_qt_config_file() { - export QT_CONF_PATH=${WORKDIR}/qt.conf - cat > ${WORKDIR}/qt.conf <