diff options
69 files changed, 1345 insertions, 254 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 4196135710..062f782129 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -5,6 +5,12 @@ PKGD = "${WORKDIR}/package" PKGDEST = "${WORKDIR}/packages-split" +PKGV ?= "${PV}" +PKGR ?= "${PR}${DISTRO_PR}" + +EXTENDPKGEVER = "${@['','${PKGE\x7d:'][bb.data.getVar('PKGE',d,1) > 0]}" +EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" + def legitimize_package_name(s): """ Make sure package names are legitimate strings @@ -489,7 +495,7 @@ python populate_packages () { for pkg in package_list: rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - remstr = "${PN} (= ${EXTENDPV})" + remstr = "${PN} (= ${EXTENDPKGV})" if main_is_empty and remstr in rdepends: rdepends.remove(remstr) for l in dangling_links[pkg]: @@ -551,6 +557,8 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'PN') write_if_exists(sf, pkg, 'PV') write_if_exists(sf, pkg, 'PR') + write_if_exists(sf, pkg, 'PKGV') + write_if_exists(sf, pkg, 'PKGR') write_if_exists(sf, pkg, 'DESCRIPTION') write_if_exists(sf, pkg, 'RDEPENDS') write_if_exists(sf, pkg, 'RPROVIDES') @@ -611,9 +619,9 @@ python package_do_shlibs() { workdir = bb.data.getVar('WORKDIR', d, True) - ver = bb.data.getVar('PV', d, True) + ver = bb.data.getVar('PKGV', d, True) if not ver: - bb.error("PV not defined") + bb.error("PKGV not defined") return pkgdest = bb.data.getVar('PKGDEST', d, True) @@ -641,7 +649,9 @@ python package_do_shlibs() { needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) - pkgver = bb.data.getVar('PV_' + pkg, d, True) + pkgver = bb.data.getVar('PKGV_' + pkg, d, True) + if not pkgver: + pkgver = bb.data.getVar('PV_' + pkg, d, True) if not pkgver: pkgver = ver diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 3582195393..420c892f10 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -208,9 +208,9 @@ python do_package_ipk () { fields = [] pe = bb.data.getVar('PE', d, 1) if pe and int(pe) > 0: - fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']]) + fields.append(["Version: %s:%s-%s\n", ['PE', 'PKGV', 'PKGR']]) else: - fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']]) + fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) diff --git a/conf/checksums.ini b/conf/checksums.ini index 1cd45c9d1b..3bf98541fe 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6534,6 +6534,10 @@ sha256=14fbf10de1fc3b58cfeb00bcfebf54e0182cc7cc346c4bbc90248cfc61add462 md5=987956757c3707ba0e62ce2cd133011b sha256=7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3 +[http://downloads.sourceforge.net/eyeos/eyeOS_1.8.7.1.zip] +md5=020b1ffd9edc3fe7af25b0d6cca430ae +sha256=660cd2de4fbd511b767839cb5caa734ebfa9cc5935aa58604f764d7e295768d4 + [http://www.ez-ipupdate.com/dist/ez-ipupdate-3.0.10.tar.gz] md5=6505c9d18ef6b5ce13fe2a668eb5724b sha256=f7ff9bf972139b303616018a6937aa4c6df4e93c935ffd004b30845e2ad41ea6 @@ -7894,6 +7898,10 @@ sha256=fa1b97a6d9d2f7d7699f6b0ccd433ab132c7d10835b449ed14b12b48e7749aad md5=d133e77f625c496ae9d58629d7443596 sha256=b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f +[http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch] +md5=d7ec27a9b44eed194426038640af5460 +sha256=70e8e8230390fb355d62270764f18f6b553bcb9383ddabfbed4a1238b0e79b80 + [http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch] md5=230b98276779339a4102abdb1c36197a sha256=866d1e45a575f448148c227f60cde4c8b607c51f179da3a7ec1acb5036b8e3ec @@ -12418,6 +12426,10 @@ sha256=76167e10c30d60534dc2b04fa4e202e16531df8170fc23cc4414d9afff09c32a md5=828a84c64ef933bfcc805b838576a774 sha256=8ba0eda3157193643eb3c5ccd46c0ca8060d702f260df60f89656cb891cbeeb8 +[ftp://ftp.cac.washington.edu/imap/imap-2007b.tar.Z] +md5=4d59ce6303cf8ef93ff51341b1ce2df7 +sha256=b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0 + [http://downloads.sourceforge.net/imdbpy/imdbpy-2.5.tar.gz] md5=dbbb53f835fd3f7aebcf7601dd902920 sha256=edaad2859a4f0785a34c3c0bb5a1e09d8f16efa3c0e4616f6a5a6cf18c282aa6 @@ -22030,6 +22042,10 @@ sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4 md5=6617a6681f4e5e3d8ddc48955d73d7ab sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4 +[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20090925.orig.tar.gz] +md5=ed90412ad4ee7f5b5e8fff3d6649e49b +sha256=2110261aedd8423fa3f1dba5ecb08bd61beb708883f82753b09835076cba2e36 + [http://www.red-bean.com/~proski/firmware/primary.tar.bz2] md5=0c7c82264602ee2b7ad832d5cd1e1940 sha256=3b5bd68653ff5054586f9fad7ad729bd2d551e76949aec2d14b8a89308393a36 @@ -26882,6 +26898,10 @@ sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c md5=64c54d43787339a7cced48390eb3e1d0 sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c +[http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch] +md5=e0b42e51630e9cd7e3b0adf1be42f4a1 +sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571 + [http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch] md5=e0b42e51630e9cd7e3b0adf1be42f4a1 sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571 diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb index b7a04ca03a..039417c626 100644 --- a/recipes/clutter/clutter-0.9_git.bb +++ b/recipes/clutter/clutter-0.9_git.bb @@ -3,7 +3,7 @@ require clutter.inc SRCREV = "13e055a351f83c56b895b131566a6e842d24ed2a" PV = "1.1.0" -PR = "r0" +PR = "${INC_PR}.0" PR_append = "+git${SRCREV}" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \ diff --git a/recipes/clutter/clutter-glx_svn.bb b/recipes/clutter/clutter-glx_svn.bb index 8a2a1fa1ed..0590330412 100644 --- a/recipes/clutter/clutter-glx_svn.bb +++ b/recipes/clutter/clutter-glx_svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.3.1+svn${SRCDATE}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http" diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc index 55980eda02..a80d9b6f5a 100644 --- a/recipes/clutter/clutter.inc +++ b/recipes/clutter/clutter.inc @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" -DEPENDS = "${STDDEPENDS} mesa" +DEPENDS = "${STDDEPENDS} virtual/libgl" EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" @@ -37,6 +37,8 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " +INC_PR = "r1" + inherit autotools pkgconfig gtk-doc PACKAGES =+ "clutter-examples" diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb index faf7a8766f..121b96480f 100644 --- a/recipes/clutter/clutter_0.4svn.bb +++ b/recipes/clutter/clutter_0.4svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.4.0+svnr${SRCPV}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ file://enable_tests-0.4.patch;patch=1 " diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb index 15c87a52a1..21cafef85d 100644 --- a/recipes/clutter/clutter_0.6svn.bb +++ b/recipes/clutter/clutter_0.6svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.6.0+svnr${SRCPV}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ file://enable_tests-0.6.patch;patch=1 " diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb index e31e250431..391e5fea35 100644 --- a/recipes/clutter/clutter_0.8+git.bb +++ b/recipes/clutter/clutter_0.8+git.bb @@ -3,6 +3,7 @@ require clutter.inc CLUTTER_REV = "af16378899699376fe7e84c7c11eb3bb5c4668cd" PV = "0.8.8" +PR = "${INC_PR}.0" PR_append = "+gitr${CLUTTER_REV}" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \ diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb index 55a434c583..d8d623c2fe 100644 --- a/recipes/clutter/clutter_svn.bb +++ b/recipes/clutter/clutter_svn.bb @@ -3,7 +3,7 @@ require clutter.inc DEFAULT_PREFERENCE = "-1" PV = "0.8.0+svnr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ file://enable_tests.patch;patch=1;maxrev=2989 \ diff --git a/recipes/eyeos/eyeos_1.8.7.1.bb b/recipes/eyeos/eyeos_1.8.7.1.bb new file mode 100644 index 0000000000..f4cd79eaf3 --- /dev/null +++ b/recipes/eyeos/eyeos_1.8.7.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The Open Source Clouds Web Desktop" +HOMEPAGE = "http://eyeos.org/" +LICENSE = "AGPL3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/eyeos/eyeOS_${PV}.zip" + +S = "${WORKDIR}/eyeOS" + +do_install() { + install -d ${D}/www/pages/eyeos + cp -r ${S}/* ${D}/www/pages/eyeos +} + +PACKAGE_ARCH = "all" +FILES_${PN} += "/www/pages/eyeos" + diff --git a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb index fbf5f61a39..f3434e16f9 100644 --- a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb +++ b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb @@ -4,14 +4,15 @@ HOMEPAGE = "http://www.ez-ipupdate.com/" SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r1" -SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz" -SRC_URI += "file://configure.patch;patch=1" -SRC_URI += "file://conffile.patch;patch=1" -SRC_URI += "file://zoneedit.patch;patch=1" -SRC_URI += "file://init" -SRC_URI += "file://ipupdate.conf" +SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://conffile.patch;patch=1 \ + file://zoneedit.patch;patch=1 \ + file://init \ + file://ipupdate.conf \ + " INITSCRIPT_NAME = "ipupdate" # No dependencies, so just go in at the standard level (20) @@ -22,8 +23,6 @@ CONFFILES_${PN} = "${sysconfdir}/ipupdate.conf" inherit autotools update-rc.d -PACKAGES += "ez-ipupdate" - do_install_append() { install -d "${D}${sysconfdir}/init.d" install -c -m 755 ${WORKDIR}/init "${D}${sysconfdir}/init.d/ipupdate" diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb index ae7c0e1c95..d9c8c00a14 100644 --- a/recipes/fltk/fltk_1.1.4.bb +++ b/recipes/fltk/fltk_1.1.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.fltk.org" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "jpeg libpng mesa zlib" -PR = "r1" +DEPENDS = "jpeg libpng virtual/libgl zlib" +PR = "r2" SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz" diff --git a/recipes/glew/libglew_1.5.1.bb b/recipes/glew/libglew_1.5.1.bb index ed0b69c28b..23257b552a 100644 --- a/recipes/glew/libglew_1.5.1.bb +++ b/recipes/glew/libglew_1.5.1.bb @@ -2,9 +2,9 @@ DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform SECTION = "libs" LICENSE = "Modified BSD License, Mesa 3-D License, Khronos License" -DEPENDS = "virtual/libx11 mesa libxext libxi libxmu" +DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/1.5.1/glew-1.5.1-src.tgz \ diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot-2.6.32/ARM-Add-support-for-LZMA-compressed-kernel-images.patch new file mode 100644 index 0000000000..3344ea6439 --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/ARM-Add-support-for-LZMA-compressed-kernel-images.patch @@ -0,0 +1,51 @@ +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 350921d..34163da 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -20,6 +20,7 @@ config ARM + select HAVE_GENERIC_DMA_COHERENT + select HAVE_KERNEL_GZIP + select HAVE_KERNEL_LZO ++ select HAVE_KERNEL_LZMA + help + The ARM series is a line of low-power-consumption RISC chip designs + licensed by ARM Ltd and targeted at embedded applications and +diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile +index 2d4d88b..3906432 100644 +--- a/arch/arm/boot/compressed/Makefile ++++ b/arch/arm/boot/compressed/Makefile +@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ + + suffix_$(CONFIG_KERNEL_GZIP) = gzip + suffix_$(CONFIG_KERNEL_LZO) = lzo ++suffix_$(CONFIG_KERNEL_LZMA) = lzma + + targets := vmlinux vmlinux.lds \ + piggy.$(suffix_y) piggy.$(suffix_y).o \ +diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c +index 7e0fe4d..4e35a10 100644 +--- a/arch/arm/boot/compressed/misc.c ++++ b/arch/arm/boot/compressed/misc.c +@@ -237,6 +237,10 @@ static unsigned long free_mem_end_ptr; + #include "../../../../lib/decompress_inflate.c" + #endif + ++#ifdef CONFIG_KERNEL_LZMA ++#include "../../../../lib/decompress_unlzma.c" ++#endif ++ + #ifdef CONFIG_KERNEL_LZO + #include "../../../../lib/decompress_unlzo.c" + #endif +diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S +new file mode 100644 +index 0000000..d7e69cf +--- /dev/null ++++ b/arch/arm/boot/compressed/piggy.lzma.S +@@ -0,0 +1,6 @@ ++ .section .piggydata,#alloc ++ .globl input_data ++input_data: ++ .incbin "arch/arm/boot/compressed/piggy.lzma" ++ .globl input_data_end ++input_data_end: diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/v3-1-4-Add-support-for-LZO-compressed-kernels.patch b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-1-4-Add-support-for-LZO-compressed-kernels.patch new file mode 100644 index 0000000000..fad1b87466 --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-1-4-Add-support-for-LZO-compressed-kernels.patch @@ -0,0 +1,321 @@ +diff --git a/include/linux/decompress/unlzo.h b/include/linux/decompress/unlzo.h +new file mode 100644 +index 0000000..9872297 +--- /dev/null ++++ b/include/linux/decompress/unlzo.h +@@ -0,0 +1,10 @@ ++#ifndef DECOMPRESS_UNLZO_H ++#define DECOMPRESS_UNLZO_H ++ ++int unlzo(unsigned char *inbuf, int len, ++ int(*fill)(void*, unsigned int), ++ int(*flush)(void*, unsigned int), ++ unsigned char *output, ++ int *pos, ++ void(*error)(char *x)); ++#endif +diff --git a/init/Kconfig b/init/Kconfig +index f515864..eb65318 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2 + config HAVE_KERNEL_LZMA + bool + ++config HAVE_KERNEL_LZO ++ bool ++ + choice + prompt "Kernel compression mode" + default KERNEL_GZIP +- depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA ++ depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO + help + The linux kernel is a kind of self-extracting executable. + Several compression algorithms are available, which differ +@@ -141,9 +144,8 @@ config KERNEL_GZIP + bool "Gzip" + depends on HAVE_KERNEL_GZIP + help +- The old and tried gzip compression. Its compression ratio is +- the poorest among the 3 choices; however its speed (both +- compression and decompression) is the fastest. ++ The old and tried gzip compression. It provides a good balance ++ between compression ratio and decompression speed. + + config KERNEL_BZIP2 + bool "Bzip2" +@@ -164,6 +166,14 @@ config KERNEL_LZMA + two. Compression is slowest. The kernel size is about 33% + smaller with LZMA in comparison to gzip. + ++config KERNEL_LZO ++ bool "LZO" ++ depends on HAVE_KERNEL_LZO ++ help ++ Its compression ratio is the poorest among the 4. The kernel ++ size is about about 10% bigger than gzip; however its speed ++ (both compression and decompression) is the fastest. ++ + endchoice + + config SWAP +diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c +new file mode 100644 +index 0000000..2bb736f +--- /dev/null ++++ b/lib/decompress_unlzo.c +@@ -0,0 +1,208 @@ ++/* ++ * LZO decompressor for the Linux kernel. Code borrowed from the lzo ++ * implementation by Markus Franz Xaver Johannes Oberhumer. ++ * ++ * Linux kernel adaptation: ++ * Copyright (C) 2009 ++ * Albin Tonnerre, Free Electrons <albin.tonnerre@free-electrons.com> ++ * ++ * Original code: ++ * Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer ++ * All Rights Reserved. ++ * ++ * lzop and the LZO library are free software; you can redistribute them ++ * and/or modify them under the terms of the GNU General Public License as |