diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-15 14:03:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-19 17:34:18 +0100 |
commit | d8a3cd563040e3df35f69cbebc9b0b14e5d12695 (patch) | |
tree | 8163cd1d8bebe74079d4d59b873cdf6a2294819a | |
parent | e6cf0ba96a2a3e23cd7a3474711ae154db8ee9c7 (diff) | |
download | poky-d8a3cd563040e3df35f69cbebc9b0b14e5d12695.tar.gz |
classes: remove classes that don't belong in oe-core
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
(From OE-Core rev: fa8779452de5e1a8ded92bdf4a952158fda6160a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/mozilla.bbclass | 53 | ||||
-rw-r--r-- | meta/classes/openmoko-base.bbclass | 19 | ||||
-rw-r--r-- | meta/classes/openmoko-panel-plugin.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/openmoko.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/openmoko2.bbclass | 31 | ||||
-rw-r--r-- | meta/classes/srec.bbclass | 28 | ||||
-rw-r--r-- | meta/classes/xfce.bbclass | 25 |
7 files changed, 0 insertions, 165 deletions
diff --git a/meta/classes/mozilla.bbclass b/meta/classes/mozilla.bbclass deleted file mode 100644 index d7ec747426..0000000000 --- a/meta/classes/mozilla.bbclass +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | SECTION = "x11/utils" | ||
2 | DEPENDS += "gnu-config-native virtual/libintl xt libxi \ | ||
3 | zip-native gtk+" | ||
4 | LICENSE = "MPL NPL" | ||
5 | SRC_URI += "file://mozconfig" | ||
6 | |||
7 | inherit gettext pkgconfig | ||
8 | |||
9 | EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \ | ||
10 | --build=${BUILD_SYS} --prefix=${prefix}" | ||
11 | EXTRA_OEMAKE = "'HOST_LIBIDL_LIBS=${HOST_LIBIDL_LIBS}' \ | ||
12 | 'HOST_LIBIDL_CFLAGS=${HOST_LIBIDL_CFLAGS}'" | ||
13 | SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing" | ||
14 | |||
15 | export CROSS_COMPILE = "1" | ||
16 | export MOZCONFIG = "${WORKDIR}/mozconfig" | ||
17 | export MOZ_OBJDIR = "${S}" | ||
18 | |||
19 | export CONFIGURE_ARGS = "${EXTRA_OECONF}" | ||
20 | export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`" | ||
21 | export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`" | ||
22 | export HOST_LIBIDL_CONFIG = "PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" | ||
23 | export HOST_CC = "${BUILD_CC}" | ||
24 | export HOST_CXX = "${BUILD_CXX}" | ||
25 | export HOST_CFLAGS = "${BUILD_CFLAGS}" | ||
26 | export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" | ||
27 | export HOST_LDFLAGS = "${BUILD_LDFLAGS}" | ||
28 | export HOST_RANLIB = "${BUILD_RANLIB}" | ||
29 | export HOST_AR = "${BUILD_AR}" | ||
30 | |||
31 | mozilla_do_configure() { | ||
32 | ( | ||
33 | set -e | ||
34 | for cg in `find ${S} -name config.guess`; do | ||
35 | install -m 0755 \ | ||
36 | ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess \ | ||
37 | ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub \ | ||
38 | `dirname $cg`/ | ||
39 | done | ||
40 | ) | ||
41 | oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ | ||
42 | ${MOZ_OBJDIR}/config.status | ||
43 | } | ||
44 | |||
45 | mozilla_do_compile() { | ||
46 | oe_runmake -f client.mk build_all | ||
47 | } | ||
48 | |||
49 | mozilla_do_install() { | ||
50 | oe_runmake DESTDIR="${D}" destdir="${D}" install | ||
51 | } | ||
52 | |||
53 | EXPORT_FUNCTIONS do_configure do_compile do_install | ||
diff --git a/meta/classes/openmoko-base.bbclass b/meta/classes/openmoko-base.bbclass deleted file mode 100644 index b8b41197a9..0000000000 --- a/meta/classes/openmoko-base.bbclass +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | HOMEPAGE = "http://www.openmoko.org" | ||
2 | LICENSE ?= "GPL" | ||
3 | OPENMOKO_RELEASE ?= "OM-2007" | ||
4 | OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" | ||
5 | |||
6 | def openmoko_base_get_subdir(d): | ||
7 | openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") | ||
8 | if section == 'base' or section == 'libs': return "" | ||
9 | elif section in 'apps tools pim'.split(): return "applications" | ||
10 | elif section == "panel-plugin": return "panel-plugins" | ||
11 | elif section == "inputmethods": return "inputmethods" | ||
12 | else: return section | ||
13 | |||
14 | SUBDIR = "${@openmoko_base_get_subdir(d)}" | ||
15 | |||
16 | SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http" | ||
17 | S = "${WORKDIR}/${PN}" | ||
18 | |||
19 | FILES_${PN} += "${datadir}/icons" | ||
diff --git a/meta/classes/openmoko-panel-plugin.bbclass b/meta/classes/openmoko-panel-plugin.bbclass deleted file mode 100644 index 6a22a92ac8..0000000000 --- a/meta/classes/openmoko-panel-plugin.bbclass +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | SECTION = "openmoko/panel-plugin" | ||
2 | DEPENDS += "matchbox-panel-2 libmokopanelui2" | ||
3 | |||
4 | inherit openmoko2 | ||
5 | |||
6 | FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}" | ||
diff --git a/meta/classes/openmoko.bbclass b/meta/classes/openmoko.bbclass deleted file mode 100644 index 808ab8fcb6..0000000000 --- a/meta/classes/openmoko.bbclass +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | inherit openmoko-base autotools pkgconfig | ||
2 | |||
3 | DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}" | ||
diff --git a/meta/classes/openmoko2.bbclass b/meta/classes/openmoko2.bbclass deleted file mode 100644 index 2d9f71a5e2..0000000000 --- a/meta/classes/openmoko2.bbclass +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | inherit autotools pkgconfig | ||
2 | |||
3 | HOMEPAGE = "http://www.openmoko.org" | ||
4 | OPENMOKO_RELEASE ?= "OM-2007.2" | ||
5 | OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" | ||
6 | |||
7 | def openmoko_two_get_license(d): | ||
8 | openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") | ||
9 | return "LGPL GPL".split()[section != "libs"] | ||
10 | |||
11 | def openmoko_two_get_subdir(d): | ||
12 | openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") | ||
13 | if section == 'base': return "" | ||
14 | elif section == 'libs': return "libraries" | ||
15 | elif section in 'apps tools pim'.split(): return "applications" | ||
16 | elif section == "panel-plugin": return "panel-plugins" | ||
17 | elif section == "inputmethods": return "inputmethods" | ||
18 | elif section == "daemons": return "daemons" | ||
19 | elif section == "misc": return "misc" | ||
20 | else: return section | ||
21 | |||
22 | LICENSE = "${@openmoko_two_get_license(d)}" | ||
23 | SUBDIR = "${@openmoko_two_get_subdir(d)}" | ||
24 | |||
25 | SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http" | ||
26 | S = "${WORKDIR}/${PN}" | ||
27 | |||
28 | FILES_${PN} += "${datadir}/icons" | ||
29 | |||
30 | SVNREV = "r${SRCREV}" | ||
31 | #SVNREV = "${SRCDATE}" | ||
diff --git a/meta/classes/srec.bbclass b/meta/classes/srec.bbclass deleted file mode 100644 index 390d5abb3a..0000000000 --- a/meta/classes/srec.bbclass +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # | ||
2 | # Creates .srec files from images. | ||
3 | # | ||
4 | # Useful for loading with Yamon. | ||
5 | |||
6 | # Define SREC_VMAADDR in your machine.conf. | ||
7 | |||
8 | 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" | ||
9 | |||
10 | # Do not build srec files for these types of images: | ||
11 | SREC_SKIP = "tar" | ||
12 | |||
13 | do_srec[nostamp] = "1" | ||
14 | |||
15 | do_srec () { | ||
16 | if [ ${SREC_VMAADDR} = "" ] ; then | ||
17 | bbfatal Cannot do_srec without SREC_VMAADDR defined. | ||
18 | fi | ||
19 | for type in ${IMAGE_FSTYPES}; do | ||
20 | for skiptype in ${SREC_SKIP}; do | ||
21 | if [ $type = $skiptype ] ; then continue 2 ; fi | ||
22 | done | ||
23 | ${SREC_CMD} | ||
24 | done | ||
25 | return 0 | ||
26 | } | ||
27 | |||
28 | addtask srec after do_rootfs before do_build | ||
diff --git a/meta/classes/xfce.bbclass b/meta/classes/xfce.bbclass deleted file mode 100644 index d21bb42d46..0000000000 --- a/meta/classes/xfce.bbclass +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # xfce.oeclass | ||
2 | # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved | ||
3 | # Released under the MIT license (see packages/COPYING) | ||
4 | |||
5 | # Global class to make it easier to maintain XFCE packages | ||
6 | |||
7 | HOMEPAGE = "http://www.xfce.org" | ||
8 | LICENSE = "LGPLv2" | ||
9 | DEPENDS += "startup-notification" | ||
10 | |||
11 | XFCE_VERSION = ${PV} | ||
12 | SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${BPN}-${PV}.tar.bz2" | ||
13 | |||
14 | inherit autotools | ||
15 | |||
16 | EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" | ||
17 | |||
18 | # FIXME: Put icons in their own package too? | ||
19 | |||
20 | FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" | ||
21 | FILES_${PN}-doc += "${datadir}/xfce4/doc" | ||
22 | |||
23 | FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" | ||
24 | FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" | ||
25 | |||