diff options
37 files changed, 154 insertions, 189 deletions
diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass index 9ca392b84a..01bf9eaeba 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -8,7 +8,9 @@ def python_dir(d): staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) for majmin in "2.6 2.5 2.4 2.3".split(): if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split(): + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + return "INVALID" PYTHON_DIR = "${@python_dir(d)}" diff --git a/recipes/mesa/mesa-tls.inc b/classes/glx-use-tls.bbclass index 1472aa7e74..7530872fa4 100644 --- a/recipes/mesa/mesa-tls.inc +++ b/classes/glx-use-tls.bbclass @@ -1,6 +1,7 @@ - def get_tls_setting(bb, d): # until we have no prober TLS support in uclibc disable it if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 : return "" return "--enable-glx-tls" + +EXTRA_OECONF += "${@get_tls_setting(bb, d)}" diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d084cefee8..c5192d59d4 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -78,6 +78,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" UBOOT_ENTRYPOINT ?= "20008000" UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" +# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE. +# We don't want to override kernel Makefile variables from the environment +EXTRA_OEMAKE = "" + kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" @@ -182,6 +186,7 @@ kernel_do_install() { install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}/etc/modutils if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then install -d ${D}/etc/modprobe.d @@ -232,7 +237,7 @@ EXPORT_FUNCTIONS do_compile do_install do_stage do_configure PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" -FILES_kernel-dev = "/boot/System.map* /boot/config*" +FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" FILES_kernel-vmlinux = "/boot/vmlinux*" RDEPENDS_kernel = "kernel-base" RRECOMMENDS_kernel-module-hostap-cs += '${@base_version_less_or_equal("KERNEL_VERSION", "2.6.17", "", "apm-wifi-suspendfix", d)}' diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 2f99e4cf30..dfb8ec960f 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -189,6 +189,24 @@ def patch_init(d): def Clean(self): """""" + class GitApplyTree(PatchTree): + def __init__(self, dir, d): + PatchTree.__init__(self, dir, d) + + def _applypatch(self, patch, force = False, reverse = False, run = True): + shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] + + if reverse: + shellcmd.append('-R') + + shellcmd.append(patch['file']) + + if not run: + return "sh" + "-c" + " ".join(shellcmd) + + return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + + class QuiltTree(PatchSet): def _runcmd(self, args, run = True): quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) @@ -424,6 +442,7 @@ def patch_init(d): g["PatchSet"] = PatchSet g["PatchTree"] = PatchTree g["QuiltTree"] = QuiltTree + g["GitApplyTree"] = GitApplyTree g["Resolver"] = Resolver g["UserResolver"] = UserResolver g["NOOPResolver"] = NOOPResolver @@ -449,6 +468,7 @@ python patch_do_patch() { patchsetmap = { "patch": PatchTree, "quilt": QuiltTree, + "git": GitApplyTree, } cls = patchsetmap[bb.data.getVar('PATCHTOOL', d, 1) or 'quilt'] diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c4af34e8d7..c2f7666ef2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -405,6 +405,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +export NM = "${HOST_PREFIX}nm" PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" diff --git a/conf/checksums.ini b/conf/checksums.ini index 85de9c2d93..6104853154 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -23038,6 +23038,10 @@ sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53 md5=6f3701a0f2acf3fe53093491ba3d77ee sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be +[http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2] +md5=1a53a0e72bee0bf814f4da83a9b6a636 +sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad + [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz] md5=b29893c06192df6230dd5f340f3badf5 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a @@ -25374,10 +25378,18 @@ sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21 md5=fc805051f0fe505c7a4b1b5c8db9b9e3 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 +[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz] +md5=d6f86ccc3d1a534902e1cf8df1cb43f3 +sha256=05072405fd182425d90374d2d5b69c36fe9fd927f44e397c449a9bdd1a971218 + [http://www.oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz] md5=5442e7ffc75abd853d1ab1d12667a3e9 sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce +[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz] +md5=f318fe11143af82aa6679acc51723a1a +sha256=9db5a04e184bc06be17d007a58adbf2592e7a380dfd80ddc6aa9001084b9a134 + [http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-1.0.5.tar.gz] md5=5fbfec7f23b0f539d32b50de4a278b95 sha256=277e30cbd4a4d9355e9b2c02489d34cbaed87754bbdeb8956e5463e9fb592658 diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 7d404a4f65..163c9c901a 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r42" +MACHINE_KERNEL_PR = "r43" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/ecj/libecj-bootstrap_3.5.bb b/recipes/ecj/libecj-bootstrap_3.5.bb index 1665b337b6..005000eb4b 100644 --- a/recipes/ecj/libecj-bootstrap_3.5.bb +++ b/recipes/ecj/libecj-bootstrap_3.5.bb @@ -1,3 +1,7 @@ +# Causes problems with openjdk/icedtea. See Eclipse bug eclipse bug #285466 +# Might get fixed in IcedTea 1.6 +DEFAULT_PREFERENCE = "-1" + require libecj-bootstrap.inc PR = "r0" diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 62c6d16f6b..a1482fbf4b 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.4 -# Wed Jul 29 12:54:46 2009 +# Mon Aug 24 09:09:25 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -48,7 +48,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FAIR_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set diff --git a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff index 82cb12c575..f3935eb90a 100644 --- a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff +++ b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff @@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c + +static int __init meminfo_cmp(const void *_a, const void *_b) { + const struct membank *a = _a, *b = _b; -+ long cmp = bank_pfn_start(b) - bank_pfn_start(a); ++ long cmp = bank_pfn_start(a) - bank_pfn_start(b); + return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; } + void __init bootmem_init(void) diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index 7da8bb9f2b..c9f8e9962b 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y # CONFIG_OMAP_MUX is not set CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set -CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_IOMMU=m # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 diff --git a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff index 82cb12c575..f3935eb90a 100644 --- a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff +++ b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff @@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c + +static int __init meminfo_cmp(const void *_a, const void *_b) { + const struct membank *a = _a, *b = _b; -+ long cmp = bank_pfn_start(b) - bank_pfn_start(a); ++ long cmp = bank_pfn_start(a) - bank_pfn_start(b); + return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; } + void __init bootmem_init(void) diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index 9cd10eb3e3..d7bfc148c5 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec" HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" +INC_PR = "r7" + SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " S = "${WORKDIR}/Mesa-${PV}" @@ -17,8 +19,10 @@ EXTRA_OECONF = "--enable-glu \ --disable-glut \ " -require mesa-tls.inc -EXTRA_OECONF += "${@get_tls_setting(bb, d)} " +inherit glx-use-tls + +# Package contents vary according to ${MACHINE_DRI_MODULES}. +PACKAGE_ARCH = "${MACHINE}" PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" FILES_libgl = "${libdir}/libGL.so.*" @@ -36,4 +40,7 @@ do_stage() { cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/ } - +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb index 296a254841..93568432bc 100644 --- a/recipes/mesa/mesa-dri_7.2.bb +++ b/recipes/mesa/mesa-dri_7.2.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ -} diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb index 296a254841..93568432bc 100644 --- a/recipes/mesa/mesa-dri_7.4.bb +++ b/recipes/mesa/mesa-dri_7.4.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ -} diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index bca681c76d..4ca1b73122 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PV = "7.2+gitr${SRCREV}" -PR = "r1" +PR = "${INC_PR}.0" PE = "1" DEFAULT_PREFERENCE = "-1" @@ -18,4 +18,3 @@ FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - diff --git a/recipes/subversion/files/apr-regex.patch b/recipes/subversion/files/apr-regex.patch deleted file mode 100644 index 4f1f50a7d5..0000000000 --- a/recipes/subversion/files/apr-regex.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- subversion-1.3.1/configure~apr-regex -+++ subversion-1.3.1/configure -@@ -2933,9 +2933,9 @@ - - - --APR_VER_REGEX="0\.9\.[5-9]" -+APR_VER_REGEX="0\.9\.12" - APR_VER_REGEX_TOO="1\." --APU_VER_REGEX="0\.9\.[5-9]" -+APU_VER_REGEX="0\.9\.12" - APU_VER_REGEX_TOO="1\." - - diff --git a/recipes/subversion/files/libtool.patch b/recipes/subversion/files/libtool.patch deleted file mode 100644 index d296806b12..0000000000 --- a/recipes/subversion/files/libtool.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: subversion-1.4.5/configure.in -=================================================================== ---- subversion-1.4.5.orig/configure.in 2007-01-01 14:41:51.000000000 +0000 -+++ subversion-1.4.5/configure.in 2009-04-30 21:19:12.000000000 +0000 -@@ -11,6 +11,7 @@ - - AC_CONFIG_SRCDIR(subversion/include/svn_types.h) - AC_CONFIG_AUX_DIR([build]) -+AC_CONFIG_MACRO_DIR([build/ac-macros]) - - AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) - diff --git a/recipes/subversion/subversion_1.4.0.bb b/recipes/subversion/subversion_1.4.0.bb deleted file mode 100644 index 305b13c6a4..0000000000 --- a/recipes/subversion/subversion_1.4.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -do_configure() { - gnu-configize - libtoolize --force - aclocal -I build/ -I build/ac-macros/ && autoconf - oe_runconf -} diff --git a/recipes/subversion/subversion_1.4.5.bb b/recipes/subversion/subversion_1.4.5.bb deleted file mode 100644 index 1029e70c5c..0000000000 --- a/recipes/subversion/subversion_1.4.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r0" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1 \ - file://libtool.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -acpaths = "-I build/ -I build/ac-macros/" - -# FIXME: Ugly hack! Instead of fully porting to the new libtool, apply libtool.patch and do the rest here. -do_configure_prepend() { - rm -f build/libtool.m4 -} -do_configure_append() { - if ! test -f libtool ; then cp -a *-libtool libtool ; fi -} - -do_stage() { - autotools_stage_all -} diff --git a/recipes/subversion/subversion_1.3.1.bb b/recipes/subversion/subversion_1.6.5.bb index 79e5e67d7b..50f5e6e5d6 100644 --- a/recipes/subversion/subversion_1.3.1.bb +++ b/recipes/subversion/subversion_1.6.5.bb @@ -1,23 +1,27 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util-0.9.12 neon" +DEPENDS = "apr-util neon" +RDEPENDS = "neon" LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" +HOMEPAGE = "http://subversion.tigris.org/" + +PR = "r0" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://apr-regex.patch;patch=1" + file://disable-revision-install.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ +EXTRA_OECONF = "--without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" + inherit autotools -do_configure() { - oe_runconf +acpaths = "-I build/ac-macros" + +# FIXME: Ugly hack! +do_configure_append() { + if ! test -f libtool ; then cp -a *-libtool libtool ; fi } do_stage() { diff --git a/recipes/sugar/sugar-base_0.84.1.bb b/recipes/sugar/sugar-base_0.84.1.bb index e95a43e3a9..c96cbf9470 100644 --- a/recipes/sugar/sugar-base_0.84.1.bb +++ b/recipes/sugar/sugar-base_0.84.1.bb @@ -25,7 +25,7 @@ RDEPENDS = "librsvg-gtk \ python-pydoc \ python-mmap \ python-doctest \ - ssh-keygen" + openssh-keygen" SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/${PN}-${PV}.tar.bz2" diff --git a/recipes/sugar/sugar-datastore_0.84.0.bb b/recipes/sugar/sugar-datastore_0.84.0.bb index dde2748974..63fb91cb83 100644 --- a/recipes/sugar/sugar-datastore_0.84.0.bb +++ b/recipes/sugar/sugar-datastore_0.84.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" PR = "r0" DEPENDS = "sugar-toolkit python-xappy " -RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson" +RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson xapian-bindings-python" SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/${PN}-${PV}.tar.bz2" diff --git a/recipes/xapian/xapian-bindings-python_1.0.14.bb b/recipes/xapian/xapian-bindings-python_1.0.14.bb new file mode 100644 index 0000000000..665cd58913 --- /dev/null +++ b/recipes/xapian/xapian-bindings-python_1.0.14.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Open Source Search Engine Library python bindings" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "xapian-core" +PR = "r0" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-bindings-${PV}.tar.gz" + +S = "${WORKDIR}/xapian-bindings-${PV}" + +inherit autotools pkgconfig distutils-base + +export XAPIAN_CONFIG = "${STAGING_BINDIR_NATIVE}/xapian-config" + +EXTRA_OECONF = "--with-python --without-php --without-ruby --without-tcl \ + --without-csharp --without-java" + +do_configure () { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${MULTIMACH_HOST_SYS} \ + autotools_do_configure +} + +# we don't want make to generate pyc and pyo files, but make install +# expects them later +do_compile() { + oe_runmake PYTHON=true + touch ${S}/python/xapian.pyc + touch ${S}/python/xapian.pyo +} + +# workaround for bad installation destination and removal of fake .py? files +do_install_append() { + mv ${D}/${STAGING_DIR_HOST}/usr/* ${D}/usr/ + rm ${D}/usr/lib/python2.6/site-packages/xapian.py? +} + +do_stage () { + autotools_stage_all +} + diff --git a/recipes/xapian/xapian-core.inc b/recipes/xapian/xapian-core.inc new file mode 100644 index 0000000000..080de127ad --- /dev/null +++ b/recipes/xapian/xapian-core.inc @@ -0,0 +1,15 @@ +DESCRPITION = "Open Source Search Engine Library" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/recipes/xapian/xapian-core_1.0.13.bb b/recipes/xapian/xapian-core_1.0.13.bb index 5987b09491..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.13.bb +++ b/recipes/xapian/xapian-core_1.0.13.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.14.bb b/recipes/xapian/xapian-core_1.0.14.bb new file mode 100644 index 0000000000..5428d8d135 --- /dev/null +++ b/recipes/xapian/xapian-core_1.0.14.bb @@ -0,0 +1 @@ +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.5.bb b/recipes/xapian/xapian-core_1.0.5.bb index 2af709324f..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.5.bb +++ b/recipes/xapian/xapian-core_1.0.5.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-${PV}.tar.gz" - -inherit autotools - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.7.bb b/recipes/xapian/xapian-core_1.0.7.bb index 289cae4ead..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.7.bb +++ b/recipes/xapian/xapian-core_1.0.7.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" - -inherit autotools - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index ec565154b1..cfd350e886 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" +INC_PR = "r12" + PROVIDES = "virtual/xserver" DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ @@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig glx-use-tls EXTRA_OECONF += " --enable-xcalibrate \ --enable-kdrive \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb index 61f73b3454..50d182c2ea 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r4" +PR = "${INC_PR}.0" export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb index 9d6dca4489..1efea750a5 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://glyphstr.patch;patch=1" diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb index 2c4f3d8716..13cceb96fd 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS += "hal" PE = "1" -PR = "r11" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb index cb9ddcd9d3..edd1ac0865 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS += "hal" PE = "1" -PR = "r9" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb index d4b8caffa0..4c2efd55fc 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS += "hal" PE = "1" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1" diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb index 74ea3c41e5..39697246e3 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS += "hal" PE = "2" -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb index d8379eb396..5218fde00e 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" RDEPENDS += "hal" PE = "2" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI += "file://sysroot_fix.patch;patch=1 \ file://dolt-fix.patch;patch=1" |