[oe-commits] org.oe.dev merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'
pb commit
oe at amethyst.openembedded.net
Sun Jul 27 10:54:11 UTC 2008
merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'
and '1be001dbcc12db3d86ea2666b2fde9a5fa4bddb6'
Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: d0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc
ViewMTN: http://monotone.openembedded.org/revision/info/d0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc
Files:
1
packages/mesa/files/mklib-cross.patch
packages/mesa/mesa-dri_7.0.3.bb
packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
packages/mesa/mesa-dri_6.5.2.bb
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/openmoko.conf
packages/images/fso-image.bb
Diffs:
#
# mt diff -r0f42cd616108360d027b0381a276d5b1a3cf26fa -rd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc
#
#
#
# add_file "packages/mesa/files/mklib-cross.patch"
# content [5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457]
#
# add_file "packages/mesa/mesa-dri_7.0.3.bb"
# content [5d4a0c4a70a84c4f229000a50d59787d2df46405]
#
# patch "packages/lirc/lirc-modules_0.8.3+cvs20080713.bb"
# from [89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec]
# to [2501f84812bd4886c523ca926fa3ba6f73412213]
#
# patch "packages/mesa/mesa-dri_6.5.2.bb"
# from [52f888551f42e13c2bbb0e72aacb6e76e146ab4b]
# to [9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8]
#
============================================================
--- packages/mesa/files/mklib-cross.patch 5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
+++ packages/mesa/files/mklib-cross.patch 5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
@@ -0,0 +1,14 @@
+--- s/bin/mklib~ 2008-02-19 15:30:18.000000000 +0000
++++ s/bin/mklib 2008-07-27 11:15:25.000000000 +0100
+@@ -204,9 +204,9 @@
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=$CXX
+ else
+- LINK=gcc
++ LINK=$CC
+ fi
+ fi
+
============================================================
--- packages/mesa/mesa-dri_7.0.3.bb 5d4a0c4a70a84c4f229000a50d59787d2df46405
+++ packages/mesa/mesa-dri_7.0.3.bb 5d4a0c4a70a84c4f229000a50d59787d2df46405
@@ -0,0 +1,42 @@
+include mesa-common.inc
+
+# suppress mklib-rpath-link patch from mesa-common
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+
+FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+PR = "r0"
+
+DEPENDS += "libdrm"
+# DRI is useless without the kernel drivers
+RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
+
+do_configure() {
+ cd configs
+
+ ln -sf linux-dri current
+ sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+ sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+ sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+ sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+ sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+ sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+ sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile
+ echo "SRC_DIRS = mesa" >> current
+ echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
+}
+
+do_install() {
+ oe_runmake -C src/mesa/drivers/dri install
+}
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
+
+python populate_packages_prepend () {
+ import re, os.path
+
+ do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+}
+
============================================================
--- packages/lirc/lirc-modules_0.8.3+cvs20080713.bb 89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec
+++ packages/lirc/lirc-modules_0.8.3+cvs20080713.bb 2501f84812bd4886c523ca926fa3ba6f73412213
@@ -16,7 +16,7 @@ require lirc-config.inc
require lirc-config.inc
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers"
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make V=1' -C drivers"
fakeroot do_install() {
oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
============================================================
--- packages/mesa/mesa-dri_6.5.2.bb 52f888551f42e13c2bbb0e72aacb6e76e146ab4b
+++ packages/mesa/mesa-dri_6.5.2.bb 9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8
@@ -1,5 +1,7 @@ include mesa-common.inc
include mesa-common.inc
+SRC_URI += " file://mklib-cross.patch;patch=1"
+
FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
PACKAGES_DYNAMIC = "mesa-dri-driver-*"
#
# mt diff -r1be001dbcc12db3d86ea2666b2fde9a5fa4bddb6 -rd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
# from [85b9d88526b7e40205f13f547c01c721f42fa32f]
# to [628f04b4b86a64fdc89bf6da6312cb3ddd89b323]
#
# 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/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 \
More information about the Openembedded-commits
mailing list