[oe-commits] org.oe.dev merge of '96d7870254b4856e54bb9917bf206a20c8a2143b'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Dec 4 18:42:14 UTC 2007
merge of '96d7870254b4856e54bb9917bf206a20c8a2143b'
and 'af1fa1ff21fbbd82c0b12c754f37cc126ee70b06'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bbc1baeaddfacb1090f6b11e2821923c7c0872c4
ViewMTN: http://monotone.openembedded.org/revision/info/bbc1baeaddfacb1090f6b11e2821923c7c0872c4
Files:
1
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
contrib/angstrom/build-release.sh
packages/images/console-mipv6-image.bb
packages/mipl-mipv6/mipv6_2.0.2.bb
packages/tasks/task-mipl.bb
mtn:execute
true
packages/python/python-sword_1.5.8.bb
packages/python/python-sword_1.5.9.bb
packages/python/python-sword_1.5.10.bb
packages/sword/sword_1.5.10.bb
packages/python/python-pygtk_2.10.4.bb
Diffs:
#
# mt diff -r96d7870254b4856e54bb9917bf206a20c8a2143b -rbbc1baeaddfacb1090f6b11e2821923c7c0872c4
#
#
#
# delete "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#
# delete "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#
# add_file "contrib/angstrom/build-release.sh"
# content [12b165cb265a4a6848fd5289eeb578ebe63ae7ac]
#
# add_file "packages/images/console-mipv6-image.bb"
# content [a1e3ca126544a1d9cb8ae78892c6c5db5867b103]
#
# add_file "packages/mipl-mipv6/mipv6_2.0.2.bb"
# content [d61e13a0489a81ad82a4624f86cf071ca926914e]
#
# add_file "packages/tasks/task-mipl.bb"
# content [6524ebb4dd47f3984406053cebd25e3e8724b3b6]
#
# set "contrib/angstrom/build-release.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/angstrom/build-release.sh 12b165cb265a4a6848fd5289eeb578ebe63ae7ac
+++ contrib/angstrom/build-release.sh 12b165cb265a4a6848fd5289eeb578ebe63ae7ac
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# No graphics
+for i in ep93xx ixp4xxle ixp4xxbe gumstix-connex efika
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake minimal-image ; bitbake console-image
+ done
+
+for i in ixp4xxle ixp4xxbe
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake nslu2-minimal-image
+ done
+
+# build altboot images for zaurus
+for i in c7x0 poodle tosa akita spitz collie
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake altboot-console-image
+# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+# bitbake altboot-console-image
+ done
+
+# graphics, flash storage
+for i in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 omap5912osk poodle tosa hx4700 c7x0 spitz akita collie
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake minimal-image ; bitbake console-image ; bitbake x11-image
+ done
+
+# graphics, disk storage
+for i in spitz
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake -c clean qmake2-native ; bitbake x11-gpe-image ; bitbake x11-pimlico-image ; bitbake x11-office-image
+# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+# bitbake x11-gpe-mage ; bitbake x11-pimlico-image ; bitbake x11-office-image
+ done
+
+
+#phones
+for i in fic-gta01 a780
+ do
+ echo "MACHINE = \"$i\"" > conf/auto.conf
+ bitbake -c clean qmake2-native ;bitbake openmoko-image
+# echo ANGSTROM_MODE = \"uclibc\" >> conf/auto.conf
+# bitbake openmoko-image
+ done
+
============================================================
--- packages/images/console-mipv6-image.bb a1e3ca126544a1d9cb8ae78892c6c5db5867b103
+++ packages/images/console-mipv6-image.bb a1e3ca126544a1d9cb8ae78892c6c5db5867b103
@@ -0,0 +1,7 @@
+# This image is for testing the ipv6 mobility extensions
+
+require console-image.bb
+IMAGE_INSTALL += " task-mipl "
+
+export IMAGE_BASENAME = "console-mobile-ipv6-image"
+
============================================================
--- packages/mipl-mipv6/mipv6_2.0.2.bb d61e13a0489a81ad82a4624f86cf071ca926914e
+++ packages/mipl-mipv6/mipv6_2.0.2.bb d61e13a0489a81ad82a4624f86cf071ca926914e
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6"
+
+SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz"
+
+inherit autotools module-base
+
+CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+ oe_runmake CFLAGS="${CFLAGS}"
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install -d ${D}${sysconfdir}/init.d
+ oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
============================================================
--- packages/tasks/task-mipl.bb 6524ebb4dd47f3984406053cebd25e3e8724b3b6
+++ packages/tasks/task-mipl.bb 6524ebb4dd47f3984406053cebd25e3e8724b3b6
@@ -0,0 +1,16 @@
+# Tasks for IPv6 Mobility extensions, needs:
+# CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6=y
+# in the kernel .config
+
+DESCRIPTION = "Mobile ipv6 extensions"
+
+inherit task
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "mipv6"
+RRECOMMENDS = "kernel-module-ipv6 \
+ kernel-module-mip6 \
+ "
+
#
# mt diff -raf1fa1ff21fbbd82c0b12c754f37cc126ee70b06 -rbbc1baeaddfacb1090f6b11e2821923c7c0872c4
#
#
#
# delete "packages/python/python-sword_1.5.8.bb"
#
# delete "packages/python/python-sword_1.5.9.bb"
#
# add_file "packages/python/python-sword_1.5.10.bb"
# content [73eb9b115d9b21296ba5df9e59506f3079400369]
#
# add_file "packages/sword/sword_1.5.10.bb"
# content [009e6b694d5ce33c34f3f5738c165c4347da10c9]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [1fe07d72af509c3c4379bfd590276993274cdb1f]
# to [20fd3e58d90f72b7479658ea3981372dfe01b9e5]
#
============================================================
--- packages/python/python-sword_1.5.10.bb 73eb9b115d9b21296ba5df9e59506f3079400369
+++ packages/python/python-sword_1.5.10.bb 73eb9b115d9b21296ba5df9e59506f3079400369
@@ -0,0 +1,32 @@
+DESCRIPTION = "Python bindings for the sword library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python-core sword"
+DEPENDS = "sword-${PV} swig-native"
+SRCNAME = "sword"
+PR = "r0"
+
+SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
+
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+
+inherit distutils autotools
+
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+ touch ltmain.sh
+ ./autogen.sh
+}
+
+do_compile() {
+ oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make
+}
+
+do_install() {
+ cd ${S}/python
+ distutils_do_install
+}
============================================================
--- packages/sword/sword_1.5.10.bb 009e6b694d5ce33c34f3f5738c165c4347da10c9
+++ packages/sword/sword_1.5.10.bb 009e6b694d5ce33c34f3f5738c165c4347da10c9
@@ -0,0 +1,19 @@
+DESCRIPTION = "The SWORD Project is an open source, cross-platform \
+(Linux, Windows, Solaris, MacOSX etc.) API and library for \
+Bible software with a constantly growing list of front-ends \
+(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
+SECTION = "libs"
+HOMEPAGE = "http://www.e-sword.net/"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--without-clucene --without-curl"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/python/python-pygtk_2.10.4.bb 1fe07d72af509c3c4379bfd590276993274cdb1f
+++ packages/python/python-pygtk_2.10.4.bb 20fd3e58d90f72b7479658ea3981372dfe01b9e5
@@ -1,12 +1,12 @@ SECTION = "devel/python"
DESCRIPTION = "Python GTK+ 2.10.x Bindings"
SECTION = "devel/python"
# needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+DEPENDS = "gtk+ libglade"
RDEPENDS = "python-shell python-pycairo python-pygobject"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
LICENSE = "LGPL"
-PR = "ml3"
+PR = "ml4"
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch;patch=1 \
@@ -19,16 +19,24 @@ do_configure_prepend() {
inherit autotools pkgconfig distutils-base
do_configure_prepend() {
- install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
}
-do_configure_prepend() {
- install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+ find ${D} -name "*.la"|xargs rm -f
+ rm -f ${D}/${bindir}/pygtk-codegen-2.0
+ rm -rf ${D}/${libdir}/pkgconfig
}
+# dirty fix #2: fix build system paths leaking in
require fix-path.inc
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+ ${libdir}/pygtk/2.0 \
+ ${bindir}/pygtk-* \
+ ${datadir}/pygtk/2.0"
do_stage() {
autotools_stage_includes
More information about the Openembedded-commits
mailing list