[oe-commits] org.oe.dev merge of '124fe75a3b9c5f57669cab2b1f729871b642205b'
oe commit
openembedded-commits at lists.openembedded.org
Tue Dec 4 17:34:40 UTC 2007
merge of '124fe75a3b9c5f57669cab2b1f729871b642205b'
and 'e7392dcc74d2fbda5883939005e2fad09efab025'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: af1fa1ff21fbbd82c0b12c754f37cc126ee70b06
ViewMTN: http://monotone.openembedded.org/revision/info/af1fa1ff21fbbd82c0b12c754f37cc126ee70b06
Files:
1
contrib/angstrom/build-release.sh
packages/images/console-mipv6-image.bb
packages/mipl-mipv6/mipv6_2.0.2.bb
packages/sofia-sip/sofia-sip.inc
packages/tasks/task-mipl.bb
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/sofia-sip/sofia-sip_1.11.7.bb
packages/sofia-sip/sofia-sip_1.12.7.bb
mtn:execute
true
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:
#
# mt diff -r124fe75a3b9c5f57669cab2b1f729871b642205b -raf1fa1ff21fbbd82c0b12c754f37cc126ee70b06
#
#
#
# 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/sofia-sip/sofia-sip.inc"
# content [c24ba4a0c665800fdcb52e018dbb56fe3bcae31d]
#
# add_file "packages/tasks/task-mipl.bb"
# content [6524ebb4dd47f3984406053cebd25e3e8724b3b6]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [0333915fd642b2db9af96929a6b9fd60df4292bc]
# to [0556daa097782b542ec3ef3bc2bc525d58b78091]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [1ea5dcfd838edd17ffbc00d7af4de7866da4c071]
# to [2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [2fd8530be37218a5cbf35df8dc71e053e5a2e088]
# to [0f1c46770dd8bc83dea22c584f64a2519be26f18]
#
# patch "packages/sofia-sip/sofia-sip_1.11.7.bb"
# from [83b18f606b66c599ad5d66057b22875655622b58]
# to [0c00d5fa650a8d1942355f3e313bfb2330037e3f]
#
# patch "packages/sofia-sip/sofia-sip_1.12.7.bb"
# from [bb742997aa1803f55576e4c877140c8956ea13ce]
# to [6c87f9c6b4b19efc4d6126360c6bcd851eac9dd6]
#
# 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/sofia-sip/sofia-sip.inc c24ba4a0c665800fdcb52e018dbb56fe3bcae31d
+++ packages/sofia-sip/sofia-sip.inc c24ba4a0c665800fdcb52e018dbb56fe3bcae31d
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
+HOMEPAGE = "http://sofia-sip.sourceforge.net/"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+PACKAGES += " ${PN}-bin ${PN}-glib"
+
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/libsofia-sip-ua.so.*"
+FILES_${PN}-dev += "${datadir}/sofia-sip/*.awk"
+FILES_${PN}-glib = "${libdir}/libsofia-sip-ua-glib.so.*"
+
+LEAD_SONAME = "libsofia-sip-ua.so"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- 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 \
+ "
+
============================================================
--- conf/distro/angstrom-2007.1.conf 0333915fd642b2db9af96929a6b9fd60df4292bc
+++ conf/distro/angstrom-2007.1.conf 0556daa097782b542ec3ef3bc2bc525d58b78091
@@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-
# Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/xserver
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_esound ?= "pulseaudio"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
============================================================
--- conf/distro/angstrom-2008.1.conf 1ea5dcfd838edd17ffbc00d7af4de7866da4c071
+++ conf/distro/angstrom-2008.1.conf 2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126
@@ -103,6 +103,7 @@ require conf/distro/include/preferred-xo
# Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/xserver
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_esound ?= "pulseaudio"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 2fd8530be37218a5cbf35df8dc71e053e5a2e088
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 0f1c46770dd8bc83dea22c584f64a2519be26f18
@@ -776,7 +776,7 @@ PREFERRED_VERSION_kf ?= "0.5.4.1"
PREFERRED_VERSION_keymaps ?= "1.0"
PREFERRED_VERSION_keyring ?= "0.6.8"
PREFERRED_VERSION_kf ?= "0.5.4.1"
-PREFERRED_VERSION_kismet ?= "2007-01-R1b"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
PREFERRED_VERSION_klibc ?= "1.1.1"
PREFERRED_VERSION_klimt ?= "0.6.1"
PREFERRED_VERSION_knights ?= "1.14"
============================================================
--- packages/sofia-sip/sofia-sip_1.11.7.bb 83b18f606b66c599ad5d66057b22875655622b58
+++ packages/sofia-sip/sofia-sip_1.11.7.bb 0c00d5fa650a8d1942355f3e313bfb2330037e3f
@@ -1,13 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
-PR = "r1"
+require sofia-sip.inc
+PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
============================================================
--- packages/sofia-sip/sofia-sip_1.12.7.bb bb742997aa1803f55576e4c877140c8956ea13ce
+++ packages/sofia-sip/sofia-sip_1.12.7.bb 6c87f9c6b4b19efc4d6126360c6bcd851eac9dd6
@@ -1,12 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
+require sofia-sip.inc
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
#
# mt diff -re7392dcc74d2fbda5883939005e2fad09efab025 -raf1fa1ff21fbbd82c0b12c754f37cc126ee70b06
#
#
#
# delete "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#
# delete "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#
More information about the Openembedded-commits
mailing list