[oe-commits] org.oe.dev merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
crofton commit
oe at amethyst.openembedded.net
Thu Jun 26 14:34:08 UTC 2008
merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
and 'fb432a3c848fb8f9a30c288a565d9490a1d9b318'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 1b17ea5d09e29a9b9960e907c6a56908b349ff98
ViewMTN: http://monotone.openembedded.org/revision/info/1b17ea5d09e29a9b9960e907c6a56908b349ff98
Files:
1
classes/cross.bbclass
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/slugos.inc
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/linux/linux-omap2_git.bb
packages/linux/linux-ml403-slab-2.6.x
packages/linux/linux-xilinx-slab
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-xilinx-slab_git.bb
conf/machine/xilinx-ml403.conf
Diffs:
#
# mt diff -ra1c5133ec8dfc7768c8883c8aa89593ce01f57cb -r1b17ea5d09e29a9b9960e907c6a56908b349ff98
#
#
#
# patch "classes/cross.bbclass"
# from [504bbe85b9aae389cdf483045310b7f26d7a5fb4]
# to [bdd50d7b0204dc37533449d262a744351c880e4e]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [dd76fae2197a9207fa2eb5ccd100a425b415f4b4]
# to [96e99822b9d459465b271b5dfd924834b9d2cbfc]
#
# patch "conf/distro/include/slugos.inc"
# from [e9937cb440d5d5eb38f1c6255cb3f69aa58b60cc]
# to [00976339770c45e02a1ecc25cf9066a2c866eeea]
#
# patch "packages/freesmartphone/frameworkd/frameworkd.conf"
# from [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# to [adc83b19e793491b1c6ea0fd8b46cd9f32e592fc]
#
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
# from [658db2f7fe7fe3928fc05e76a952a169b2bc9c64]
# to [73ca8b8c42c79b772fe06bcb0e0613bfb87c755e]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [bf243f9340ade510c77ae6438ab331a53e498bfb]
# to [674c4ebb890b3779108c1a9fe1cd2caee70c1201]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [c5bedfacc57570fe043dfe40dad87e1a42afba5f]
# to [7fd2a3ff9f7cc0c8fb1e02633369915d8aa32c3e]
#
============================================================
--- classes/cross.bbclass 504bbe85b9aae389cdf483045310b7f26d7a5fb4
+++ classes/cross.bbclass bdd50d7b0204dc37533449d262a744351c880e4e
@@ -49,8 +49,8 @@ libdir = "${exec_prefix}/lib"
sbindir = "${exec_prefix}/bin"
libexecdir = "${exec_prefix}/libexec"
libdir = "${exec_prefix}/lib"
-includedir = "${exec_prefix}/include"
-oldincludedir = "${exec_prefix}/include"
+includedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
+oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
do_stage () {
oe_runmake install
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc dd76fae2197a9207fa2eb5ccd100a425b415f4b4
+++ conf/distro/include/preferred-om-2008-versions.inc 96e99822b9d459465b271b5dfd924834b9d2cbfc
@@ -1369,8 +1369,8 @@ PREFERRED_VERSION_openvpn ?= "2.0.9"
PREFERRED_VERSION_openswan ?= "2.4.7"
PREFERRED_VERSION_openttd ?= "0.4.0.1"
PREFERRED_VERSION_openvpn ?= "2.0.9"
-PREFERRED_VERSION_opkg-native ?= "4488"
-PREFERRED_VERSION_opkg ?= "4488"
+SRCREV_pn-opkg-native ?= "4488"
+SRCREV_pn-opkg ?= "4488"
PREFERRED_VERSION_oplinux-packages ?= "1.0"
PREFERRED_VERSION_oprofile ?= "0.9.3"
PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1530,8 +1530,8 @@ PREFERRED_VERSION_python-pygnome ?= "2.1
PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
PREFERRED_VERSION_python-pygame ?= "1.7.1"
PREFERRED_VERSION_python-pygnome ?= "2.16.2"
-PREFERRED_VERSION_python-pygobject ?= "2.12.3"
-PREFERRED_VERSION_python-pygobject-native ?= "2.12.3"
+PREFERRED_VERSION_python-pygobject ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
PREFERRED_VERSION_python-pygoogle ?= "0.6"
PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
PREFERRED_VERSION_python-pygtk ?= "2.10.4"
============================================================
--- conf/distro/include/slugos.inc e9937cb440d5d5eb38f1c6255cb3f69aa58b60cc
+++ conf/distro/include/slugos.inc 00976339770c45e02a1ecc25cf9066a2c866eeea
@@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+PREFERRED_PROVIDER_avahi ?= "avahi"
+PREFERRED_PROVIDER_gconf ?= "gconf"
+
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
============================================================
--- packages/freesmartphone/frameworkd/frameworkd.conf da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/freesmartphone/frameworkd/frameworkd.conf adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
@@ -0,0 +1 @@
+
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf 658db2f7fe7fe3928fc05e76a952a169b2bc9c64
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf 73ca8b8c42c79b772fe06bcb0e0613bfb87c755e
@@ -1,8 +1,15 @@
[idlenotifier]
-# don't read from accellerometers for now
+# don't read from accellerometers for GTA02
ignoreinput=2,3
[input]
-# don't read from accellerometers for now
+# don't read from accellerometers for GTA02
ignoreinput=2,3
+[ophoned]
+# GTA02 has TI Calypso
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir =
+../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
============================================================
--- packages/freesmartphone/frameworkd_git.bb bf243f9340ade510c77ae6438ab331a53e498bfb
+++ packages/freesmartphone/frameworkd_git.bb 674c4ebb890b3779108c1a9fe1cd2caee70c1201
@@ -5,7 +5,7 @@ PV = "0.8.0+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.8.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
============================================================
--- packages/linux/linux-omap2_git.bb c5bedfacc57570fe043dfe40dad87e1a42afba5f
+++ packages/linux/linux-omap2_git.bb 7fd2a3ff9f7cc0c8fb1e02633369915d8aa32c3e
@@ -2,9 +2,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "6604ac6c8a14d583a463159f3a1601427dab7e05"
+SRCREV = "af933cd32a5e14f119a4acb4fe20055f6f8ab1aa"
-PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
PR = "r30"
#
# mt diff -rfb432a3c848fb8f9a30c288a565d9490a1d9b318 -r1b17ea5d09e29a9b9960e907c6a56908b349ff98
#
#
#
# rename "packages/linux/linux-ml403-slab-2.6.x"
# to "packages/linux/linux-xilinx-slab"
#
# rename "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# to "packages/linux/linux-xilinx-slab_git.bb"
#
# patch "conf/machine/xilinx-ml403.conf"
# from [6a5a1fcae1d1b17467cc67066deb5c97c1437fc8]
# to [0e140654c8328017be93eae75e53f91d1209746f]
#
# patch "packages/linux/linux-xilinx-slab_git.bb"
# from [1dedc8ec0ccb14b25d9979db1e4af75c63668f9a]
# to [b4322bd352236d2cf6ff13d326e765337da3772d]
#
============================================================
--- conf/machine/xilinx-ml403.conf 6a5a1fcae1d1b17467cc67066deb5c97c1437fc8
+++ conf/machine/xilinx-ml403.conf 0e140654c8328017be93eae75e53f91d1209746f
@@ -7,7 +7,7 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc405"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x"
+PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab"
MACHINE_FEATURES = "kernel26 ext2"
============================================================
--- packages/linux/linux-ml403-slab-2.6.x_git.bb 1dedc8ec0ccb14b25d9979db1e4af75c63668f9a
+++ packages/linux/linux-xilinx-slab_git.bb b4322bd352236d2cf6ff13d326e765337da3772d
@@ -4,18 +4,20 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
LICENSE = "GPL"
-PR = "r2"
-PV = "2.6+git${SRCDATE}"
-COMPATIBLE_MACHINE = "xilinx-ml403"
+SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
-SRC_URI = "file://xilinx-ml403_defconfig "
+PR = "r3"
+PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
-inherit kernel xilinx-bsp
+COMPATIBLE_MACHINE = "xilinx-ml403"
-S = "${WORKDIR}/linux-2.6"
+#inherit kernel xilinx-bsp
+inherit kernel
+S = "${WORKDIR}/git"
+
FILES_kernel-image = "/boot/zImage.elf"
export OS = "Linux"
@@ -23,49 +25,15 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zI
KERNEL_IMAGETYPE = "zImage"
KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
-#make sure git-native gets build before as
-python __anonymous () {
+SRC_URI = "\
+ git://git.secretlab.ca/git/linux-2.6-virtex.git;protocol=git \
+ "
- import bb
-
-
- depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
- depends = depends + " git-native:do_populate_staging"
- bb.data.setVarFlag('do_fetch', 'depends', depends, d)
-
-}
-
-
-do_fetch () {
-
- cd ${WORKDIR}
- ${STAGING_BINDIR_NATIVE}/git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
- cd linux-2.6
- ${STAGING_BINDIR_NATIVE}/git clone git://git.secretlab.ca/git/linux-2.6-virtex.git master
-}
-
-
-
do_configure() {
- install -m 644 ${WORKDIR}/xilinx-ml403_defconfig ${S}/.config
- make ARCH=${ARCH} oldconfig
+ make ARCH=${ARCH} ml403_defconfig
}
-do_stage_append () {
-#need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
-
- install -d ${STAGING_KERNEL_DIR}/arch/
- cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
-
- install -d ${STAGING_KERNEL_DIR}/include/asm
- cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
-}
-
-
-
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
@@ -74,7 +42,7 @@ do_deploy() {
#seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)
#so we need to copy the kernel image where kernel.bbclass expects it to be
+#do_install_prepend() {
+# install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
+# arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+#}
-do_install_prepend() {
- install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
- arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-}
More information about the Openembedded-commits
mailing list