summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildconf/bblayers.conf2
-rw-r--r--buildconf/local.conf7
-rw-r--r--recipes-bsp/alsa-state/alsa-state/gaga1
-rw-r--r--recipes-bsp/u-boot/u-boot_2011.06.bbappend4
-rw-r--r--recipes-kernel/linux/linux-colibri-t20_git.bb5
-rw-r--r--recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch14
-rw-r--r--recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend6
-rw-r--r--recipes-lxde/lxdm/lxdm/configfiles.patch31
-rw-r--r--recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch25
-rw-r--r--recipes-lxde/lxdm/lxdm_0.4.1.bbappend6
-rw-r--r--recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend4
-rw-r--r--recipes/base-files/base-files_3.0.14.bbappend5
-rw-r--r--recipes/images/angstrom-lxde-image.bb31
-rw-r--r--recipes/images/console-trdx-image.bb11
-rw-r--r--recipes/images/trdx-extra.inc1
-rw-r--r--recipes/images/trdx-image-fstype.inc26
16 files changed, 148 insertions, 31 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 6909a3e..60329ee 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -24,7 +24,7 @@ BSPLAYERS ?= " \
BBLAYERS ?= " \
${TOPDIR}/../stuff/meta-angstrom \
- ${BASELAYERS}\
${BSPLAYERS} \
+ ${BASELAYERS}\
${TOPDIR}/../stuff/openembedded-core/meta \
"
diff --git a/buildconf/local.conf b/buildconf/local.conf
index 50f6da5..91b7ccb 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -17,12 +17,12 @@
# These two options control how much parallelism BitBake should use. The first
# option determines how many tasks bitbake should run in parallel:
#
-BB_NUMBER_THREADS = "2"
+BB_NUMBER_THREADS = "4"
#
# The second option controls how many processes make should run in parallel when
# running compile tasks:
#
-PARALLEL_MAKE = "-j 2"
+PARALLEL_MAKE = "-j 4"
#
# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
# be appropriate for example.
@@ -82,9 +82,8 @@ MACHINE ?= "colibri-t20"
#
# The default is a tmp directory under TOPDIR.
#
+#TMPDIR = "/mnt/sdb1/tegradev/oe-core/build/out"
TMPDIR = "${TOPDIR}/out"
-
-
#
# Package Management configuration
#
diff --git a/recipes-bsp/alsa-state/alsa-state/gaga b/recipes-bsp/alsa-state/alsa-state/gaga
new file mode 100644
index 0000000..6c604cf
--- /dev/null
+++ b/recipes-bsp/alsa-state/alsa-state/gaga
@@ -0,0 +1 @@
+hu \ No newline at end of file
diff --git a/recipes-bsp/u-boot/u-boot_2011.06.bbappend b/recipes-bsp/u-boot/u-boot_2011.06.bbappend
index ec7b4f6..27c3c61 100644
--- a/recipes-bsp/u-boot/u-boot_2011.06.bbappend
+++ b/recipes-bsp/u-boot/u-boot_2011.06.bbappend
@@ -34,8 +34,8 @@ PV_colibri-t30 = "${PR}+gitr${SRCREV}"
# internal SVN #####################################################################################################################
S = "${WORKDIR}/bootloader/u-boot"
-SRCREV_COLIBRI = "320"
-SRC_URI_COLIBRI = "svn://tegradev:tegra123!@mammut.toradex.int:8090/colibri_tegra_linux/trunk;module=bootloader/u-boot;rev=${SRCREV_COLIBRI};proto=http \
+SRCREV_COLIBRI = "321"
+SRC_URI_COLIBRI = "svn://tegradev:tegra123!@mammut.toradex.int:8090/colibri_tegra_linux/trunk;module=bootloader/u-boot;rev=${SRCREV_COLIBRI};protocol=http \
"
#####################################################################################################################
diff --git a/recipes-kernel/linux/linux-colibri-t20_git.bb b/recipes-kernel/linux/linux-colibri-t20_git.bb
index d3c0d7d..a461544 100644
--- a/recipes-kernel/linux/linux-colibri-t20_git.bb
+++ b/recipes-kernel/linux/linux-colibri-t20_git.bb
@@ -7,7 +7,10 @@ LINUX_VERSION ?= "3.1.10"
#L4T R15 first run
#SRCREV = "4f48c4961b86b4df1bcb4b1b535bc1c3d158b5af"
#L4T R15, optimized config, bcm4329 warnings removed
-SRCREV = "b562b12b12ba303d5ceca17b347d8c506e18f7f4"
+#SRCREV = "b562b12b12ba303d5ceca17b347d8c506e18f7f4"
+#Nand timings for 1.1, asix driver update, asix driver patch autodetach
+SRCREV = "4dec0ae6f55768ba0acef97ff2c67f7d5d4663fe"
+
PV = "${LINUX_VERSION}+gitr${SRCREV}"
PR = "V2.0b1"
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch
new file mode 100644
index 0000000..45bd988
--- /dev/null
+++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch
@@ -0,0 +1,14 @@
+--- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200
++++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200
+@@ -53,7 +53,10 @@
+ id=pcmanfm.desktop
+ }
+ Button {
+- id=firefox.desktop
++ id=mozilla-firefox.desktop
++ }
++ Button {
++ id=lxterminal.desktop
+ }
+ }
+ }
diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
index d4b5b35..e63cf4b 100644
--- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
+++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
@@ -1,10 +1,9 @@
-PRINC = "1"
+PRINC = "2"
WALLPAPER-MACHINE = "toradex-neutral.png"
WALLPAPER-MACHINE_colibri-t20 = "toradex-t20.png"
WALLPAPER-MACHINE_colibri-t30 = "toradex-t30.png"
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
SRC_URI += " \
file://autostart.patch \
@@ -15,6 +14,7 @@ SRC_URI += " \
file://desktop.conf \
file://defaults.list \
file://hdmiaudio.sh \
+ file://panel-buttons.patch \
"
do_install_append () {
diff --git a/recipes-lxde/lxdm/lxdm/configfiles.patch b/recipes-lxde/lxdm/lxdm/configfiles.patch
index 37ed74d..7ac93cb 100644
--- a/recipes-lxde/lxdm/lxdm/configfiles.patch
+++ b/recipes-lxde/lxdm/lxdm/configfiles.patch
@@ -1,6 +1,6 @@
diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf
--- lxdm-0.4.1/data.orig//lxdm.conf 2011-07-29 15:44:51.000000000 +0200
-+++ lxdm-0.4.1/data/lxdm.conf 2011-12-31 12:22:46.000000000 +0100
++++ lxdm-0.4.1/data/lxdm.conf 2012-07-25 17:50:13.101251148 +0200
@@ -1,6 +1,6 @@
[base]
## uncomment and set autologin username to enable autologin
@@ -9,6 +9,35 @@ diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf
## uncomment and set timeout to enable timeout autologin,
## the value should >=5
+@@ -16,7 +16,7 @@
+ # xauth_path=/tmp
+
+ ## greeter used to welcome the user
+-greeter=/usr/local/libexec/lxdm-greeter-gtk
++greeter=/usr/libexec/lxdm-greeter-gtk
+
+ [server]
+ ## arg used to start xserver, not fully function
+diff -Naur --exclude temp lxdm-0.4.1-r3.orig/lxdm-0.4.1/data/lxdm.conf.in lxdm-0.4.1-r3/lxdm-0.4.1/data/lxdm.conf.in
+--- lxdm-0.4.1/data/lxdm.conf.in 2012-07-25 10:47:22.681189278 +0200
++++ lxdm-0.4.1/data/lxdm.conf.in 2012-07-25 17:49:49.861217834 +0200
+@@ -1,6 +1,6 @@
+ [base]
+ ## uncomment and set autologin username to enable autologin
+-# autologin=dgod
++autologin=root
+
+ ## uncomment and set timeout to enable timeout autologin,
+ ## the value should >=5
+@@ -16,7 +16,7 @@
+ # xauth_path=/tmp
+
+ ## greeter used to welcome the user
+-greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
++greeter=/usr/libexec/lxdm-greeter-gtk
+
+ [server]
+ ## arg used to start xserver, not fully function
diff -ur lxdm-0.4.1/data.orig//PostLogout.in lxdm-0.4.1/data/PostLogout.in
--- lxdm-0.4.1/data.orig//PostLogout.in 2011-07-29 15:42:33.000000000 +0200
+++ lxdm-0.4.1/data/PostLogout.in 2011-12-31 12:21:41.000000000 +0100
diff --git a/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch b/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch
new file mode 100644
index 0000000..f0ca23b
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch
@@ -0,0 +1,25 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
+--
+1.7.4.1
+
diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
index ce46a81..57589d9 100644
--- a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
+++ b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
@@ -1,11 +1,11 @@
-PRINC = "1"
+PRINC = "2"
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://missingAM_GLIB_GNU_GETTEXT.patch \
file://configfiles.patch \
+ file://fix_event_check_bug_caused_cpu_100.patch \
"
pkg_postinst_${PN}() {
# Register up as default dm
diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend b/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend
new file mode 100644
index 0000000..5c21d6a
--- /dev/null
+++ b/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend
@@ -0,0 +1,4 @@
+PRINC = "1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index ca35824..6772d6b 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,3 @@
-PRINC = "3"
+PRINC = "4"
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index f875074..fc936db 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -4,7 +4,11 @@ DESCRIPTION = "Image based on the LXDE desktop"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r1"
+PV = "V2.0"
+PR = "r3"
+
+#create the deployment directory-tree
+require trdx-image-fstype.inc
#create the file /etc/timestamp
IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
@@ -18,19 +22,19 @@ IMAGE_LINGUAS = "en-us"
#MAYBE WE WILL NEED THESE ALSO:
# xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils
-IMAGE_SPLASH = "psplash-angstrom"
-PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
-PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
-
DISTRO_UPDATE_ALTERNATIVES ??= ""
ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}'
-CONMANPKGS = ""
-#CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome"
+#CONMANPKGS = ""
+CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome"
CONMANPKGS_libc-uclibc = ""
DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly"
+#deploy the OpenGL ES headers to the sysroot
+DEPENDS += "nvsamples"
+
+
# Additional X libs not pulled in by any package \
# xtrans libxevie \
@@ -68,8 +72,10 @@ zeroconf \
IMAGE_INSTALL += " \
${IMAGE_INSTALL_CLASSIC} \
+ virtual-psplash \
angstrom-task-boot \
task-basic \
+ udev-extra-rules \
${CONMANPKGS} \
${ROOTFS_PKGMANAGE_PKGS} \
timestamp-service \
@@ -86,7 +92,6 @@ IMAGE_INSTALL += " \
xhost \
xset \
\
- ${IMAGE_SPLASH} \
${XSERVER} \
xrandr \
xrdb \
@@ -113,6 +118,7 @@ IMAGE_INSTALL += " \
gst-plugins-base-theora \
gst-plugins-base-videotestsrc \
gst-plugins-base-vorbis \
+ gst-plugins-good-isomp4 \
gst-plugins-good-matroska \
gst-plugins-good-rtp \
gst-plugins-good-udp \
@@ -121,12 +127,15 @@ IMAGE_INSTALL += " \
gst-plugins-good-wavparse \
gst-plugins-ugly-asf \
libpcre \
+ libpcreposix \
libxcomposite \
- firefox \
- flash-plugins \
+ alsa-states \
"
-# gst-plugin-qtdemux
+# firefox at the moment segfaults
+# firefox \
+# flash-plugins \
+
# gst-plugin-mpegdemux
require lx.inc
diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 5531579..5425dc9 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -4,11 +4,17 @@ DESCRIPTION = "Image booting to a console"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PV = "ConsoleV2.0"
+PR = "r3"
+
+#create the deployment directory-tree
+require trdx-image-fstype.inc
+
#create the file /etc/timestamp
IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
#IMAGE_LINGUAS = ""
-#IMAGE_LINGUAS = "en-us"
+IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
@@ -17,7 +23,8 @@ ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",
DISTRO_UPDATE_ALTERNATIVES ??= ""
ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}'
-CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd"
+CONMANPKGS = ""
+#CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome"
CONMANPKGS_libc-uclibc = ""
diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc
index ed0c367..6058ffc 100644
--- a/recipes/images/trdx-extra.inc
+++ b/recipes/images/trdx-extra.inc
@@ -29,6 +29,7 @@ IMAGE_INSTALL += " \
joe \
minicom \
ldd \
+ lsof \
mtd-utils \
update-modules \
\
diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
new file mode 100644
index 0000000..2ffb8f4
--- /dev/null
+++ b/recipes/images/trdx-image-fstype.inc
@@ -0,0 +1,26 @@
+#create the deployment directory-tree
+
+BURNFLASH := "${THISDIR}/files/burnflash.tar.bz2"
+S = "${WORKDIR}/burnflash"
+IMAGE_ROOTFS = "${WORKDIR}/T20_LinuxImage${PV}/rootfs"
+
+do_rootfs_prepend() {
+ tar -C ${WORKDIR} -xf ${BURNFLASH}
+ mkdir -p ${IMAGE_ROOTFS}
+ cp -pPr ${S}/* ${IMAGE_ROOTFS}/../
+}
+
+do_rootfs_append() {
+ # put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot
+ rm ${IMAGE_ROOTFS}/boot/uImage*
+ cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${IMAGE_ROOTFS}/../bin/
+ mv ${IMAGE_ROOTFS}/../bin/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/uImage
+
+ cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../bin/
+ rm ${IMAGE_ROOTFS}/../bin/u-boot-hsmmc-${MACHINE}.bin
+ mv ${IMAGE_ROOTFS}/../bin/u-boot-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/u-boot.bin
+
+ #create tarball
+ DATE=`date +%Y%m%d`
+ cd ${WORKDIR}; tar -cjvf ${DEPLOY_DIR_IMAGE}/T20_LinuxImage${PV}_${DATE}.tar.bz2 T20_LinuxImage${PV}
+}