diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
| commit | 3516e365b5f29fb1c09e4a7351e92b6ceb250d72 (patch) | |
| tree | 8910657328306284c36dd8ff1dec9d0d24700ffb | |
| parent | 2297bad128f73f878dc28a5c365c4d624e400058 (diff) | |
| parent | 4df23cb65d9d526f3a2dc5df13bddb0a14da1b0c (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
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 ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; see the file COPYING. ++ * If not, write to the Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Markus F.X.J. Oberhumer ++ * <markus@oberhumer.com> ++ * http://www.oberhumer.com/opensource/lzop/ ++ */ ++ ++#ifdef STATIC ++#include "lzo/lzo1x_decompress.c" ++#else ++#include <linux/slab.h> ++#include <linux/decompress/unlzo.h> ++#endif ++ ++#include <linux/types.h> ++#include <linux/lzo.h> ++#include <linux/decompress/mm.h> ++ ++#include <linux/compiler.h> ++#include <asm/unaligned.h> ++ ++static const unsigned char lzop_magic[] = ++ { 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a }; ++ ++#define LZO_BLOCK_SIZE (256*1024l) ++#define HEADER_HAS_FILTER 0x00000800L ++ ++STATIC inline int INIT parse_header(u8 *input, u8 *skip) ++{ ++ int l; ++ u8 *parse = input; ++ u8 level = 0; ++ u16 version; ++ ++ /* read magic: 9 first bits */ ++ for (l = 0; l < 9; l++) { ++ if (*parse++ != lzop_magic[l]) ++ return 0; ++ } ++ /* get version (2bytes), skip library version (2), ++ * 'need to be extracted' version (2) and ++ * method (1) */ ++ version = get_unaligned_be16(parse); ++ parse += 7; ++ if (version >= 0x0940) ++ level = *parse++; ++ if (get_unaligned_be32(parse) & HEADER_HAS_FILTER) ++ parse += 8; /* flags + filter info */ ++ else ++ parse += 4; /* flags */ ++ ++ /* skip mode and mtime_low */ ++ parse += 8; ++ if (version >= 0x0940) ++ parse += 4; /* skip mtime_high */ ++ ++ l = *parse++; ++ /* don't care about the file name, and skip checksum */ ++ parse += l + 4; ++ ++ *skip = parse - input; ++ return 1; ++} ++ ++STATIC inline int INIT unlzo(u8 *input, int in_len, ++ int (*fill) (void *, unsigned int), ++ int (*flush) (void *, unsigned int), ++ u8 *output, int *posp, ++ void (*error_fn) (char *x)) ++{ ++ u8 skip = 0, r = 0; ++ u32 src_len, dst_len; ++ size_t tmp; ++ u8 *in_buf, *in_buf_save, *out_buf; ++ int obytes_processed = 0; ++ ++ set_error_fn(error_fn); ++ ++ if (output) ++ out_buf = output; ++ else if (!flush) { ++ error("NULL output pointer and no flush function provided"); ++ goto exit; ++ } else { ++ out_buf = malloc(LZO_BLOCK_SIZE); ++ if (!out_buf) { ++ error("Could not allocate output buffer"); ++ goto exit; ++ } ++ } ++ ++ if (input && fill) { ++ error("Both input pointer and fill function provided, don't know what to do"); ++ goto exit_1; ++ } else if (input) ++ in_buf = input; ++ else if (!fill || !posp) { ++ error("NULL input pointer and missing position pointer or fill function"); ++ goto exit_1; ++ } else { ++ in_buf = malloc(lzo1x_worst_compress(LZO_BLOCK_SIZE)); ++ if (!in_buf) { ++ error("Could not allocate input buffer"); ++ goto exit_1; ++ } ++ } ++ in_buf_save = in_buf; ++ ++ if (posp) ++ *posp = 0; ++ ++ if (fill) ++ fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE)); ++ ++ if (!parse_header(input, &skip)) { ++ error("invalid header"); ++ goto exit_2; ++ } ++ in_buf += skip; ++ ++ if (posp) ++ *posp = skip; ++ ++ for (;;) { ++ /* read uncompressed block size */ ++ dst_len = get_unaligned_be32(in_buf); ++ in_buf += 4; ++ ++ /* exit if last block */ ++ if (dst_len == 0) { ++ if (posp) ++ *posp += 4; ++ break; ++ } ++ ++ if (dst_len > LZO_BLOCK_SIZE) { ++ error("dest len longer than block size"); ++ goto exit_2; ++ } ++ ++ /* read compressed block size, and skip block checksum info */ ++ src_len = get_unaligned_be32(in_buf); ++ in_buf += 8; ++ ++ if (src_len <= 0 || src_len > dst_len) { ++ error("file corrupted"); ++ goto exit_2; ++ } ++ ++ /* decompress */ ++ tmp = dst_len; ++ r = lzo1x_decompress_safe((u8 *) in_buf, src_len, out_buf, &tmp); ++ ++ if (r != LZO_E_OK || dst_len != tmp) { ++ error("Compressed data violation"); ++ goto exit_2; ++ } ++ ++ obytes_processed += dst_len; ++ if (flush) ++ flush(out_buf, dst_len); ++ if (output) ++ out_buf += dst_len; ++ if (posp) ++ *posp += src_len + 12; ++ if (fill) { ++ in_buf = in_buf_save; ++ fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE)); ++ } else ++ in_buf += src_len; ++ } ++ ++exit_2: ++ if (!input) ++ free(in_buf); ++exit_1: ++ if (!output) ++ free(out_buf); ++exit: ++ return obytes_processed; ++} ++ ++#define decompress unlzo +diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c +index 5dc6b29..f2fd098 100644 +--- a/lib/lzo/lzo1x_decompress.c ++++ b/lib/lzo/lzo1x_decompress.c +@@ -11,11 +11,13 @@ + * Richard Purdie <rpurdie@openedhand.com> + */ + ++#ifndef STATIC + #include <linux/module.h> + #include <linux/kernel.h> +-#include <linux/lzo.h> +-#include <asm/byteorder.h> ++#endif ++ + #include <asm/unaligned.h> ++#include <linux/lzo.h> + #include "lzodefs.h" + + #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x)) +@@ -244,9 +246,10 @@ lookbehind_overrun: + *out_len = op - out; + return LZO_E_LOOKBEHIND_OVERRUN; + } +- ++#ifndef STATIC + EXPORT_SYMBOL_GPL(lzo1x_decompress_safe); + + MODULE_LICENSE("GPL"); + MODULE_DESCRIPTION("LZO1X Decompressor"); + ++#endif +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index ffdafb2..39c3483 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -230,3 +230,8 @@ quiet_cmd_lzma = LZMA $@ + cmd_lzma = (cat $(filter-out FORCE,$^) | \ + lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) ++ ++quiet_cmd_lzo = LZO $@ ++cmd_lzo = (cat $(filter-out FORCE,$^) | \ ++ lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ ++ (rm -f $@ ; false) diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch new file mode 100644 index 0000000000..f155c0a1b5 --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch @@ -0,0 +1,298 @@ +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 1c4119c..350921d 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -18,6 +18,8 @@ config ARM + select HAVE_KRETPROBES if (HAVE_KPROBES) + select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) + select HAVE_GENERIC_DMA_COHERENT ++ select HAVE_KERNEL_GZIP ++ select HAVE_KERNEL_LZO + 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 ce39dc5..5b4629b 100644 +--- a/arch/arm/boot/compressed/Makefile ++++ b/arch/arm/boot/compressed/Makefile +@@ -63,8 +63,12 @@ endif + + SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ + +-targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ +- head.o misc.o $(OBJS) ++suffix_$(CONFIG_KERNEL_GZIP) = gzip ++suffix_$(CONFIG_KERNEL_LZO) = lzo ++ ++targets := vmlinux vmlinux.lds \ ++ piggy.$(suffix_y) piggy.$(suffix_y).o \ ++ font.o font.c head.o misc.o $(OBJS) + + ifeq ($(CONFIG_FUNCTION_TRACER),y) + ORIG_CFLAGS := $(KBUILD_CFLAGS) +@@ -87,22 +91,31 @@ endif + ifneq ($(PARAMS_PHYS),) + LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS) + endif +-LDFLAGS_vmlinux += -p --no-undefined -X \ +- $(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T ++# ? ++LDFLAGS_vmlinux += -p ++# Report unresolved symbol references ++LDFLAGS_vmlinux += --no-undefined ++# Delete all temporary local symbols ++LDFLAGS_vmlinux += -X ++# Next argument is a linker script ++LDFLAGS_vmlinux += -T ++ ++# For __aeabi_uidivmod ++lib1funcs = $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.o + + # Don't allow any static data in misc.o, which + # would otherwise mess up our GOT table + CFLAGS_misc.o := -Dstatic= + +-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \ +- $(addprefix $(obj)/, $(OBJS)) FORCE ++$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \ ++ $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE + $(call if_changed,ld) + @: + +-$(obj)/piggy.gz: $(obj)/../Image FORCE +- $(call if_changed,gzip) ++$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE ++ $(call if_changed,$(suffix_y)) + +-$(obj)/piggy.o: $(obj)/piggy.gz FORCE ++$(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y) FORCE + + CFLAGS_font.o := -Dstatic= + +diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c +index 17153b5..7e0fe4d 100644 +--- a/arch/arm/boot/compressed/misc.c ++++ b/arch/arm/boot/compressed/misc.c +@@ -18,10 +18,15 @@ + + unsigned int __machine_arch_type; + ++#define _LINUX_STRING_H_ ++ + #include <linux/compiler.h> /* for inline */ + #include <linux/types.h> /* for size_t */ + #include <linux/stddef.h> /* for NULL */ + #include <asm/string.h> ++#include <linux/linkage.h> ++ ++#include <asm/unaligned.h> + + #ifdef STANDALONE_DEBUG + #define putstr printf +@@ -188,34 +193,8 @@ static inline __ptr_t memcpy(__ptr_t __dest, __const __ptr_t __src, + /* + * gzip delarations + */ +-#define OF(args) args + #define STATIC static + +-typedef unsigned char uch; +-typedef unsigned short ush; +-typedef unsigned long ulg; +- +-#define WSIZE 0x8000 /* Window size must be at least 32k, */ +- /* and a power of two */ +- +-static uch *inbuf; /* input buffer */ +-static uch window[WSIZE]; /* Sliding window buffer */ +- +-static unsigned insize; /* valid bytes in inbuf */ +-static unsigned inptr; /* index of next byte to be processed in inbuf */ +-static unsigned outcnt; /* bytes in output buffer */ +- +-/* gzip flag byte */ +-#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +-#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +-#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +-#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +-#define COMMENT 0x10 /* bit 4 set: file comment present */ +-#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +-#define RESERVED 0xC0 /* bit 6,7: reserved */ +- +-#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf()) +- + /* Diagnostic functions */ + #ifdef DEBUG + # define Assert(cond,msg) {if(!(cond)) error(msg);} +@@ -233,24 +212,20 @@ static unsigned outcnt; /* bytes in output buffer */ + # define Tracecv(c,x) + #endif + +-static int fill_inbuf(void); +-static void flush_window(void); + static void error(char *m); + + extern char input_data[]; + extern char input_data_end[]; + +-static uch *output_data; +-static ulg output_ptr; +-static ulg bytes_out; ++static unsigned char *output_data; ++static unsigned long output_ptr; + + static void error(char *m); + + static void putstr(const char *); + +-extern int end; +-static ulg free_mem_ptr; +-static ulg free_mem_end_ptr; ++static unsigned long free_mem_ptr; ++static unsigned long free_mem_end_ptr; + + #ifdef STANDALONE_DEBUG + #define NO_INFLATE_MALLOC +@@ -258,46 +233,13 @@ static ulg free_mem_end_ptr; + + #define ARCH_HAS_DECOMP_WDOG + +-#include "../../../../lib/inflate.c" +- +-/* =========================================================================== +- * Fill the input buffer. This is called only when the buffer is empty +- * and at least one byte is really needed. +- */ +-int fill_inbuf(void) +-{ +- if (insize != 0) +- error("ran out of input data"); +- +- inbuf = input_data; +- insize = &input_data_end[0] - &input_data[0]; +- +- inptr = 1; +- return inbuf[0]; +-} ++#ifdef CONFIG_KERNEL_GZIP ++#include "../../../../lib/decompress_inflate.c" ++#endif + +-/* =========================================================================== +- * Write the output window window[0..outcnt-1] and update crc and bytes_out. +- * (Used for the decompressed data only.) +- */ +-void flush_window(void) +-{ +- ulg c = crc; +- unsigned n; +- uch *in, *out, ch; +- +- in = window; +- out = &output_data[output_ptr]; +- for (n = 0; n < outcnt; n++) { +- ch = *out++ = *in++; +- c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); +- } +- crc = c; +- bytes_out += (ulg)outcnt; +- output_ptr += (ulg)outcnt; +- outcnt = 0; +- putstr("."); +-} ++#ifdef CONFIG_KERNEL_LZO ++#include "../../../../lib/decompress_unlzo.c" ++#endif + + #ifndef arch_error + #define arch_error(x) +@@ -314,22 +256,33 @@ static void error(char *x) + while(1); /* Halt */ + } + ++asmlinkage void __div0(void) ++{ ++ error("Attempting division by 0!"); ++} ++ + #ifndef STANDALONE_DEBUG + +-ulg +-decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p, +- int arch_id) ++unsigned long ++decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, ++ unsigned long free_mem_ptr_end_p, ++ int arch_id) + { +- output_data = (uch *)output_start; /* Points to kernel start */ ++ unsigned char *tmp; ++ ++ output_data = (unsigned char *)output_start; + free_mem_ptr = free_mem_ptr_p; + free_mem_end_ptr = free_mem_ptr_end_p; + __machine_arch_type = arch_id; + + arch_decomp_setup(); + +- makecrc(); ++ tmp = (unsigned char *) (((unsigned long)input_data_end) - 4); ++ output_ptr = get_unaligned_le32(tmp); ++ + putstr("Uncompressing Linux..."); +- gunzip(); ++ decompress(input_data, input_data_end - input_data, ++ NULL, NULL, output_data, NULL, error); + putstr(" done, booting the kernel.\n"); + return output_ptr; + } +@@ -341,11 +294,10 @@ int main() + { + output_data = output_buffer; + +- makecrc(); + putstr("Uncompressing Linux..."); +- gunzip(); ++ decompress(input_data, input_data_end - input_data, ++ NULL, NULL, output_data, NULL, error); + putstr("done.\n"); + return 0; + } + #endif +- +diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S +deleted file mode 100644 +index 54c9518..0000000 +--- a/arch/arm/boot/compressed/piggy.S ++++ /dev/null +@@ -1,6 +0,0 @@ +- .section .piggydata,#alloc +- .globl input_data +-input_data: +- .incbin "arch/arm/boot/compressed/piggy.gz" +- .globl input_data_end +-input_data_end: +diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S +new file mode 100644 +index 0000000..a68adf9 +--- /dev/null ++++ b/arch/arm/boot/compressed/piggy.gzip.S +@@ -0,0 +1,6 @@ ++ .section .piggydata,#alloc ++ .globl input_data ++input_data: ++ .incbin "arch/arm/boot/compressed/piggy.gzip" ++ .globl input_data_end ++input_data_end: +diff --git a/arch/arm/boot/compressed/piggy.lzo.S b/arch/arm/boot/compressed/piggy.lzo.S +new file mode 100644 +index 0000000..a425ad9 +--- /dev/null ++++ b/arch/arm/boot/compressed/piggy.lzo.S +@@ -0,0 +1,6 @@ ++ .section .piggydata,#alloc ++ .globl input_data ++input_data: ++ .incbin "arch/arm/boot/compressed/piggy.lzo" ++ .globl input_data_end ++input_data_end: diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch new file mode 100644 index 0000000000..bfefe8bfde --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch @@ -0,0 +1,54 @@ +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 72ace95..89f7771 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -49,6 +49,7 @@ config X86 + select HAVE_KERNEL_GZIP + select HAVE_KERNEL_BZIP2 + select HAVE_KERNEL_LZMA ++ select HAVE_KERNEL_LZO + select HAVE_ARCH_KMEMCHECK + + config OUTPUT_FORMAT +diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile +index f8ed065..0e835d0 100644 +--- a/arch/x86/boot/compressed/Makefile ++++ b/arch/x86/boot/compressed/Makefile +@@ -4,7 +4,7 @@ + # create a compressed vmlinux image from the original vmlinux + # + +-targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o ++targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o + + KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 + KBUILD_CFLAGS += -fno-strict-aliasing -fPIC +@@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE + $(call if_changed,bzip2) + $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE + $(call if_changed,lzma) ++$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE ++ $(call if_changed,lzo) + + suffix-$(CONFIG_KERNEL_GZIP) := gz + suffix-$(CONFIG_KERNEL_BZIP2) := bz2 + suffix-$(CONFIG_KERNEL_LZMA) := lzma ++suffix-$(CONFIG_KERNEL_LZO) := lzo + + quiet_cmd_mkpiggy = MKPIGGY $@ + cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false ) +diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c +index 842b2a3..3b22fe8 100644 +--- a/arch/x86/boot/compressed/misc.c ++++ b/arch/x86/boot/compressed/misc.c +@@ -162,6 +162,10 @@ static int lines, cols; + #include "../../../../lib/decompress_unlzma.c" + #endif + ++#ifdef CONFIG_KERNEL_LZO ++#include "../../../../lib/decompress_unlzo.c" ++#endif ++ + static void scroll(void) + { + int i; diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch new file mode 100644 index 0000000000..f0d8ff39f9 --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch @@ -0,0 +1,114 @@ +diff --git a/lib/Kconfig b/lib/Kconfig +index bb1326d..8639349 100644 +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -117,6 +117,10 @@ config DECOMPRESS_BZIP2 + config DECOMPRESS_LZMA + tristate + ++config DECOMPRESS_LZO ++ select LZO_DECOMPRESS ++ tristate ++ + # + # Generic allocator support is selected if needed + # +diff --git a/lib/Makefile b/lib/Makefile +index 2e78277..cfa4041 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -69,6 +69,7 @@ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/ + lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o + lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o + lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o ++lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o + + obj-$(CONFIG_TEXTSEARCH) += textsearch.o + obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o +diff --git a/lib/decompress.c b/lib/decompress.c +index d2842f5..a760681 100644 +--- a/lib/decompress.c ++++ b/lib/decompress.c +@@ -9,6 +9,7 @@ + #include <linux/decompress/bunzip2.h> + #include <linux/decompress/unlzma.h> + #include <linux/decompress/inflate.h> ++#include <linux/decompress/unlzo.h> + + #include <linux/types.h> + #include <linux/string.h> +@@ -22,6 +23,9 @@ + #ifndef CONFIG_DECOMPRESS_LZMA + # define unlzma NULL + #endif ++#ifndef CONFIG_DECOMPRESS_LZO ++# define unlzo NULL ++#endif + + static const struct compress_format { + unsigned char magic[2]; +@@ -32,6 +36,7 @@ static const struct compress_format { + { {037, 0236}, "gzip", gunzip }, + { {0x42, 0x5a}, "bzip2", bunzip2 }, + { {0x5d, 0x00}, "lzma", unlzma }, ++ { {0x89, 0x4c}, "lzo", unlzo }, + { {0, 0}, NULL, NULL } + }; + +diff --git a/usr/Kconfig b/usr/Kconfig +index 1c3039f..e2721f5 100644 +--- a/usr/Kconfig ++++ b/usr/Kconfig +@@ -72,6 +72,15 @@ config RD_LZMA + Support loading of a LZMA encoded initial ramdisk or cpio buffer + If unsure, say N. + ++config RD_LZO ++ bool "Support initial ramdisks compressed using LZO" if EMBEDDED ++ default !EMBEDDED ++ depends on BLK_DEV_INITRD ++ select DECOMPRESS_LZO ++ help ++ Support loading of a LZO encoded initial ramdisk or cpio buffer ++ If unsure, say N. ++ + choice + prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!="" + help +@@ -108,16 +117,15 @@ config INITRAMFS_COMPRESSION_GZIP + bool "Gzip" + depends on RD_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 INITRAMFS_COMPRESSION_BZIP2 + bool "Bzip2" + depends on RD_BZIP2 + help + Its compression ratio and speed is intermediate. +- Decompression speed is slowest among the three. The initramfs ++ Decompression speed is slowest among the four. The initramfs + size is about 10% smaller with bzip2, in comparison to gzip. + Bzip2 uses a large amount of memory. For modern kernels you + will need at least 8MB RAM or more for booting. +@@ -128,7 +136,15 @@ config INITRAMFS_COMPRESSION_LZMA + help + The most recent compression algorithm. + Its ratio is best, decompression speed is between the other +- two. Compression is slowest. The initramfs size is about 33% ++ three. Compression is slowest. The initramfs size is about 33% + smaller with LZMA in comparison to gzip. + ++config INITRAMFS_COMPRESSION_LZO ++ bool "LZO" ++ depends on RD_LZO ++ help ++ Its compression ratio is the poorest among the four. The kernel ++ size is about about 10% bigger than gzip; however its speed ++ (both compression and decompression) is the fastest. ++ + endchoice diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32.bb b/recipes/kexecboot/linux-kexecboot_2.6.32.bb index ee446d798f..858deb4b5a 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32.bb @@ -12,6 +12,11 @@ DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ + file://v3-1-4-Add-support-for-LZO-compressed-kernels.patch;patch=1;status=pending \ + file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;patch=1;status=pending \ + file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;patch=1;status=pending \ + file://v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch;patch=1;status=pending \ + file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;patch=1;status=pending \ file://defconfig" SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879" diff --git a/recipes/libc-client/libc-client_2007a1.bb b/recipes/libc-client/libc-client_2007b.bb index b337a344a7..bacc910a13 100644 --- a/recipes/libc-client/libc-client_2007a1.bb +++ b/recipes/libc-client/libc-client_2007b.bb @@ -1,13 +1,13 @@ DESCRIPTION = "UW c-client library for mail protocols" SECTION = "devel" PRIORITY = "optional" -LICENSE = "University of Washington's Free-Fork License" -DEPENDS = "libpam openssl" +LICENSE = "University of Washingtons Free-Fork License" +DEPENDS = "libpam openssl libpam" SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \ file://quote_cctype.patch;patch=1" -S = "${WORKDIR}/imap-2007a" +S = "${WORKDIR}/imap-${PV}" EXTRA_OEMAKE = "CC='${CC}'" @@ -18,9 +18,10 @@ do_compile() { oe_runmake lnp } -do_stage() { - install -d ${STAGING_INCDIR}/c-client - install ${HEADERS} ${STAGING_INCDIR}/c-client - install c-client/c-client.a ${STAGING_LIBDIR}/libc-client.a +do_install() { + install -d ${D}${includedir}/c-client + install ${HEADERS} ${D}${includedir}/c-client + install -d ${D}${libdir} + install c-client/c-client.a ${D}${libdir}/libc-client.a } diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc index ebb49c0658..3cecedd071 100644 --- a/recipes/libqpe/libqpe-opie.inc +++ b/recipes/libqpe/libqpe-opie.inc @@ -6,10 +6,11 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc-native virtual/libqte2" PROVIDES = "virtual/libqpe1" - +INC_PR = "r7" S = "${WORKDIR}/library" inherit palmtop +inherit opie OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" QMAKE_PROFILES = "library.pro" diff --git a/recipes/libqpe/libqpe-opie_1.2.2.bb b/recipes/libqpe/libqpe-opie_1.2.2.bb index 009a075091..b209780ff7 100644 --- a/recipes/libqpe/libqpe-opie_1.2.2.bb +++ b/recipes/libqpe/libqpe-opie_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r3" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb index 0822385b9d..1a74e3a156 100644 --- a/recipes/libqpe/libqpe-opie_1.2.3.bb +++ b/recipes/libqpe/libqpe-opie_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r3" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb index 8c2abc7af6..5c1690ec12 100644 --- a/recipes/libqpe/libqpe-opie_1.2.4.bb +++ b/recipes/libqpe/libqpe-opie_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r0" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb index 49c1a934e3..8ed2f4d88b 100644 --- a/recipes/libqpe/libqpe-opie_cvs.bb +++ b/recipes/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ diff --git a/recipes/libsdl/libsdl-directfb_1.2.11.bb b/recipes/libsdl/libsdl-directfb_1.2.11.bb index 3f44f9df3f..cc5f043142 100644 --- a/recipes/libsdl/libsdl-directfb_1.2.11.bb +++ b/recipes/libsdl/libsdl-directfb_1.2.11.bb @@ -4,7 +4,7 @@ DEPENDS = "alsa-lib directfb" # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl-directfb_1.2.9.bb b/recipes/libsdl/libsdl-directfb_1.2.9.bb index 7a9bd88ee2..f0d7b9f4a2 100644 --- a/recipes/libsdl/libsdl-directfb_1.2.9.bb +++ b/recipes/libsdl/libsdl-directfb_1.2.9.bb @@ -3,6 +3,8 @@ require libsdl.inc DEPENDS = "alsa-lib directfb" DEFAULT_PREFERENCE = "-1" +PR = "${INC_PR}.0" + SRC_URI += "\ file://explicit-extern-C.patch;patch=1 \ file://acinclude.m4 \ diff --git a/recipes/libsdl/libsdl-qpe_1.2.9.bb b/recipes/libsdl/libsdl-qpe_1.2.9.bb index 711a05d656..4bc985a7c9 100644 --- a/recipes/libsdl/libsdl-qpe_1.2.9.bb +++ b/recipes/libsdl/libsdl-qpe_1.2.9.bb @@ -1,6 +1,6 @@ require libsdl.inc -PR="r1" +PR = "${INC_PR}.0" SECTION = "opie/libs" DEPENDS = "virtual/libqpe1 libopie2" diff --git a/recipes/libsdl/libsdl-x11_1.2.11.bb b/recipes/libsdl/libsdl-x11_1.2.11.bb index 0dffe4ab3f..cf2cf49a56 100644 --- a/recipes/libsdl/libsdl-x11_1.2.11.bb +++ b/recipes/libsdl/libsdl-x11_1.2.11.bb @@ -3,7 +3,7 @@ require libsdl.inc # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb index 621f7b47c1..b48791f6be 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -5,10 +5,10 @@ DESCRIPTION = "Simple DirectMedia Layer (X11 and Framebuffer support)" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "alsa-lib mesa virtual/libx11 libxext tslib" +DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib" PROVIDES = "virtual/libsdl" -PR = "r1" +PR = "r2" SRC_URI = " \ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc index 5653925d68..51a4b22d4f 100644 --- a/recipes/libsdl/libsdl.inc +++ b/recipes/libsdl/libsdl.inc @@ -1,11 +1,13 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "alsa-lib mesa virtual/libx11 libxext" +DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" +INC_PR = "r10" + SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ diff --git a/recipes/linux/linux-h1940_2.6.14-h1940.bb b/recipes/linux/linux-h1940_2.6.14-h1940.bb index 5a657eb0b5..0669600a98 100644 --- a/recipes/linux/linux-h1940_2.6.14-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.14-h1940.bb @@ -6,8 +6,8 @@ COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h1940" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ - http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ - http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch;patch=1 \ + http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ + http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.14" diff --git a/recipes/linux/linux-omap-zoomsync_2.6.31.bb b/recipes/linux/linux-omap-zoomsync_2.6.31.bb index 0e9be960d0..0dea2bfc73 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.31.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.31.bb @@ -18,7 +18,7 @@ PE = "1" PV = "2.6.30+2.6.31-rc7-${OEV}" PR_append = "+gitr${SRCREV}" -SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=git \ +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=http \ file://defconfig" SRC_URI_append = " \ diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb index c7e5e614fc..702246bd8f 100644 --- a/recipes/linux/linux_2.6.14.bb +++ b/recipes/linux/linux_2.6.14.bb @@ -9,8 +9,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" SRC_URI_append_acern30 = "\ - http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ - http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \ + http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ + http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \ file://n30-cleanup.patch;patch=1 \ file://n35.patch;patch=1 \ file://n30-lcd.patch;patch=1 \ diff --git a/recipes/mesa/freeglut_2.4.0.bb b/recipes/mesa/freeglut_2.4.0.bb index a244fb23e1..cfc9ec175f 100644 --- a/recipes/mesa/freeglut_2.4.0.bb +++ b/recipes/mesa/freeglut_2.4.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library. " LICENSE = "MIT/X11" -DEPENDS = "mesa" +DEPENDS = "virtual/libgl" SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-${PV}.tar.gz" diff --git a/recipes/opencv/artoolkit_2.72.1.bb b/recipes/opencv/artoolkit_2.72.1.bb index 2dfbc429bc..1863844c9e 100644 --- a/recipes/opencv/artoolkit_2.72.1.bb +++ b/recipes/opencv/artoolkit_2.72.1.bb @@ -1,7 +1,9 @@ DESCRIPTION = "ARToolKit is a software library that allows for the creation of augmented reality applications. " LICENSE = "GPL/ARToolkit" -DEPENDS = "libxi gstreamer virtual/libx11 freeglut mesa" +DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl" + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \ file://configure.diff;patch=1 \ diff --git a/recipes/orrery/files/orrery.png b/recipes/orrery/files/orrery.png Binary files differnew file mode 100644 index 0000000000..d9865b70ce --- /dev/null +++ b/recipes/orrery/files/orrery.png diff --git a/recipes/orrery/orrery/Makefile.am.patch b/recipes/orrery/orrery/Makefile.am.patch deleted file mode 100644 index 23e7798139..0000000000 --- a/recipes/orrery/orrery/Makefile.am.patch +++ /dev/null @@ -1,67 +0,0 @@ -Nur in files: aclocal.m4. -Nur in files.fixed: autogen.sh. -Nur in files: autom4te.cache. -Nur in files: configure. -diff -uri files/configure.in files.fixed/configure.in ---- files/configure.in 2008-08-17 05:32:06.000000000 +0200 -+++ files.fixed/configure.in 2009-02-18 16:01:30.102497178 +0100 -@@ -2,4 +2,13 @@ - AM_INIT_AUTOMAKE(orrery,1.1) - AC_PROG_CC - AC_PROG_INSTALL -+ -+PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 gthread-2.0) -+PKG_CHECK_MODULES(X11, x11 xext xau xcursor xfixes xdmcp xrender) -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+AC_SUBST(X11_CFLAGS) -+AC_SUBST(X11_LIBS) -+ - AC_OUTPUT(Makefile) -Nur in files: depcomp. -Nur in files: install-sh. -diff -uri files/Makefile.am files.fixed/Makefile.am ---- files/Makefile.am 2008-09-03 08:54:55.000000000 +0200 -+++ files.fixed/Makefile.am 2009-02-18 16:14:19.574262603 +0100 -@@ -1,36 +1,4 @@ --CFLAGS = -g -O3 -Wall --CC = $(OM)/build/tmp/cross/arm-angstrom-linux-gnueabi/bin/gcc --INCLUDES = -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/gtk-2.0/ \ -- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/cairo/ \ -- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/glib-2.0/ \ -- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/pango-1.0/ \ -- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/gtk-2.0/include \ -- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/atk-1.0/ --LDADD = $(OM)/build/tmp/rootfs/usr/lib/libgobject-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangocairo-1.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpango-1.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libcairo.so.2 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgmodule-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libglib-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfontconfig.so.1 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXext.so.6 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXrender.so.1 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpopt.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgthread-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libX11.so.6 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXcursor.so.1 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXfixes.so.3 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgdk_pixbuf-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangoft2-1.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libz.so.1 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpng12.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfreetype.so.6 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libexpat.so.1 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXau.so.6 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXdmcp.so.6 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgtk-x11-2.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libatk-1.0.so.0 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgcrypt.so.11.2.2 \ -- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgpg-error.so.0.3.0 - bin_PROGRAMS = orrery - orrery_SOURCES = planetInfo.c orrery.c -+orrery_CFLAGS = -g -O3 -Wall @GTK_CFLAGS@ @X11_CFLAGS@ -+orrery_LDADD = @GTK_LIBS@ @X11_LIBS@ -lpopt -lz -lexpat -lgcrypt -lgpg-error -Nur in files: Makefile.in. -Nur in files: missing. diff --git a/recipes/orrery/orrery/datadir.patch b/recipes/orrery/orrery/datadir.patch deleted file mode 100644 index 7a3c204ad9..0000000000 --- a/recipes/orrery/orrery/datadir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uri files/orrery.c files.datadir/orrery.c ---- files/orrery.c 2009-01-07 11:28:32.000000000 +0100 -+++ files.datadir/orrery.c 2009-02-18 19:08:44.887262837 +0100 -@@ -70,7 +70,7 @@ - - #define FULL_CIRCLE (23040) /* Full circle in calls to draw_arc */ - --#define DATA_DIR "/media/card/orrery" -+#define DATA_DIR "/usr/share/orrery" - #define N_PLANETS (9) - #define N_SOLAR_SYSTEM_OBJECTS (10) - diff --git a/recipes/orrery/orrery_2.4.bb b/recipes/orrery/orrery_2.4.bb deleted file mode 100644 index dc5622946e..0000000000 --- a/recipes/orrery/orrery_2.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "orrery" -SECTION = "x11/scientific" -PV = "2.4" - -inherit autotools - -SRC_URI = "http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz \ - file://datadir.patch;patch=1 \ - file://Makefile.am.patch;patch=1" -S = "${WORKDIR}/files" - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 ${S}/orrery.desktop ${D}${datadir}/applications - install -d ${D}${datadir}/orrery - cp -a ${S}/data/* ${D}${datadir}/orrery - rm ${D}${datadir}/orrery/icons/orrery.png - install -d ${D}${datadir}/icons - install ${S}/data/icons/orrery.png ${D}${datadir}/icons -} - -FILES_${PN} += "\ - ${datadir}/applications/orrery.desktop \ - ${datadir}/orrery \ - ${datadir}/icons" - diff --git a/recipes/orrery/orrery_2.7.bb b/recipes/orrery/orrery_2.7.bb new file mode 100644 index 0000000000..7b93ee97bf --- /dev/null +++ b/recipes/orrery/orrery_2.7.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Astronomical application which displays the night sky" +HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" +SECTION = "x11/scientific" +PV = "2.7" +PR = "r0" +inherit autotools + +SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz;name=tarball \ + file://orrery.png \ + " + +SRC_URI[tarball.md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" +SRC_URI[tarball.sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" +S = "${WORKDIR}/orrery" + +do_install_append() { + install -d ${D}${datadir}/orrery + cp -a ${S}/data/* ${D}${datadir}/orrery + install -d ${D}${datadir}/icons + install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons +} + +FILES_${PN} += "\ + ${datadir}/icons/orrery.png" + diff --git a/recipes/php/php-5.2.11/imap-fix-autofoo.patch b/recipes/php/php-5.2.11/imap-fix-autofoo.patch new file mode 100644 index 0000000000..3695b7bc42 --- /dev/null +++ b/recipes/php/php-5.2.11/imap-fix-autofoo.patch @@ -0,0 +1,41 @@ +Index: php-5.2.11/ext/imap/config.m4 +=================================================================== +--- php-5.2.11.orig/ext/imap/config.m4 2009-12-10 12:27:52.800974533 -0700 ++++ php-5.2.11/ext/imap/config.m4 2009-12-10 12:28:33.720976583 -0700 +@@ -103,7 +103,7 @@ + PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) + AC_DEFINE(HAVE_IMAP,1,[ ]) + +- for i in $PHP_IMAP /usr/local /usr; do ++ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do + IMAP_INC_CHK() + el[]IMAP_INC_CHK(/include/c-client) + el[]IMAP_INC_CHK(/include/imap) +@@ -192,13 +192,7 @@ + AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) + fi + +- if test -r "$IMAP_DIR/c-client/c-client.a"; then +- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then +- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 +- fi +- +- for lib in c-client4 c-client imap; do ++ for lib in /usr/lib c-client4 c-client imap; do + IMAP_LIB=$lib + IMAP_LIB_CHK($PHP_LIBDIR) + IMAP_LIB_CHK(c-client) +Index: php-5.2.11/acinclude.m4 +=================================================================== +--- php-5.2.11.orig/acinclude.m4 2009-12-10 12:37:13.134722881 -0700 ++++ php-5.2.11/acinclude.m4 2009-12-10 12:37:39.342007053 -0700 +@@ -2338,7 +2338,7 @@ + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + fi + +- for i in $PHP_OPENSSL_DIR; do ++ for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do + if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include + fi diff --git a/recipes/php/php_5.2.11.bb b/recipes/php/php_5.2.11.bb index d4fd98597a..5b4871cbc7 100644 --- a/recipes/php/php_5.2.11.bb +++ b/recipes/php/php_5.2.11.bb @@ -1,10 +1,12 @@ require php.inc -DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql" +DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ + libc-client openssl" -PR = "r1" +PR = "r4" SRC_URI += "file://pear-makefile.patch;patch=1 \ + file://imap-fix-autofoo.patch;patch=1 \ " export THREADS="pthread" export LIBS=" -lpthread " @@ -17,13 +19,16 @@ EXTRA_OECONF = " --without-iconv \ --enable-pcntl \ --enable-memory-limit \ --enable-wddx \ - --enable-embedded-mysqli \ + --disable-embedded-mysqli \ --enable-magic-quotes \ --enable-fastcgi \ + --with-imap=${STAGING_DIR_HOST} \ + --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-libxml-dir=${STAGING_BINDIR_CROSS} \ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ -# --with-mysqli = "${STAGING_BINDIR_NATIVE}/mysql_config" \ + --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ + --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ --without-pdo-sqlite \ " @@ -31,6 +36,8 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${bindir}/php" +#LDFLAGS += "-lstdc++" + do_configure_append() { find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' } diff --git a/recipes/prelink/prelink_20090925.bb b/recipes/prelink/prelink_20090925.bb new file mode 100644 index 0000000000..49b319cc78 --- /dev/null +++ b/recipes/prelink/prelink_20090925.bb @@ -0,0 +1,48 @@ +SECTION = "devel" +DEPENDS = "elfutils" +DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \ +and executables, so that far fewer relocations need to be resolved at \ +runtime and thus programs come up faster." +LICENSE = "GPL" + +SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ + file://prelink.conf \ + file://prelink.cron.daily \ + file://prelink.default" + +#TARGET_OS_ORIG := "${TARGET_OS}" +#OVERRIDES_append = ":${TARGET_OS_ORIG}" +#SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1" + +S = "${WORKDIR}/prelink-0.0.${PV}" + +EXTRA_OECONF = "--disable-64bit" + +inherit autotools + +do_install_append () { + install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf + install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink + install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink +} + +pkg_postinst_prelink() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +. ${sysconfdir}/cron.daily/prelink +} + +pkg_prerm_prelink() { +#!/bin/sh + +if [ -f ${sysconfdir}/prelink.cache ]; then + prelink -au + rm -f ${sysconfdir}/prelink.cache +fi +} + diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb index 719215c5d2..f5ff6b0cdd 100644 --- a/recipes/qt/qt-x11-free_3.3.6.bb +++ b/recipes/qt/qt-x11-free_3.3.6.bb @@ -1,6 +1,6 @@ -DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql virtual/libgl" PROVIDES = "qt3x11" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb index 7e430c8024..e218073cce 100644 --- a/recipes/qt/qt-x11-free_3.3.7.bb +++ b/recipes/qt/qt-x11-free_3.3.7.bb @@ -1,6 +1,6 @@ -DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa" +DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql virtual/libgl" PROVIDES = "qt3x11" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc new file mode 100644 index 0000000000..97ad6cdd74 --- /dev/null +++ b/recipes/qt4/qt-4.6.0.inc @@ -0,0 +1,48 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-embedded.inc + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://0009-support-2bpp.patch;patch=1 \ + file://0010-no-simpledecoration-example.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +do_configure_prepend() { + sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf + sed -i \ + -e /QMAKE_MOC\ /d \ + -e /QMAKE_UIC\ /d \ + -e /QMAKE_UIC3\ /d \ + -e /QMAKE_RCC\ /d \ + ${S}/configure + +# sed -i /tools.pro/d ${S}/src/src.pro +} + +QT_GLFLAGS ?= "" +QT_CONFIG_FLAGS += "${QT_GLFLAGS}" + +do_compile() { + unset CFLAGS CXXFLAGS + oe_runmake ${EXTRA_ENV} +} + +do_install_append() { + install -d ${D}${bindir} + for i in rcc uic moc ; do + install -m 0755 ${S}/bin/$i ${D}${bindir}/ + done +} + +LICENSE = "LGPLv2.1 GPLv3" +SRC_URI += " \ + file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch index 070b4ac9c1..fce5bba938 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch +++ b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch @@ -1,9 +1,11 @@ ---- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro 2009-02-25 22:32:34.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro 2009-03-26 19:53:19.000000000 +0100 -@@ -1,5 +1,5 @@ +--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 +@@ -1,7 +1,7 @@ TEMPLATE = subdirs --SUBDIRS = framebuffer mousecalibration simpledecoration -+SUBDIRS = framebuffer mousecalibration + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration # install sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-embedded-4.6.0/linux.conf b/recipes/qt4/qt4-embedded-4.6.0/linux.conf index 2e862407bc..68ae80b929 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/linux.conf +++ b/recipes/qt4/qt4-embedded-4.6.0/linux.conf @@ -15,7 +15,7 @@ QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_LIBS = -lglib-2.0 +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) diff --git a/recipes/qt4/qt4-embedded-gles/linux.conf b/recipes/qt4/qt4-embedded-gles/linux.conf new file mode 100644 index 0000000000..a530c75913 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles/linux.conf @@ -0,0 +1,63 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 +QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} + +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) +QMAKE_LIBS_NIS = -lnsl +QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_QT = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENVG = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um -lOpenVG -lOpenVGU +QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um + +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = ${OBJCOPY} +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +#These defines are documented in the powervr README, please read it +DEFINES += QT_QWS_CLIENTBLIT QT_NO_QWS_CURSOR + +include(unix.conf) diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb new file mode 100644 index 0000000000..f988f9828b --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb @@ -0,0 +1,13 @@ + +PR = "${INC_PR}.0" + +QT_GLFLAGS = "-opengl es2 -openvg" + +require qt-4.6.0.inc + + +FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" + +DEPENDS += "virtual/egl" + + diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb index 1bdca87a0d..3bde65014d 100644 --- a/recipes/qt4/qt4-embedded_4.6.0.bb +++ b/recipes/qt4/qt4-embedded_4.6.0.bb @@ -1,38 +1,5 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-embedded.inc PR = "${INC_PR}.0" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://fix-config-tests.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -do_configure_prepend() { - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} +require qt-4.6.0.inc -LICENSE = "LGPLv2.1 GPLv3" -SRC_URI += " \ - file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch new file mode 100644 index 0000000000..fce5bba938 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch @@ -0,0 +1,11 @@ +--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 +@@ -1,7 +1,7 @@ + TEMPLATE = subdirs + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration + + # install + sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-x11-free-4.6.0/linux.conf b/recipes/qt4/qt4-x11-free-4.6.0/linux.conf index 2e862407bc..68ae80b929 100644 --- a/recipes/qt4/qt4-x11-free-4.6.0/linux.conf +++ b/recipes/qt4/qt4-x11-free-4.6.0/linux.conf @@ -15,7 +15,7 @@ QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_LIBS = -lglib-2.0 +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf new file mode 100644 index 0000000000..b5741574b8 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles/linux.conf @@ -0,0 +1,60 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 +QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} + +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) +QMAKE_LIBS_NIS = -lnsl +QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_QT = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um +QMAKE_LIBS_OPENVG = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um -lOpenVG -lOpenVGU +QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um + +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = ${OBJCOPY} +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +include(unix.conf) diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb new file mode 100644 index 0000000000..36b6ec5a25 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb @@ -0,0 +1,17 @@ + +PR = "${INC_PR}.0" + +QT_GLFLAGS = "-opengl es2 -openvg" + +require qt-4.6.0.inc + +QT_CONFIG_FLAGS += " \ + -no-embedded \ + -xrandr \ + -x11" + +FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" + +DEPENDS += "virtual/egl" + + diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb index 4b5eabff5c..1b5b4524c8 100644 --- a/recipes/qt4/qt4-x11-free_4.6.0.bb +++ b/recipes/qt4/qt4-x11-free_4.6.0.bb @@ -1,45 +1,10 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-x11-free.inc -LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.0" -export MOC = "${OE_QMAKE_MOC}" -export QMAKE_MOC = "${OE_QMAKE_MOC}" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://fix-config-tests.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ -" - -SRC_URI += "file://hack-out-pg_config.patch;patch=1" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" +require qt-4.6.0.inc QT_CONFIG_FLAGS += " \ -no-embedded \ -xrandr \ -x11" -do_configure_prepend() { - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 50dd1d8760..7d600a825c 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ export QT_CONF_PATH="${WORKDIR}/qt.conf" # Library packages -QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon" +QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG" QT_EXTRA_LIBS = "pvrQWSWSEGL" diff --git a/recipes/quake/quetoo_0.6.1.bb b/recipes/quake/quetoo_0.6.1.bb index 33a7075799..b031238da3 100644 --- a/recipes/quake/quetoo_0.6.1.bb +++ b/recipes/quake/quetoo_0.6.1.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims to provide security and performance enhancements." LICENSE = "GPLv2" -DEPENDS = "libsdl-x11 zlib mesa" +DEPENDS = "libsdl-x11 zlib virtual/libgl" SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}.tar.bz2" +PR = "r1" inherit autotools pkgconfig diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 328a422064..1e5706d777 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r28" +PR = "r29" PV = "1.0" LICENSE = "GPL" @@ -7,6 +7,10 @@ inherit task RDEPENDS_${PN} += "\ babiloo-efl \ + claws-mail \ + claws-plugin-mailmbox \ +# claws-plugin-gtkhtml2-viewer \ + claws-plugin-rssyl \ di \ dictator \ dosbox \ @@ -27,11 +31,14 @@ RDEPENDS_${PN} += "\ mplayer \ navit \ omview \ + orrery \ python-elementary \ pythm \ python-wifi \ + omoney \ openmoko-agpsui \ openvpn \ + pyphonelog \ # shr-config \ shr-today \ shr-theme-neo \ @@ -44,10 +51,9 @@ RDEPENDS_${PN} += "\ shr-splash-theme-dontpanic \ shr-splash-theme-handy \ vagalume \ + wireshark \ x11vnc \ - omoney \ - pyphonelog \ pingus \ openmoocow \ python-pygame \ @@ -100,10 +106,6 @@ RDEPENDS_${PN} += "\ # bluez-hcidump \ kbdd \ kexec-tools \ - claws-mail \ - claws-plugin-mailmbox \ -# claws-plugin-gtkhtml2-viewer \ - claws-plugin-rssyl \ mc \ iotop \ xprop \ @@ -140,7 +142,6 @@ RDEPENDS_${PN} += "\ # asterisk \ git \ ruby \ - orrery \ synergy \ irssi \ zhone \ diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb index 42541cd22d..ed7d48c6c9 100644 --- a/recipes/xorg-app/xdriinfo_1.0.1.bb +++ b/recipes/xorg-app/xdriinfo_1.0.1.bb @@ -1,5 +1,6 @@ require xorg-app-common.inc PE = "1" +PR = "r1" -DEPENDS += " virtual/libx11 glproto mesa" +DEPENDS += " virtual/libx11 glproto virtual/libgl" diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb index 3d1c9e9613..38e57cd022 100644 --- a/recipes/xorg-app/xdriinfo_1.0.2.bb +++ b/recipes/xorg-app/xdriinfo_1.0.2.bb @@ -1,4 +1,5 @@ require xorg-app-common.inc DESCRIPTION = "query configuration information of DRI drivers" -DEPENDS += " virtual/libx11 glproto mesa" +DEPENDS += " virtual/libx11 glproto virtual/libgl" PE = "1" +PR = "r1" diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch new file mode 100644 index 0000000000..b0044886e5 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch @@ -0,0 +1,20 @@ +See https://bugs.gentoo.org/show_bug.cgi?id=235789 +2008-09-09 Martin von Gagern + +--- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200 ++++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200 +@@ -67,6 +67,13 @@ + #include "os.h" + #endif + ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++ + typedef unsigned char U8; + typedef unsigned short U16; + typedef unsigned int U32; + diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 0b347aad7b..b6322769ab 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r7" +PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -27,6 +27,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://no_xkb.patch;patch=1;pnum=0 \ file://xorg-1.4-kdrive-rotation.patch;patch=1 \ file://split_multiple_AC_SUBST.patch;patch=1 \ + file://vm86_masks.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" diff --git a/recipes/xscreensaver/xscreensaver.inc b/recipes/xscreensaver/xscreensaver.inc index 5f8cdc0074..2f8711fee6 100644 --- a/recipes/xscreensaver/xscreensaver.inc +++ b/recipes/xscreensaver/xscreensaver.inc @@ -6,12 +6,14 @@ DESCRIPTION = "*The* screensaver package for X11" HOMEPAGE = "http://www.jwz.org/xscreensaver/" SECTION = "x11-misc" LICENSE = "BSD" -DEPENDS = "intltool mesa freeglut virtual/libx11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libgl freeglut virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" TARGET_CC_ARCH += "${LDFLAGS}" +INC_PR = "r4" + inherit autotools export INTLTOOL_PERL="/usr/bin/env perl" diff --git a/recipes/xscreensaver/xscreensaver_4.16.bb b/recipes/xscreensaver/xscreensaver_4.16.bb index 7696c4733c..e72ce92645 100644 --- a/recipes/xscreensaver/xscreensaver_4.16.bb +++ b/recipes/xscreensaver/xscreensaver_4.16.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.jwz.org/xscreensaver/" SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" -PR = "r1" +PR = "${INC_PR}.0" BROKEN = "1" # upstream is at 4.22 now - patches do not apply diff --git a/recipes/xscreensaver/xscreensaver_4.22.bb b/recipes/xscreensaver/xscreensaver_4.22.bb index cac3776724..1d184e9f2b 100644 --- a/recipes/xscreensaver/xscreensaver_4.22.bb +++ b/recipes/xscreensaver/xscreensaver_4.22.bb @@ -8,7 +8,7 @@ SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://fixes.patch;patch=1 \ diff --git a/recipes/xscreensaver/xscreensaver_5.07.bb b/recipes/xscreensaver/xscreensaver_5.07.bb index cfe5cccdaa..ab810a7e0e 100644 --- a/recipes/xscreensaver/xscreensaver_5.07.bb +++ b/recipes/xscreensaver/xscreensaver_5.07.bb @@ -1,5 +1,5 @@ require xscreensaver.inc -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ |
