[oe-commits] org.oe.dev merge of 'bb233fef5b7011690cc33565cb45dadb42be30c7'
oe commit
oe at amethyst.openembedded.net
Sun Jul 27 14:27:05 UTC 2008
merge of 'bb233fef5b7011690cc33565cb45dadb42be30c7'
and 'f22e68740932b52d4128634598e1377947560f47'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4457908c2938cd6ab18153d33531a38d4066e494
ViewMTN: http://monotone.openembedded.org/revision/info/4457908c2938cd6ab18153d33531a38d4066e494
Files:
1
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/openmoko.conf
packages/images/fso-image.bb
packages/openchrome/openchrome.inc
packages/openchrome/openchrome_svn.bb
packages/openchrome/xf86-video-openchrome_0.2.902.bb
packages/tasks/task-mythfront.bb
Diffs:
#
# mt diff -rbb233fef5b7011690cc33565cb45dadb42be30c7 -r4457908c2938cd6ab18153d33531a38d4066e494
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
# from [85b9d88526b7e40205f13f547c01c721f42fa32f]
# to [628f04b4b86a64fdc89bf6da6312cb3ddd89b323]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [37caae48109ecf51cac36b99d1c159bf899e43a0]
# to [94e55ff2e17a2b6a78e02b39d7246a1ee7dbe9b0]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [1f2ab31eceb6206825c9568b313ab48c224c8863]
# to [2bfeeb7d101578d2eb6340c6d44b4de3c211d7bd]
#
# patch "conf/distro/openmoko.conf"
# from [56485e49938379e78da05fc595ef5d2edef9dd28]
# to [ee68bedb7c293916d63371c4a1679786be088e72]
#
# patch "packages/images/fso-image.bb"
# from [8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2]
# to [5c8597f6d160a644126f564543e5c4e542223e4b]
#
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko.inc 85b9d88526b7e40205f13f547c01c721f42fa32f
+++ conf/distro/include/angstrom-2007-for-openmoko.inc 628f04b4b86a64fdc89bf6da6312cb3ddd89b323
@@ -6,11 +6,6 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-# If you want to use the angstrom 2007.12 release or if
-# you want to base you distro on angstrom 2007, switch to
-# the org.openembedded.angstrom-2007.12-stable branch
-# THIS FILE WILL GO AWAY IN JANUARY 2008!!
-
DISTRO_VERSION = "2007.11RC3"
DISTRO_REVISION = "51"
@@ -33,31 +28,13 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
-# These will be put under package management soon
-#FEED_URIS += " \
-# no-arch##${ANGSTROM_URI}/unstable/feed/all \
-# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
-# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
-# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
-# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
-
-
# set feed path variables
FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
-CVS_TARBALL_STASH ?= "\
- http://www.angstrom-distribution.org/unstable/sources/ \
- http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
- "
+CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/"
-
#Make sure we use 2.6 on machines with a 2.4/2.6 selector
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
============================================================
--- conf/distro/include/moko-autorev.inc 37caae48109ecf51cac36b99d1c159bf899e43a0
+++ conf/distro/include/moko-autorev.inc 94e55ff2e17a2b6a78e02b39d7246a1ee7dbe9b0
@@ -3,6 +3,7 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-exposure ?= "${AUTOREV}"
SRCREV_pn-illume ?= "${AUTOREV}"
SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
SRCREV_pn-libgsmd ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc 1f2ab31eceb6206825c9568b313ab48c224c8863
+++ conf/distro/include/sane-srcdates.inc 2bfeeb7d101578d2eb6340c6d44b4de3c211d7bd
@@ -1,4 +1,5 @@
-# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
+# Lock down some SRCDATEs
+# See http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
# Kernel modules
SRCDATE_at76c503a-modules ?= "20060814"
============================================================
--- conf/distro/openmoko.conf 56485e49938379e78da05fc595ef5d2edef9dd28
+++ conf/distro/openmoko.conf ee68bedb7c293916d63371c4a1679786be088e72
@@ -10,19 +10,19 @@ require conf/distro/include/angstrom-200
#
# Header
#
-DISTRO_NAME = "Openmoko"
-DISTRO_VERSION = "P1-Snapshot-${DATE}"
+DISTRO_NAME = "openmoko"
+DISTRO_VERSION = "-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
DISTRO = "openmoko"
OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
-ANGSTROM_FEED_CONFIGS = "openmoko-feed-configs"
+ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs"
# 2.18 seems to break badly on 64-bit systems
PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
@@ -31,12 +31,13 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
# we want the openmoko svn version of gsmd
PREFERRED_PROVIDER_libgsmd = "libgsmd"
-# Bleeding-edge developers should add the following line to their local.conf:
+# Bleeding-edge developers should add the following lines to their local.conf:
# require conf/distro/include/moko-autorev.inc
+# require conf/distro/include/fso-autorev.inc
# override the PACKAGE_ARCH of certain packages for openmoko distro
#
-# Same kernel runs on both these machines
+# Same kernel used to run on both these machines...
# Currently not used but left here in case someone wants to switch on
# quickly
#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"
============================================================
--- packages/images/fso-image.bb 8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2
+++ packages/images/fso-image.bb 5c8597f6d160a644126f564543e5c4e542223e4b
@@ -40,6 +40,7 @@ TOOLS_INSTALL = "\
# useful command line tools
TOOLS_INSTALL = "\
# bash \
+ dosfstools \
htop \
iptables \
lsof \
#
# mt diff -rf22e68740932b52d4128634598e1377947560f47 -r4457908c2938cd6ab18153d33531a38d4066e494
#
#
#
# patch "packages/openchrome/openchrome.inc"
# from [6b05f1276b7c3b8ed66ecb3b304ef3578d60373f]
# to [9289056713085ea3b218f5a8361f128dfdcbd4b4]
#
# patch "packages/openchrome/openchrome_svn.bb"
# from [09a235effbb87c3702c8b93749812c0d5f51ab2f]
# to [620d7da746e80389843521b8fa4261bccf240ced]
#
# patch "packages/openchrome/xf86-video-openchrome_0.2.902.bb"
# from [af8e84ea948021194f8c0a6a0b2648d7dfde2bac]
# to [aa063269846ae6af14936f70f285fc3e2fa39659]
#
# patch "packages/tasks/task-mythfront.bb"
# from [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
# to [57152c79e113714f749f454369eb70e26b0853d2]
#
============================================================
--- packages/openchrome/openchrome.inc 6b05f1276b7c3b8ed66ecb3b304ef3578d60373f
+++ packages/openchrome/openchrome.inc 9289056713085ea3b218f5a8361f128dfdcbd4b4
@@ -1,5 +1,4 @@ PACKAGES = "libviaXvMC libviaXvMCPro lib
PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
-PACKAGES_DYNAMIC = "xorg-driver-via"
FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
============================================================
--- packages/openchrome/openchrome_svn.bb 09a235effbb87c3702c8b93749812c0d5f51ab2f
+++ packages/openchrome/openchrome_svn.bb 620d7da746e80389843521b8fa4261bccf240ced
@@ -1,4 +1,5 @@ S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http"
S = "${WORKDIR}/trunk"
+PACKAGES_DYNAMIC = "xorg-driver-via"
include openchrome.inc
============================================================
--- packages/openchrome/xf86-video-openchrome_0.2.902.bb af8e84ea948021194f8c0a6a0b2648d7dfde2bac
+++ packages/openchrome/xf86-video-openchrome_0.2.902.bb aa063269846ae6af14936f70f285fc3e2fa39659
@@ -1,3 +1,4 @@ SRC_URI = "http://www.openchrome.org/rel
SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+PACKAGES_DYNAMIC = "xorg-driver-openchrome"
include openchrome.inc
============================================================
--- packages/tasks/task-mythfront.bb 9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9
+++ packages/tasks/task-mythfront.bb 57152c79e113714f749f454369eb70e26b0853d2
@@ -1,11 +1,11 @@ DESCRIPTION = "Meta-package for MythTV d
DESCRIPTION = "Meta-package for MythTV diskless frontend"
-PR = "r14"
+PR = "r16"
inherit task
-RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
+RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
-RDEPENDS_${PN}_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+RDEPENDS_${PN}_append_epia = " xorg-driver-openchrome mesa-dri-driver-unichrome"
PACKAGE_ARCH_epia = "${MACHINE_ARCH}"
More information about the Openembedded-commits
mailing list