cleanup of classes/
cover cleanup of classes/
This set includes the removal of classes as previously discussed (briefly) on the oe-core mailing list, as well as a minor whitespace fix for kernel.bbclass.
The following changes since commit b975de5ea76c5f8827fb48c0c3c29902872ad3d6:
bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:22:59 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/classes-cleanup
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/classes-cleanup
Paul Eggleton (3):
kernel.bbclass: minor whitespace fixes
classes: remove obsolete classes
classes: remove classes that don't belong in oe-core
meta/classes/base_srpm.bbclass | 20 ------- meta/classes/ccdv.bbclass | 21 -------- meta/classes/flow-lossage.bbclass | 5 -- meta/classes/kernel.bbclass | 4 +- meta/classes/mozilla.bbclass | 53 ------------------- meta/classes/openmoko-base.bbclass | 19 ------- meta/classes/openmoko-panel-plugin.bbclass | 6 -- meta/classes/openmoko.bbclass | 3 - meta/classes/openmoko2.bbclass | 31 ----------- meta/classes/patcher.bbclass | 7 --- meta/classes/singlemachine.bbclass | 15 ----- meta/classes/srec.bbclass | 28 ---------- meta/classes/tmake.bbclass | 77 ---------------------------- meta/classes/xfce.bbclass | 25 --------- meta/classes/xlibs.bbclass | 7 --- 15 files changed, 2 insertions(+), 319 deletions(-) delete mode 100644 meta/classes/base_srpm.bbclass delete mode 100644 meta/classes/ccdv.bbclass delete mode 100644 meta/classes/flow-lossage.bbclass delete mode 100644 meta/classes/mozilla.bbclass delete mode 100644 meta/classes/openmoko-base.bbclass delete mode 100644 meta/classes/openmoko-panel-plugin.bbclass delete mode 100644 meta/classes/openmoko.bbclass delete mode 100644 meta/classes/openmoko2.bbclass delete mode 100644 meta/classes/patcher.bbclass delete mode 100644 meta/classes/singlemachine.bbclass delete mode 100644 meta/classes/srec.bbclass delete mode 100644 meta/classes/tmake.bbclass delete mode 100644 meta/classes/xfce.bbclass delete mode 100644 meta/classes/xlibs.bbclass
Signature · 1 line
1.7.4.1
PATCH 1/3 kernel.bbclass: minor whitespace fixes
--- meta/classes/kernel.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/kernel.bbclass +2 -2
@@ -19,7 +19,7 @@ python __anonymous () { image = bb.data.getVar('INITRAMFS_IMAGE', d, True) if image: - bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) + bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) } inherit kernel-arch deploy
@@ -184,7 +184,7 @@ kernel_do_configure() { if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${S}/.config" ]; then cp "${WORKDIR}/defconfig" "${S}/.config" fi - yes '' | oe_runmake oldconfig + yes '' | oe_runmake oldconfig if [ ! -z "${INITRAMFS_IMAGE}" ]; then for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
Signature · 1 line
1.7.4.1
PATCH 2/3 classes: remove obsolete classes
In reply to Paul EggletonAll of these classes are currently unused in oe-core and meta-oe; several are no longer in use even in OE classic:
* base_srpm.bbclass
* ccdv.bbclass
* flow-lossage.bbclass
* patcher.bbclass
* singlemachine.bbclass
* tmake.bbclass
* xlibs.bbclass
patcher.bbclass and singlemachine.bbclass probably still work but it is unlikely that anyone is still using them.
--- meta/classes/base_srpm.bbclass | 20 --------- meta/classes/ccdv.bbclass | 21 ---------- meta/classes/flow-lossage.bbclass | 5 -- meta/classes/patcher.bbclass | 7 --- meta/classes/singlemachine.bbclass | 15 ------- meta/classes/tmake.bbclass | 77 ------------------------------------ meta/classes/xlibs.bbclass | 7 --- 7 files changed, 0 insertions(+), 152 deletions(-) delete mode 100644 meta/classes/base_srpm.bbclass delete mode 100644 meta/classes/ccdv.bbclass delete mode 100644 meta/classes/flow-lossage.bbclass delete mode 100644 meta/classes/patcher.bbclass delete mode 100644 meta/classes/singlemachine.bbclass delete mode 100644 meta/classes/tmake.bbclass delete mode 100644 meta/classes/xlibs.bbclass
meta/classes/base_srpm.bbclass deleted +0 -20
@@ -1,20 +0,0 @@ -inherit base package rpm_core - -SPECFILE="${RPMBUILDPATH}/SPECS/${PN}.spec" - -base_srpm_do_unpack() { - test -e ${SRPMFILE} || die "Source rpm \"${SRPMFILE}\"does not exist" - if ! test -e ${SPECFILE}; then - ${RPM} -i ${SRPMFILE} - fi - test -e ${SPECFILE} || die "Spec file \"${SPECFILE}\" does not exist" - ${RPMBUILD} -bp ${SPECFILE} -} - -base_srpm_do_compile() { - ${RPMBUILD} -bc ${SPECFILE} -} - -base_srpm_do_install() { - ${RPMBUILD} -bi ${SPECFILE} -}
meta/classes/ccdv.bbclass deleted +0 -21
@@ -1,21 +0,0 @@ -python () { - if bb.data.getVar('PN', d, 1) in ['ccdv-native']: - if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): - bb.data.setVar("DEPENDS", '%s %s' % ("ccdv-native", bb.data.getVar("DEPENDS", d, 1) or ""), d) - bb.data.setVar("CC", '%s %s' % ("ccdv", bb.data.getVar("CC", d, 1) or ""), d) - bb.data.setVar("BUILD_CC", '%s %s' % ("ccdv", bb.data.getVar("BUILD_CC", d, 1) or ""), d) - bb.data.setVar("CCLD", '%s %s' % ("ccdv", bb.data.getVar("CCLD", d, 1) or ""), d) -} - -def quiet_libtool(bb,d): - deps = (bb.data.getVar('DEPENDS', d, 1) or "").split() - if 'libtool-cross' in deps: - return "'LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --silent'" - elif 'libtool-native' in deps: - return "'LIBTOOL=${B}/${HOST_SYS}-libtool --silent'" - else: - return "" - -CCDV = "ccdv" -EXTRA_OEMAKE_append = " ${@quiet_libtool(bb,d)}" -MAKE += "-s"
meta/classes/flow-lossage.bbclass deleted +0 -5
@@ -1,5 +0,0 @@ -# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux -python () { - cflags = (bb.data.getVar('CFLAGS', d, 1) or '').replace('-frename-registers', '') - bb.data.setVar('CFLAGS', cflags, d) -}
meta/classes/patcher.bbclass deleted +0 -7
@@ -1,7 +0,0 @@ -# Now that BitBake/OpenEmbedded uses Quilt by default, you can simply add an -# inherit patcher -# to one of your config files to let BB/OE use patcher again. - -PATCHCLEANCMD = "patcher -B" -PATCHCMD = "patcher -R -p '%s' -n '%s' -i '%s'" -PATCH_DEPENDS = "${@["patcher-native", ""][(bb.data.getVar('PN', d, 1) == 'patcher-native')]}"
meta/classes/singlemachine.bbclass deleted +0 -15
@@ -1,15 +0,0 @@ -# -# Emulates the old mode of OE operation where only one machine can be targetted. -# - -MULTIMACH_TARGET_SYS = "${TARGET_SYS}" -MULTIMACH_HOST_SYS = "${HOST_SYS}" - -STAMP = "${TMPDIR}/stamps/${PF}" -WORKDIR = "${TMPDIR}/work/${PF}" -STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" -STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}" -PKGDATA_DIR = "${STAGING_DIR}/pkgdata" -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" - -
meta/classes/tmake.bbclass deleted +0 -77
77 lines not on this page · raw message
meta/classes/xlibs.bbclass deleted +0 -7
@@ -1,7 +0,0 @@ -LICENSE= "BSD-X" -SECTION = "x11/libs" - -XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs" - -inherit autotools pkgconfig -
Signature · 1 line
1.7.4.1
PATCH 3/3 classes: remove classes that don't belong in oe-core
In reply to Paul EggletonThese classes are not used within oe-core and really belong in an upper layer that makes use of them, if they are still useful:
* mozilla.bbclass
* openmoko*.bbclass
* srec.bbclass
* xfce.bbclass
--- meta/classes/mozilla.bbclass | 53 ---------------------------- meta/classes/openmoko-base.bbclass | 19 ---------- meta/classes/openmoko-panel-plugin.bbclass | 6 --- meta/classes/openmoko.bbclass | 3 -- meta/classes/openmoko2.bbclass | 31 ---------------- meta/classes/srec.bbclass | 28 --------------- meta/classes/xfce.bbclass | 25 ------------- 7 files changed, 0 insertions(+), 165 deletions(-) delete mode 100644 meta/classes/mozilla.bbclass delete mode 100644 meta/classes/openmoko-base.bbclass delete mode 100644 meta/classes/openmoko-panel-plugin.bbclass delete mode 100644 meta/classes/openmoko.bbclass delete mode 100644 meta/classes/openmoko2.bbclass delete mode 100644 meta/classes/srec.bbclass delete mode 100644 meta/classes/xfce.bbclass
meta/classes/mozilla.bbclass deleted +0 -53
@@ -1,53 +0,0 @@ -SECTION = "x11/utils" -DEPENDS += "gnu-config-native virtual/libintl xt libxi \ - zip-native gtk+" -LICENSE = "MPL NPL" -SRC_URI += "file://mozconfig" - -inherit gettext pkgconfig - -EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \ - --build=${BUILD_SYS} --prefix=${prefix}" -EXTRA_OEMAKE = "'HOST_LIBIDL_LIBS=${HOST_LIBIDL_LIBS}' \ - 'HOST_LIBIDL_CFLAGS=${HOST_LIBIDL_CFLAGS}'" -SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing" - -export CROSS_COMPILE = "1" -export MOZCONFIG = "${WORKDIR}/mozconfig" -export MOZ_OBJDIR = "${S}" - -export CONFIGURE_ARGS = "${EXTRA_OECONF}" -export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`" -export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`" -export HOST_LIBIDL_CONFIG = "PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" -export HOST_CC = "${BUILD_CC}" -export HOST_CXX = "${BUILD_CXX}" -export HOST_CFLAGS = "${BUILD_CFLAGS}" -export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" -export HOST_LDFLAGS = "${BUILD_LDFLAGS}" -export HOST_RANLIB = "${BUILD_RANLIB}" -export HOST_AR = "${BUILD_AR}" - -mozilla_do_configure() { - ( - set -e - for cg in `find ${S} -name config.guess`; do - install -m 0755 \ - ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess \ - ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub \ - `dirname $cg`/ - done - ) - oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ - ${MOZ_OBJDIR}/config.status -} - -mozilla_do_compile() { - oe_runmake -f client.mk build_all -} - -mozilla_do_install() { - oe_runmake DESTDIR="${D}" destdir="${D}" install -} - -EXPORT_FUNCTIONS do_configure do_compile do_install
meta/classes/openmoko-base.bbclass deleted +0 -19
@@ -1,19 +0,0 @@ -HOMEPAGE = "http://www.openmoko.org" -LICENSE ?= "GPL" -OPENMOKO_RELEASE ?= "OM-2007" -OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" - -def openmoko_base_get_subdir(d): - openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") - if section == 'base' or section == 'libs': return "" - elif section in 'apps tools pim'.split(): return "applications" - elif section == "panel-plugin": return "panel-plugins" - elif section == "inputmethods": return "inputmethods" - else: return section - -SUBDIR = "${@openmoko_base_get_subdir(d)}" - -SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http" -S = "${WORKDIR}/${PN}" - -FILES_${PN} += "${datadir}/icons"
meta/classes/openmoko-panel-plugin.bbclass deleted +0 -6
@@ -1,6 +0,0 @@ -SECTION = "openmoko/panel-plugin" -DEPENDS += "matchbox-panel-2 libmokopanelui2" - -inherit openmoko2 - -FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
meta/classes/openmoko.bbclass deleted +0 -3
@@ -1,3 +0,0 @@ -inherit openmoko-base autotools pkgconfig - -DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}"
meta/classes/openmoko2.bbclass deleted +0 -31
@@ -1,31 +0,0 @@ -inherit autotools pkgconfig - -HOMEPAGE = "http://www.openmoko.org" -OPENMOKO_RELEASE ?= "OM-2007.2" -OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" - -def openmoko_two_get_license(d): - openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") - return "LGPL GPL".split()[section != "libs"] - -def openmoko_two_get_subdir(d): - openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") - if section == 'base': return "" - elif section == 'libs': return "libraries" - elif section in 'apps tools pim'.split(): return "applications" - elif section == "panel-plugin": return "panel-plugins" - elif section == "inputmethods": return "inputmethods" - elif section == "daemons": return "daemons" - elif section == "misc": return "misc" - else: return section - -LICENSE = "${@openmoko_two_get_license(d)}" -SUBDIR = "${@openmoko_two_get_subdir(d)}" - -SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http" -S = "${WORKDIR}/${PN}" - -FILES_${PN} += "${datadir}/icons" - -SVNREV = "r${SRCREV}" -#SVNREV = "${SRCDATE}"
meta/classes/srec.bbclass deleted +0 -28
@@ -1,28 +0,0 @@ -# -# Creates .srec files from images. -# -# Useful for loading with Yamon. - -# Define SREC_VMAADDR in your machine.conf. - -SREC_CMD = "${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma ${SREC_VMAADDR} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type}.srec" - -# Do not build srec files for these types of images: -SREC_SKIP = "tar" - -do_srec[nostamp] = "1" - -do_srec () { - if [ ${SREC_VMAADDR} = "" ] ; then - bbfatal Cannot do_srec without SREC_VMAADDR defined. - fi - for type in ${IMAGE_FSTYPES}; do - for skiptype in ${SREC_SKIP}; do - if [ $type = $skiptype ] ; then continue 2 ; fi - done - ${SREC_CMD} - done - return 0 -} - -addtask srec after do_rootfs before do_build
meta/classes/xfce.bbclass deleted +0 -25
@@ -1,25 +0,0 @@ -# xfce.oeclass -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -# Global class to make it easier to maintain XFCE packages - -HOMEPAGE = "http://www.xfce.org" -LICENSE = "LGPLv2" -DEPENDS += "startup-notification" - -XFCE_VERSION = ${PV} -SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${BPN}-${PV}.tar.bz2" - -inherit autotools - -EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" - -# FIXME: Put icons in their own package too? - -FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" -FILES_${PN}-doc += "${datadir}/xfce4/doc" - -FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" -FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" -
Signature · 1 line
1.7.4.1
Re: [PATCH 3/3] classes: remove classes that don't belong in oe-core
Op 15 jul 2011, om 15:17 heeft Paul Eggleton het volgende geschreven:
Quoted 7 lines
These classes are not used within oe-core and really belong in an upper layer that makes use of them, if they are still useful:
* mozilla.bbclass
* openmoko*.bbclass
* srec.bbclass
* xfce.bbclass
I'll take patches to add those to meta-xfce and meta-oe if people are interested
Re: [PATCH 3/3] classes: remove classes that don't belong in oe-core
Quoted 1 line · On Friday 15 July 2011 15:52:04 Koen Kooi wrote:
meta-xfce
Is there such a thing at the moment? Or are you just saying it could be created?
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [PATCH 3/3] classes: remove classes that don't belong in oe-core
In reply to Koen KooiQuoted 11 lines · Koen Kooi
Op 15 jul 2011, om 15:17 heeft Paul Eggleton het volgende geschreven:
Quoted 7 lines
These classes are not used within oe-core and really belong in an upper layer that makes use of them, if they are still useful:
* mozilla.bbclass
* openmoko*.bbclass
* srec.bbclass
* xfce.bbclassI'll take patches to add those to meta-xfce and meta-oe if people are interested
Regarding xfce I am interested (working on it currently - anybody else too?). But I would like to have a cleaned up version so for me it is not a problem to delete xfce.bbclass.
For xfce I started to put the meta-data in meta-openembedded/meta-xfce. Is that OK?
Andreas
Re: [PATCH 3/3] classes: remove classes that don't belong in oe-core
In reply to Paul EggletonOp 15 jul 2011, om 17:20 heeft Paul Eggleton het volgende geschreven:
Quoted 4 lines · On Friday 15 July 2011 15:52:04 Koen Kooi wrote:
Quoted 1 line
meta-xfce
Is there such a thing at the moment?
Apparently only in my local meta-oe tree :/ I'll delete it and want for Andreas to send his patches.
Quoted 33 lines · Paul Eggleton
This set includes the removal of classes as previously discussed (briefly) on the oe-core mailing list, as well as a minor whitespace fix for kernel.bbclass.
The following changes since commit
b975de5ea76c5f8827fb48c0c3c29902872ad3d6:bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:22:59 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribpaule/classes-cleanup
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/classes-cleanupPaul Eggleton (3):
kernel.bbclass: minor whitespace fixes
classes: remove obsolete classes
classes: remove classes that don't belong in oe-coremeta/classes/base_srpm.bbclass | 20 ------- meta/classes/ccdv.bbclass | 21 -------- meta/classes/flow-lossage.bbclass | 5 -- meta/classes/kernel.bbclass | 4 +- meta/classes/mozilla.bbclass | 53 ------------------- meta/classes/openmoko-base.bbclass | 19 ------- meta/classes/openmoko-panel-plugin.bbclass | 6 -- meta/classes/openmoko.bbclass | 3 - meta/classes/openmoko2.bbclass | 31 ----------- meta/classes/patcher.bbclass | 7 --- meta/classes/singlemachine.bbclass | 15 ----- meta/classes/srec.bbclass | 28 ---------- meta/classes/tmake.bbclass | 77 ---------------------------- meta/classes/xfce.bbclass | 25 --------- meta/classes/xlibs.bbclass | 7 --- 15 files changed, 2 insertions(+), 319 deletions(-)
Quoted 15 lines
delete mode 100644 meta/classes/base_srpm.bbclass delete mode 100644 meta/classes/ccdv.bbclass
delete mode 100644 meta/classes/flow-lossage.bbclass delete mode 100644 meta/classes/mozilla.bbclass delete mode 100644 meta/classes/openmoko-base.bbclass delete mode 100644 meta/classes/openmoko-panel-plugin.bbclass delete mode 100644 meta/classes/openmoko.bbclass delete mode 100644 meta/classes/openmoko2.bbclass delete mode 100644 meta/classes/patcher.bbclass delete mode 100644 meta/classes/singlemachine.bbclass delete mode 100644 meta/classes/srec.bbclass
delete mode 100644 meta/classes/tmake.bbclass delete mode 100644 meta/classes/xfce.bbclass
delete mode 100644 meta/classes/xlibs.bbclass
This set has been merged into OE-Core
Thanks
Sau!