diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 2 | ||||
| -rw-r--r-- | classes/dsmg600-image.bbclass | 19 | ||||
| -rw-r--r-- | classes/insane.bbclass | 20 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 36 | ||||
| -rw-r--r-- | classes/linux-kernel-base.bbclass | 4 | ||||
| -rw-r--r-- | classes/module.bbclass | 17 | ||||
| -rw-r--r-- | classes/nas100d-image.bbclass | 19 | ||||
| -rw-r--r-- | classes/nslu2-image.bbclass | 20 | ||||
| -rw-r--r-- | classes/nslu2-jffs2-image.bbclass | 18 | ||||
| -rw-r--r-- | classes/nslu2-ramdisk-image.bbclass | 18 | ||||
| -rw-r--r-- | classes/openmoko-base.bbclass | 19 | ||||
| -rw-r--r-- | classes/openmoko-panel-plugin.bbclass | 6 | ||||
| -rw-r--r-- | classes/openmoko.bbclass | 3 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 3 |
14 files changed, 105 insertions, 99 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 927e3432b7..33546e0eb6 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -115,7 +115,7 @@ autotools_do_configure() { echo "no" | glib-gettextize --force --copy fi fi - if grep "^AC_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then + if grep "^[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then oenote Executing intltoolize --copy --force --automake intltoolize --copy --force --automake fi diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass new file mode 100644 index 0000000000..6920fe5dbd --- /dev/null +++ b/classes/dsmg600-image.bbclass @@ -0,0 +1,19 @@ +dsmg600_pack_image () { + install -d ${DEPLOY_DIR_IMAGE}/firmupgrade + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz + touch ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + chmod 0644 ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + echo "hwid=1.0.1" >${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "model=dsm-g600" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "vendor=dlink" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + chmod 0744 ${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + tar -c -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dsmg600.bin \ + -C ${DEPLOY_DIR_IMAGE} firmupgrade + rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade +} + +IMAGE_POSTPROCESS_COMMAND += "dsmg600_pack_image; " diff --git a/classes/insane.bbclass b/classes/insane.bbclass index e30375288d..b091742ad0 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -9,6 +9,7 @@ # -Check if .la files wrongly point to workdir # -Check if .pc files wrongly point to workdir # -Check if packages contains .debug directories or .so files where they should be in -dev or -dbg +# -Check if config.log contains traces to broken autoconf tests # @@ -33,12 +34,12 @@ def package_qa_check_rpath(file,name,d): if not os.path.exists(scanelf): bb.note("Can not check RPATH scanelf not found") if not bad_dir in bb.data.getVar('WORKDIR', d, True): - bb.error("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") + bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") output = os.popen("%s -Byr %s" % (scanelf,file)) txt = output.readline().rsplit() if bad_dir in txt: - bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) + bb.fatal("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) pass @@ -55,7 +56,7 @@ def package_qa_check_devdbg(path, name,d): if not "-dbg" in name: if '.debug' in path: - bb.error("QA Issue: non debug package contains .debug directory: %s" % name) + bb.fatal("QA Issue: non debug package contains .debug directory: %s" % name) def package_qa_check_perm(path,name,d): """ @@ -121,7 +122,7 @@ def package_qa_check_rdepends(pkg, workdir, d): # Now do the sanity check!!! for rdepend in rdepends: if "-dbg" in rdepend: - bb.error("QA issue, koen give us a better msg!!!") + bb.fatal("QA issue, koen give us a better msg!!!") # The PACKAGE FUNC to scan each package python do_package_qa () { @@ -149,3 +150,14 @@ python do_qa_staging() { package_qa_check_staged(bb.data.getVar('STAGING_DIR',d,True), d) } + +# Check broken config.log files +addtask qa_configure after do_configure before do_compile +python do_qa_configure() { + bb.note("Checking sanity of the config.log file") + import os + for root, dirs, files in os.walk(bb.data.getVar('S', d, True)): + if "config.log" in files: + if os.system("grep 'CROSS COMPILE Badness:' %s > /dev/null" % (os.path.join(root,"config.log"))) == 0: + bb.fatal("This autoconf log indicates errors, it looked at host includes") +} 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} \ diff --git a/classes/nas100d-image.bbclass b/classes/nas100d-image.bbclass new file mode 100644 index 0000000000..0d48ebd476 --- /dev/null +++ b/classes/nas100d-image.bbclass @@ -0,0 +1,19 @@ +nas100d_pack_image () { + install -d ${DEPLOY_DIR_IMAGE}/firmupgrade + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz + touch ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + chmod 0644 ${DEPLOY_DIR_IMAGE}/firmupgrade/usr.cramfs + echo "hwid=1.0.1" >${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "model=koala" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "vendor=iomega" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + echo "" >>${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + chmod 0744 ${DEPLOY_DIR_IMAGE}/firmupgrade/version.msg + tar -c -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nas100d.bin \ + -C ${DEPLOY_DIR_IMAGE} firmupgrade + rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade +} + +IMAGE_POSTPROCESS_COMMAND += "nas100d_pack_image; " diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass new file mode 100644 index 0000000000..e1af34fa57 --- /dev/null +++ b/classes/nslu2-image.bbclass @@ -0,0 +1,20 @@ +nslu2_pack_image () { + install -d ${DEPLOY_DIR_IMAGE}/slug + install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ + ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 + install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ + cd ${DEPLOY_DIR_IMAGE}/slug + slugimage -p -b RedBoot -s SysConf -k vmlinuz \ + -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + rm -rf ${DEPLOY_DIR_IMAGE}/slug +} + +EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' +IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/classes/nslu2-jffs2-image.bbclass b/classes/nslu2-jffs2-image.bbclass deleted file mode 100644 index 56ad0f0659..0000000000 --- a/classes/nslu2-jffs2-image.bbclass +++ /dev/null @@ -1,18 +0,0 @@ -NSLU2_SLUGIMAGE_ARGS ?= "" - -nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img ${NSLU2_SLUGIMAGE_ARGS} - rm -rf ${DEPLOY_DIR_IMAGE}/slug -} - -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/classes/nslu2-ramdisk-image.bbclass b/classes/nslu2-ramdisk-image.bbclass deleted file mode 100644 index 0b545854fd..0000000000 --- a/classes/nslu2-ramdisk-image.bbclass +++ /dev/null @@ -1,18 +0,0 @@ -NSLU2_SLUGIMAGE_ARGS ?= "" - -nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.ext2.gz - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:ramdisk.ext2.gz -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img ${NSLU2_SLUGIMAGE_ARGS} - rm -rf ${DEPLOY_DIR_IMAGE}/slug -} - -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/classes/openmoko-base.bbclass b/classes/openmoko-base.bbclass new file mode 100644 index 0000000000..35243c9752 --- /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=http" +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')]}" 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",\ |