From 59feb2d71f1da6ef8e8d0838b382569b631d0c5e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 12 Feb 2007 13:16:19 +0000 Subject: siteinfo.bbclass: add support for oldstyle powerpc hosts --- classes/siteinfo.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5d6d5649c7..80e6e32af7 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -40,7 +40,8 @@ def get_siteinfo_list(d): "mipsel-linux": "endian-little bit-32 common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "powerpc-linux": "endian-big bit-32 common-glibc",\ + "ppc-linux": "endian-big bit-32 common-glibc",\ + "powerpc-linux": "endian-big bit-32 common-glibc",\ "powerpc-linux-uclibc": "endian-big bit-32 common-uclibc",\ "sh3-linux": "endian-little bit-32 common-glibc sh-common",\ "sh4-linux": "endian-little bit-32 common-glibc sh-common",\ -- cgit v1.2.3 From 8dc182e9960996f5010edcc598fbfaa8a12faceb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 14 Feb 2007 00:42:44 +0000 Subject: kernel.bbclass: Remove PARALLEL_INSTALL_MODULES. If we want to do this we should rethink and have something that works for multiple kernel versions generically not just a 2.4/2.6 split. There are certainly better ways to do it than this. --- classes/kernel.bbclass | 36 ------------------------------------ classes/linux-kernel-base.bbclass | 4 ---- classes/module.bbclass | 17 ----------------- 3 files changed, 57 deletions(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 21f441e3d0..2434ca1f0a 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -307,10 +307,6 @@ python populate_packages_prepend () { continue on = legitimize_package_name(m.group(1)) dependency_pkg = format % on - v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" - if v == "1": - kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) - dependency_pkg = "%s-%s" % (dependency_pkg, kv) dependencies.append(dependency_pkg) return dependencies return [] @@ -386,36 +382,4 @@ python populate_packages_prepend () { bb.data.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package', d) packages.append(metapkg) bb.data.setVar('PACKAGES', ' '.join(packages), d) - - v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" - if v == "1": - kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) - packages = bb.data.getVar("PACKAGES", d, 1).split() - module_re = re.compile("^kernel-module-") - - newmetapkg = "kernel-modules-%s" % kv - bb.data.setVar('ALLOW_EMPTY_' + newmetapkg, "1", d) - bb.data.setVar('FILES_' + newmetapkg, "", d) - - newmetapkg_rdepends = [] - - for p in packages: - if not module_re.match(p): - continue - pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p - newpkg = "%s-%s" % (pkg, kv) - bb.data.setVar("PKG_%s" % p, newpkg, d) - rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1) - if rprovides: - rprovides = "%s %s" % (rprovides, pkg) - else: - rprovides = pkg - bb.data.setVar("RPROVIDES_%s" % p, rprovides, d) - newmetapkg_rdepends.append(newpkg) - - bb.data.setVar('RDEPENDS_' + newmetapkg, ' '.join(newmetapkg_rdepends), d) - bb.data.setVar('DESCRIPTION_' + newmetapkg, 'Kernel modules meta package', d) - packages.append(newmetapkg) - bb.data.setVar('PACKAGES', ' '.join(packages), d) - } diff --git a/classes/linux-kernel-base.bbclass b/classes/linux-kernel-base.bbclass index e58c228080..4e2e2da373 100644 --- a/classes/linux-kernel-base.bbclass +++ b/classes/linux-kernel-base.bbclass @@ -32,10 +32,6 @@ def get_kernelmajorversion(p): def linux_module_packages(s, d): import bb, os.path suffix = "" - if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"): - file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d) - if (os.path.exists(file)): - suffix = "-%s" % (get_kernelmajorversion(base_read_file(file))) return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) # that's all diff --git a/classes/module.bbclass b/classes/module.bbclass index 6089f90462..7eac001ec4 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -3,23 +3,6 @@ DEPENDS += "virtual/kernel" inherit module-base -python populate_packages_prepend() { - v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" - if v == "1": - kv = bb.data.getVar("KERNEL_VERSION", d, 1) - packages = bb.data.getVar("PACKAGES", d, 1) - for p in packages.split(): - pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p - newpkg = "%s-%s" % (pkg, kv) - bb.data.setVar("PKG_%s" % p, newpkg, d) - rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1) - if rprovides: - rprovides = "%s %s" % (rprovides, pkg) - else: - rprovides = pkg - bb.data.setVar("RPROVIDES_%s" % p, rprovides, d) -} - module_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ -- cgit v1.2.3 From 7f6c2cb77774eda984c1ec8517bd56e04a62239e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 14 Feb 2007 17:06:09 +0000 Subject: openmoko*.bbclass: add classes from openmoko svn * I'm not sure if I like distro revisions in bbclasses --- classes/openmoko-base.bbclass | 19 +++++++++++++++++++ classes/openmoko-panel-plugin.bbclass | 6 ++++++ classes/openmoko.bbclass | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 classes/openmoko-base.bbclass create mode 100644 classes/openmoko-panel-plugin.bbclass create mode 100644 classes/openmoko.bbclass (limited to 'classes') diff --git a/classes/openmoko-base.bbclass b/classes/openmoko-base.bbclass new file mode 100644 index 0000000000..7a274b0d2c --- /dev/null +++ b/classes/openmoko-base.bbclass @@ -0,0 +1,19 @@ +HOMEPAGE = "http://www.openmoko.org" +LICENSE ?= "GPL" +OPENMOKO_RELEASE ?= "OM-2007" +OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" + +def openmoko_base_get_subdir(d): + import bb + 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" + else: return section + +SUBDIR = "${@openmoko_base_get_subdir(d)}" + +SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=https" +S = "${WORKDIR}/${PN}" + +FILES_${PN} += "${datadir}/icons" diff --git a/classes/openmoko-panel-plugin.bbclass b/classes/openmoko-panel-plugin.bbclass new file mode 100644 index 0000000000..0494b412c6 --- /dev/null +++ b/classes/openmoko-panel-plugin.bbclass @@ -0,0 +1,6 @@ +SECTION = "openmoko/panel-plugin" +DEPENDS += "matchbox-panel-2" + +inherit openmoko + +FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}" diff --git a/classes/openmoko.bbclass b/classes/openmoko.bbclass new file mode 100644 index 0000000000..808ab8fcb6 --- /dev/null +++ b/classes/openmoko.bbclass @@ -0,0 +1,3 @@ +inherit openmoko-base autotools pkgconfig + +DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}" -- cgit v1.2.3