Re: [oe] meta-oe: midori build fails with linker error
On Wed, 31 Aug 2011, Andreas Müller wrote: On Wednesday, August 31, 2011 08:25:16 AM Andreas Müller wrote: [...] angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.5.4/ld: note: 'JSContextGetGlobalObject' is defined in DSO /home/Superandy/tmp/oe-core- eglibc/sysroots/overo/usr/lib/libjavascriptcoregtk-1.0.so.0 so try adding it to the linker command line | /home/Superandy/tmp/oe-core- eglibc/sysroots/overo/usr/lib/libjavascriptcoregtk-1.0.so.0: could not read symbols: Invalid operation | collect2: ld returned 1 exit status we are not alone [1]... Andreas [1] https://bugs.launchpad.net/midori/+bug/799196 Hi, LDFLAGS_append = -ljavascriptcoregtk-1.0 should do the work. Best regards, Bernhard -- Scanned by MailScanner. ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] How to customize Angstrom using OE?
Hi, I'm not a OE expert.I want to have deep understanding of OE's conf files.My board is craneboard and i did standart distro and machine configuration.(Dıstro=angstrom-2010.x,Machine=am3517-crane) I have two question for you. 1= I want to edit Angstrom and customize it for me.(Sth like own rootfs but editing Angstrom for example i dont want qt thins in my rootfs ).When i dig x11-gpe-image.bb, i couldnt find what they consist of.I thought i can be angstrom-2010.x-preferred-versions but im not sure.As a result i want to have a rootfs which doesn't consist qt libraries, how can i do it using OE and Angstrom? 2= When i dig angstrom-2010.x.conf, i couldnt find any configuration settings about which linux kernel it will compile.It just tell MACHINE_KERNEL_VERSION 2.6 and at bottom of angstrom-2010.x.conf i saw PREFERRED_PROVIDER_virtual/kernel_beagleboard = linux-omap PREFERRED_VERSION_linux-omap_beagleboard = 2.6.39 when i go linux-omap directory which is in recipes/linux, linux-omap doesnt contain craneboard.I made a search in /recipes/linux for craneboard,i found it at /recipes/linux/linux-omap-psp-2.6.32, and images which i created realy use 2.6.32 linux kernel.But it writes nowhere in config files.Where is it? How oe goes there and takes that config file? Confused Thanks -- Buğra AYDOĞAR Kocaeli University ElectronicTelecommunication Engineering E-Mail:bugra.aydogar1...@kocaeli.edu.tr Phone: +905327306640 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-xfce] task-xfce-base: add thunar-volman
This fixes: ERROR: There is a comment on line 34 of file /OE/tentacle/sources/meta-openembedded/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb (#thunar-volman \) which is in the middle of a multiline expression. Bitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change. Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta-xfce/recipes-xfce/tasks/task-xfce-base.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb index 8a87203..7589f6d 100644 --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb +++ b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb @@ -2,7 +2,7 @@ DESCRIPTION = All packages required for a base installation of XFCE SECTION = x11/wm LICENSE = MIT LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 -PR = r0 +PR = r1 inherit task @@ -31,5 +31,5 @@ RDEPENDS_${PN} = \ xfce4-settings \ xfce-terminal \ thunar \ -#thunar-volman \ +thunar-volman \ -- 1.6.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] meta-oe: midori build fails with linker error
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 01-09-11 08:50, Bernhard Guillon schreef: On Wed, 31 Aug 2011, Andreas Müller wrote: On Wednesday, August 31, 2011 08:25:16 AM Andreas Müller wrote: [...] angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.5.4/ld: note: 'JSContextGetGlobalObject' is defined in DSO /home/Superandy/tmp/oe-core- eglibc/sysroots/overo/usr/lib/libjavascriptcoregtk-1.0.so.0 so try adding it to the linker command line | /home/Superandy/tmp/oe-core- eglibc/sysroots/overo/usr/lib/libjavascriptcoregtk-1.0.so.0: could not read symbols: Invalid operation | collect2: ld returned 1 exit status we are not alone [1]... Andreas [1] https://bugs.launchpad.net/midori/+bug/799196 Hi, LDFLAGS_append = -ljavascriptcoregtk-1.0 should do the work. That leads to | /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/midori-0.3.6-r1/midori-0.3.6/_build_/../midori/midori-view.c:4503: undefined reference to `webkit_web_view_get_selected_text' Same with 0.4.0, so midori needs to get updated for a more recent webkit. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) iD8DBQFOXzozMkyGM64RGpERAhN3AJ4zqyuRWbHgbSMcXJ3zfIuee16JlgCfWH4x Rjk2Pl1cSAM3NT5TeQkmsco= =NtME -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2] linux-omap_2.6.39: remove patch that prevented board from resuming from suspend.
Dear Tasslehoff, Am Mittwoch, den 31.08.2011, 19:41 +0200 schrieb Tasslehoff Kjappfot: From: Tasslehoff Kjappfot tasskj...@gmail.com Running on a board similar to Beagleboard C3 (but without NAND) I could not resume from suspend with the patch. The console output when suspending was as expected, but neither console input nor a timer would wake the board. Without the patch, everything works as it should. Signed-off-by: Tasslehoff Kjappfot tasskj...@gmail.com Tasslehoff thank you for sending this iteration (no full stop at the end of the summary please next time) and thank you Koen for pushing this [1]. --- Next time, please add below the »---« what you changed in v2 or other iterations. recipes/linux/linux-omap_2.6.39.bb |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index 8370e58..3880aa1 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -27,7 +27,6 @@ SRC_URI_append = \ file://sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch \ file://sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch \ file://sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch \ - file://sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch \ file://sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch \ file://sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch \ file://sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch \ Koen, do you know why that patch breaks resume? I guess when applying those you had tested suspend and resume and it worked for you. Maybe we should contact the patch author [2]? Additionally should the patch file be removed from the tree too as no other recipe is using it? Thanks, Paul [1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=8deb9697d85388af845e1dda193d9149f55b07f5 [2] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch?id=8deb9697d85388af845e1dda193d9149f55b07f5 signature.asc Description: This is a digitally signed message part ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2] linux-omap_2.6.39: remove patch that prevented board from resuming from suspend.
On Thursday 01 September 2011 09:48:52 Paul Menzel wrote: (no full stop at the end of the summary please next time) I know you're trying to ensure quality Paul, but this is pedantry to the nth degree. Really, we only need to ensure that patches are technically correct and adequately described in the commit message. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2] linux-omap_2.6.39: remove patch that prevented board from resuming from suspend.
Am Donnerstag, den 01.09.2011, 10:02 +0100 schrieb Paul Eggleton: On Thursday 01 September 2011 09:48:52 Paul Menzel wrote: (no full stop at the end of the summary please next time) I know you're trying to ensure quality Paul, but this is pedantry to the nth degree. Really, we only need to ensure that patches are technically correct and adequately described in the commit message. 1. That is why I wrote »next time«. 2. And if I understand the last item in the Commit Patch Message Guidelines [1] correctly - Avoid punctuation in the short log. it is actually considered an error. Thanks, Paul [1] http://openembedded.org/index.php/Commit_Patch_Message_Guidelineshttp://openembedded.org/index.php/Commit_Patch_Message_Guidelines signature.asc Description: This is a digitally signed message part ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2] linux-omap_2.6.39: remove patch that prevented board from resuming from suspend.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 01-09-11 10:48, Paul Menzel schreef: Dear Tasslehoff, Am Mittwoch, den 31.08.2011, 19:41 +0200 schrieb Tasslehoff Kjappfot: From: Tasslehoff Kjappfot tasskj...@gmail.com Running on a board similar to Beagleboard C3 (but without NAND) I could not resume from suspend with the patch. The console output when suspending was as expected, but neither console input nor a timer would wake the board. Without the patch, everything works as it should. Signed-off-by: Tasslehoff Kjappfot tasskj...@gmail.com Tasslehoff thank you for sending this iteration (no full stop at the end of the summary please next time) and thank you Koen for pushing this [1]. --- Next time, please add below the »---« what you changed in v2 or other iterations. recipes/linux/linux-omap_2.6.39.bb |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index 8370e58..3880aa1 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -27,7 +27,6 @@ SRC_URI_append = \ file://sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch \ file://sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch \ file://sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch \ - file://sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch \ file://sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch \ file://sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch \ file://sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch \ Koen, do you know why that patch breaks resume? I guess when applying those you had tested suspend and resume and it worked for you. Maybe we should contact the patch author [2]? I stopped testing suspend/resume when dynamic ticks become good enough to use, which was a few years ago :) On a more serious note, s/r had never worked on omap3 when using usb devices, only recently it started working (.37-ish) on mainline kernels with the right defconfig. So I was suprised that Tasslehoff reported it to work at all! But for omap2+: take a serious look at dyntick and cpuidle, it isn't hard to make it idle to suspend like powerlevels without actually suspending. regards, Koen -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) iD8DBQFOX1BxMkyGM64RGpERAuf0AKCwDXiPOkUSXLqwZfF+/SAhbOH8PgCfbIXl 1fpTUc9QpGodmuHGd7VsYW8= =LgCa -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] `PR = r0`: Add or not to add?
2011/9/1 Philip Balister phi...@balister.org On 08/31/2011 06:43 AM, Otavio Salvador wrote: On Wed, Aug 31, 2011 at 10:30, Koen Kooikoen@dominion.thruhere.**netk...@dominion.thruhere.net wrote: Besides, this is also on the policy The OE classic policy maybe, not on the meta-oe policy[1]. ETOOMANYPOLICIES so or you change the policy or you follow it. Otherwise makes no sense to have a policy if the person who merge the patches do not follow it. - From http://wiki.openembedded.org/**index.php/Category:Policyhttp://wiki.openembedded.org/index.php/Category:PolicyI read: http://wiki.openembedded.org/**index.php/Commit_Patch_** Message_Guidelineshttp://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines http://wiki.openembedded.org/**index.php/Commit_Policyhttp://wiki.openembedded.org/index.php/Commit_Policy http://wiki.openembedded.org/**index.php/Commit_log_examplehttp://wiki.openembedded.org/index.php/Commit_log_example http://wiki.openembedded.org/**index.php/Styleguidehttp://wiki.openembedded.org/index.php/Styleguide http://wiki.openembedded.org/**index.php/Versioning_Policyhttp://wiki.openembedded.org/index.php/Versioning_Policy And none of those say PR = r0 is wanted behaviour. OTOH it doesn't say it's unwanted either. So until it is explicit we might keep PR = r0 as it seems most people prefer this way. As long as we are all chiming in, I would like to see all of us decide once and for all what to do. I also prefer the explicitly setting PR = r0. Can we work out the troublesome cases and see if we can get them fixed? Also, what is the oe-core view on this? Let's work out what the technical answer is and go from there Good plan. BTW not sure if it is feasible but ideally a 2nd assingment to a var should give an error (or at least a warning). This avoids that e.g. a recipe and a .inc file set the var (or that a var is set twice within the same recipe, in the past I have seen this). If a variable is intended to be reassigned, weak binding should be used. ( ?= or so). Frans ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-handheld][PATCH 00/10] Pull request #1
Hi, please merge following changes, they are mostly from meta-zaurus and are needed even to parse recipes when MACHINE=spitz. Tested on core-image-core, where only failing recipe is now zaurusd, because of o-hand repo: | ERROR: Function 'Fetcher failure for URL: 'svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http'. Please set SRCREV to a valid value' failed and we should switch that from svn.o-hand.com to http://git.yoctoproject.org/cgit/cgit.cgi/zaurusd/ as rest of o-hand recipes in oe-core. The following changes since commit 3e013ce4211bca15dedbbdc1e714e17d85013746: linux-3.0: update to 3.0.1 (2011-08-24 00:09:51 +0100) are available in the git repository at: git://gitorious.org/shr/meta-handheld jansa/sync-with-meta-zaurus Martin Jansa (10): linux-2.6.39: drop files which don't belong here linux-2.6.39: upgrade to 2.6.39.4 and import 2 patches from meta-zaurus linux-kexecboot: import from meta-zaurus linux: add some logo files from meta-zaurus linux(-kexecboot): move shared definitions to linux-${PV}.inc initramfs-kexecboot.inc: import missing file from meta-zaurus conf/machine: unify MACHINE_GUI_CLASS/GUI_MACHINE_CLASS to MACHINE_GUI_CLASS in all configs kexecboot: import from meta-zaurus spitz,akita: add iwmmxt to PACKAGE_EXTRA_ARCHS_tune-xscale not PACKAGE_EXTRA_ARCHS initramfs-kexecboot*image: import from meta-zaurus conf/machine/akita.conf|2 +- conf/machine/include/initramfs-kexecboot.inc | 18 + conf/machine/include/zaurus.inc|2 +- conf/machine/palmt650.conf |2 +- conf/machine/palmt680.conf |2 +- conf/machine/palmtc.conf |2 +- conf/machine/palmtt5.conf |2 +- conf/machine/simpad.conf |2 +- conf/machine/spitz.conf|2 +- recipes-bsp/images/initramfs-kexecboot-image.bb| 23 + .../images/initramfs-kexecboot-klibc-image.bb |3 + recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm | 43 + recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 56 + recipes-bsp/kexecboot/kexecboot-klibc_git.bb | 12 + recipes-bsp/kexecboot/kexecboot.inc| 61 + recipes-bsp/kexecboot/kexecboot_git.bb |9 + .../linux/files/qvga/logo_linux_clut224.ppm.bz2| Bin 0 - 5547 bytes .../linux/files/vga/logo_linux_clut224.ppm.bz2 | Bin 0 - 6436 bytes recipes-kernel/linux/linux-2.6.39.inc | 20 + ...xx_sharpsl-retain-ops-structure-on-collie.patch | 34 + .../linux/linux-2.6.39/locomo_kbd_tweak-r2.patch | 66 + .../linux/linux-2.6.39/om-gta01/defconfig | 481 - .../linux/linux-2.6.39/om-gta02/defconfig | 490 - recipes-kernel/linux/linux-2.6.39/openmoko.patch |46285 recipes-kernel/linux/linux-2.6.39/shr.patch| 2021 - recipes-kernel/linux/linux-kexecboot.inc | 145 + .../linux/linux-kexecboot/akita/defconfig | 133 + .../linux/linux-kexecboot/c7x0/defconfig | 135 + .../linux/linux-kexecboot/collie/defconfig | 145 + .../linux/linux-kexecboot/poodle/defconfig | 137 + .../linux/linux-kexecboot/spitz/defconfig | 133 + .../linux/linux-kexecboot/tosa/defconfig | 135 + recipes-kernel/linux/linux-kexecboot_2.6.39.bb |5 + recipes-kernel/linux/linux_2.6.39.bb | 28 +- 34 files changed, 1322 insertions(+), 49312 deletions(-) create mode 100644 conf/machine/include/initramfs-kexecboot.inc create mode 100644 recipes-bsp/images/initramfs-kexecboot-image.bb create mode 100644 recipes-bsp/images/initramfs-kexecboot-klibc-image.bb create mode 100644 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm create mode 100644 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb create mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bb create mode 100644 recipes-bsp/kexecboot/kexecboot.inc create mode 100644 recipes-bsp/kexecboot/kexecboot_git.bb create mode 100644 recipes-kernel/linux/files/qvga/logo_linux_clut224.ppm.bz2 create mode 100644 recipes-kernel/linux/files/vga/logo_linux_clut224.ppm.bz2 create mode 100644 recipes-kernel/linux/linux-2.6.39.inc create mode 100644 recipes-kernel/linux/linux-2.6.39/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch create mode 100644 recipes-kernel/linux/linux-2.6.39/locomo_kbd_tweak-r2.patch delete mode 100644 recipes-kernel/linux/linux-2.6.39/om-gta01/defconfig delete mode 100644 recipes-kernel/linux/linux-2.6.39/om-gta02/defconfig delete mode 100644 recipes-kernel/linux/linux-2.6.39/openmoko.patch delete mode 100644 recipes-kernel/linux/linux-2.6.39/shr.patch create mode 100644 recipes-kernel/linux/linux-kexecboot.inc create mode 100644 recipes-kernel/linux/linux-kexecboot/akita/defconfig create mode 100644
[oe] [meta-handheld][PATCH 02/10] linux-2.6.39: upgrade to 2.6.39.4 and import 2 patches from meta-zaurus
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...xx_sharpsl-retain-ops-structure-on-collie.patch | 34 ++ .../linux/linux-2.6.39/locomo_kbd_tweak-r2.patch | 66 recipes-kernel/linux/linux_2.6.39.bb |5 ++ 3 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 recipes-kernel/linux/linux-2.6.39/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch create mode 100644 recipes-kernel/linux/linux-2.6.39/locomo_kbd_tweak-r2.patch diff --git a/recipes-kernel/linux/linux-2.6.39/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch b/recipes-kernel/linux/linux-2.6.39/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch new file mode 100644 index 000..d86b47d --- /dev/null +++ b/recipes-kernel/linux/linux-2.6.39/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch @@ -0,0 +1,34 @@ +From 31d99c4c9f14e571ca0e22c5862dd5b6a871e2dd Mon Sep 17 00:00:00 2001 +From: Dmitry Eremin-Solenikov dbarysh...@gmail.com +Date: Fri, 5 Aug 2011 15:32:23 +0400 +Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie + +The pxa2xx_sharpsl driver part is also used on collie, which (as +a StrongARM board) has different expectations for PCMCIA drivers. +So, on collie place sharpsl_pcmcia_ops in .data section rather than +in __initdata. + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com +--- + drivers/pcmcia/pxa2xx_sharpsl.c |4 + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c +index 81af2b3..1b5b749 100644 +--- a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c +@@ -222,7 +222,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) + sharpsl_pcmcia_init_reset(skt); + } + ++#ifdef CONFIG_SA1100_COLLIE ++static struct pcmcia_low_level sharpsl_pcmcia_ops = { ++#else + static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { ++#endif + .owner = THIS_MODULE, + .hw_init= sharpsl_pcmcia_hw_init, + .hw_shutdown= sharpsl_pcmcia_hw_shutdown, +-- +1.7.2.5 + diff --git a/recipes-kernel/linux/linux-2.6.39/locomo_kbd_tweak-r2.patch b/recipes-kernel/linux/linux-2.6.39/locomo_kbd_tweak-r2.patch new file mode 100644 index 000..0d47ade --- /dev/null +++ b/recipes-kernel/linux/linux-2.6.39/locomo_kbd_tweak-r2.patch @@ -0,0 +1,66 @@ + drivers/input/keyboard/locomokbd.c | 61 +++-- + 1 file changed, 39 insertions(+), 22 deletions(-) + +Index: linux-2.6.26-rc4/drivers/input/keyboard/locomokbd.c +=== +--- linux-2.6.26-rc4.orig/drivers/input/keyboard/locomokbd.c 2008-05-26 19:08:11.0 +0100 linux-2.6.26-rc4/drivers/input/keyboard/locomokbd.c2008-06-01 18:35:55.0 +0100 +@@ -41,25 +41,32 @@ + + #define LOCOMOKBD_NUMKEYS 128 + +-#define KEY_ACTIVITY KEY_F16 +-#define KEY_CONTACT KEY_F18 +-#define KEY_CENTERKEY_F15 ++#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL ++#define LOCOMO_KEY_ADDRESSKEY_LEFTALT /* Needed for SysRQ */ ++#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */ ++#define LOCOMO_KEY_MENU KEY_F12 ++#define LOCOMO_KEY_MAIL KEY_F10 ++#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */ ++#define LOCOMO_KEY_CANCEL KEY_POWER ++#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */ + +-static const unsigned char ++#define LOCOMO_KEY_FN KEY_F9 ++ ++static const unsigned char + locomokbd_keycode[LOCOMOKBD_NUMKEYS] __devinitconst = { +- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ +- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ +- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ +- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ +- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ +- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */ +- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ +- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ +- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ +- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ +- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ +- KEY_M, KEY_SPACE, KEY_V,
[oe] [meta-handheld][PATCH 03/10] linux-kexecboot: import from meta-zaurus
* from rev 36ad029194d2b57efa07896b5cda3231bc71f357 in meta-smartphone repo http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=36ad029194d2b57efa07896b5cda3231bc71f357 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- recipes-kernel/linux/linux-kexecboot.inc | 140 +++ .../linux/linux-kexecboot/akita/defconfig | 133 ++ .../linux/linux-kexecboot/c7x0/defconfig | 135 ++ .../linux/linux-kexecboot/collie/defconfig | 145 .../linux/linux-kexecboot/poodle/defconfig | 137 ++ .../linux/linux-kexecboot/spitz/defconfig | 133 ++ .../linux/linux-kexecboot/tosa/defconfig | 135 ++ recipes-kernel/linux/linux-kexecboot_2.6.39.bb | 27 8 files changed, 985 insertions(+), 0 deletions(-) create mode 100644 recipes-kernel/linux/linux-kexecboot.inc create mode 100644 recipes-kernel/linux/linux-kexecboot/akita/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot/c7x0/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot/collie/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot/poodle/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot/spitz/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot/tosa/defconfig create mode 100644 recipes-kernel/linux/linux-kexecboot_2.6.39.bb diff --git a/recipes-kernel/linux/linux-kexecboot.inc b/recipes-kernel/linux/linux-kexecboot.inc new file mode 100644 index 000..d4525b2 --- /dev/null +++ b/recipes-kernel/linux/linux-kexecboot.inc @@ -0,0 +1,140 @@ +# We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: +INC_PR = r43 + +inherit kernel siteinfo + +LICENSE = GPLv2 + +LIC_FILES_CHKSUM = file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7 + +DEPENDS += xz-native + +# Kernel bootlogo is distro-specific (default is OE logo). +# Logo resolution (qvga, vga, ...) is machine-specific. +LOGO_SIZE ?= . +SRC_URI = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 + +# Set the verbosity of kernel messages during runtime +CMDLINE_DEBUG ?= '${@base_contains(IMAGE_FEATURES, debug-tweaks, debug, loglevel=3, d)}' + +# Note how we set master console on serial to protect bootlogo. +CMDLINE_c7x0 = console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG} +CMDLINE_tosa = console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG} +CMDLINE_poodle = console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG} +CMDLINE_akita = console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG} +CMDLINE_collie = console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M ${CMDLINE_DEBUG} +CMDLINE_spitz = console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG} + +PACKAGES = +PROVIDES = + +# Zaurus machines need kernel size-check +KERNEL_IMAGE_MAXSIZE_akita = 1294336 +KERNEL_IMAGE_MAXSIZE_c7x0 = 1294336 +KERNEL_IMAGE_MAXSIZE_collie = 1048576 +KERNEL_IMAGE_MAXSIZE_poodle = 1294336 +KERNEL_IMAGE_MAXSIZE_tosa = 1294336 +KERNEL_IMAGE_MAXSIZE_spitz = 1294336 + +KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE} +KERNEL_IMAGE_SYMLINK_NAME = ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE} + +LOCALVERSION ?= + +# we want the smallest size +INITRAMFS_IMAGE = initramfs-kexecboot-klibc-image + +do_configure_prepend() { + +echo ${S}/.config + +# +# CONFIG_CMDLINE mangling +# +echo CONFIG_CMDLINE_BOOL=y ${S}/.config +echo CONFIG_CMDLINE=\${CMDLINE}\ ${S}/.config + +# mips and x86 +echo CONFIG_CMDLINE_OVERRIDE=y ${S}/.config + +# sh only +echo CONFIG_CMDLINE_OVERWRITE=y ${S}/.config +echo # CONFIG_CMDLINE_EXTEND is not set ${S}/.config + +# +# endian support +# +if [ ${SITEINFO_ENDIANNESS} = be ]; then +echo CONFIG_CPU_BIG_ENDIAN=y ${S}/.config +fi + +# +# logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it is going to be used +# +if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then +install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm +echo CONFIG_LOGO=y ${S}/.config +echo CONFIG_LOGO_LINUX_CLUT224=y ${S}/.config +fi + +# When enabling thumb for userspace we also need thumb support in the kernel +if [ ${ARM_INSTRUCTION_SET} = thumb ] ; then +sed -i -e /CONFIG_ARM_THUMB/d ${WORKDIR}/defconfig +echo CONFIG_ARM_THUMB=y ${S}/.config +fi + +sed -e '/CONFIG_CMDLINE=/d' \ +-e '/CONFIG_CMDLINE_BOOL/d' \ +-e '/CONFIG_CMDLINE_OVERRIDE/d' \ +-e '/CONFIG_CMDLINE_OVERWRITE/d' \ +-e '/CONFIG_CMDLINE_EXTEND/d' \ +-e
[oe] [meta-handheld][PATCH 04/10] linux: add some logo files from meta-zaurus
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../linux/files/qvga/logo_linux_clut224.ppm.bz2| Bin 0 - 5547 bytes .../linux/files/vga/logo_linux_clut224.ppm.bz2 | Bin 0 - 6436 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 recipes-kernel/linux/files/qvga/logo_linux_clut224.ppm.bz2 create mode 100644 recipes-kernel/linux/files/vga/logo_linux_clut224.ppm.bz2 diff --git a/recipes-kernel/linux/files/qvga/logo_linux_clut224.ppm.bz2 b/recipes-kernel/linux/files/qvga/logo_linux_clut224.ppm.bz2 new file mode 100644 index ..ddc39a3c64dfadcd18c3d3f4489378c59fd649cc GIT binary patch literal 5547 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
[oe] [meta-handheld][PATCH 05/10] linux(-kexecboot): move shared definitions to linux-${PV}.inc
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- recipes-kernel/linux/linux-2.6.39.inc | 20 recipes-kernel/linux/linux-kexecboot.inc |5 + recipes-kernel/linux/linux-kexecboot_2.6.39.bb | 24 +--- recipes-kernel/linux/linux_2.6.39.bb | 22 +- 4 files changed, 27 insertions(+), 44 deletions(-) create mode 100644 recipes-kernel/linux/linux-2.6.39.inc diff --git a/recipes-kernel/linux/linux-2.6.39.inc b/recipes-kernel/linux/linux-2.6.39.inc new file mode 100644 index 000..3693aac --- /dev/null +++ b/recipes-kernel/linux/linux-2.6.39.inc @@ -0,0 +1,20 @@ +# Mark archs/machines that this kernel supports +DEFAULT_PREFERENCE = -1 +DEFAULT_PREFERENCE_akita = 1 +DEFAULT_PREFERENCE_c7x0 = 1 +DEFAULT_PREFERENCE_collie = 1 +DEFAULT_PREFERENCE_poodle = 1 +DEFAULT_PREFERENCE_spitz = 1 +DEFAULT_PREFERENCE_tosa = 1 +DEFAULT_PREFERENCE_h1940 = 1 + +SRC_URI = ${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ + ${KERNELORG_MIRROR}/linux/kernel/v2.6/patch-${PV}.4.bz2;apply=yes;name=stablepatch \ + file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ + file://locomo_kbd_tweak-r2.patch \ + file://defconfig + +SRC_URI[kernel.md5sum] = 1aab7a741abe08d42e8eccf20de61e05 +SRC_URI[kernel.sha256sum] = 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 +SRC_URI[stablepatch.md5sum] = ff5eb7323c054a128d2922bde3297ed5 +SRC_URI[stablepatch.sha256sum] = 132ba590e92d5c9a1bb0dc0885795a095d48e7db2552f1c9e3c26ce946a70a40 diff --git a/recipes-kernel/linux/linux-kexecboot.inc b/recipes-kernel/linux/linux-kexecboot.inc index d4525b2..fb9760a 100644 --- a/recipes-kernel/linux/linux-kexecboot.inc +++ b/recipes-kernel/linux/linux-kexecboot.inc @@ -7,6 +7,11 @@ LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7 +# FILESEXTRAPATHS cannot be used, because it puts extra paths before FILESPATH and we need it at the end +# only as fallback for patches available only in linux-PV dir and ie defconfigs needs to go from linux-kexecboot-PV +FILESPATH_append = :${FILE_DIRNAME}/linux-${PV} + + DEPENDS += xz-native # Kernel bootlogo is distro-specific (default is OE logo). diff --git a/recipes-kernel/linux/linux-kexecboot_2.6.39.bb b/recipes-kernel/linux/linux-kexecboot_2.6.39.bb index dae6a22..1fcbfee 100644 --- a/recipes-kernel/linux/linux-kexecboot_2.6.39.bb +++ b/recipes-kernel/linux/linux-kexecboot_2.6.39.bb @@ -1,27 +1,5 @@ require linux-kexecboot.inc +require linux-${PV}.inc PR = ${INC_PR}.4 - S = ${WORKDIR}/linux-${PV} - -# Mark archs/machines that this kernel supports -DEFAULT_PREFERENCE = -1 - -DEFAULT_PREFERENCE_akita = 1 -DEFAULT_PREFERENCE_c7x0 = 1 -DEFAULT_PREFERENCE_collie = 1 -DEFAULT_PREFERENCE_poodle = 1 -DEFAULT_PREFERENCE_spitz = 1 -DEFAULT_PREFERENCE_tosa = 1 - -SRC_URI += ${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v2.6/patch-${PV}.4.bz2;apply=yes;name=stablepatch \ - file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ -file://locomo_kbd_tweak-r2.patch \ -file://defconfig \ - - -SRC_URI[kernel.md5sum] = 1aab7a741abe08d42e8eccf20de61e05 -SRC_URI[kernel.sha256sum] = 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 -SRC_URI[stablepatch.md5sum] = ff5eb7323c054a128d2922bde3297ed5 -SRC_URI[stablepatch.sha256sum] = 132ba590e92d5c9a1bb0dc0885795a095d48e7db2552f1c9e3c26ce946a70a40 diff --git a/recipes-kernel/linux/linux_2.6.39.bb b/recipes-kernel/linux/linux_2.6.39.bb index c74598c..2e5c6e2 100644 --- a/recipes-kernel/linux/linux_2.6.39.bb +++ b/recipes-kernel/linux/linux_2.6.39.bb @@ -1,20 +1,5 @@ require linux.inc - -# Mark archs/machines that this kernel supports -DEFAULT_PREFERENCE = -1 -DEFAULT_PREFERENCE_akita = 1 -DEFAULT_PREFERENCE_c7x0 = 1 -DEFAULT_PREFERENCE_collie = 1 -DEFAULT_PREFERENCE_poodle = 1 -DEFAULT_PREFERENCE_spitz = 1 -DEFAULT_PREFERENCE_tosa = 1 -DEFAULT_PREFERENCE_h1940 = 1 - -SRC_URI = ${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v2.6/patch-${PV}.4.bz2;apply=yes;name=stablepatch \ - file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ - file://locomo_kbd_tweak-r2.patch \ - file://defconfig +require linux-${PV}.inc SRC_URI_append_akita = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 SRC_URI_append_c7x0 = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 @@ -22,8 +7,3 @@ SRC_URI_append_collie = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 SRC_URI_append_poodle = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 SRC_URI_append_tosa = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 SRC_URI_append_spitz = file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 -
[oe] [meta-handheld][PATCH 06/10] initramfs-kexecboot.inc: import missing file from meta-zaurus
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- conf/machine/include/initramfs-kexecboot.inc | 18 ++ 1 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 conf/machine/include/initramfs-kexecboot.inc diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc new file mode 100644 index 000..bc9cd51 --- /dev/null +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -0,0 +1,18 @@ +# Initramfs-kexecboot extra config + + +# If set here, each image will also build linux-kexecboot. +# Usually the machine-installer recipe already DEPENDS on it +# +EXTRA_IMAGEDEPENDS += linux-kexecboot + + +# Force inclusion of kernel in target images +# (done by default) +# +RDEPENDS_kernel-base = kernel-image + + +# Install /boot/boot.cfg in target images +# +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = kexecboot-cfg -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-handheld][PATCH 07/10] conf/machine: unify MACHINE_GUI_CLASS/GUI_MACHINE_CLASS to MACHINE_GUI_CLASS in all configs
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- conf/machine/include/zaurus.inc |2 +- conf/machine/palmt650.conf |2 +- conf/machine/palmt680.conf |2 +- conf/machine/palmtc.conf|2 +- conf/machine/palmtt5.conf |2 +- conf/machine/simpad.conf|2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc index 6ff1470..416978f 100644 --- a/conf/machine/include/zaurus.inc +++ b/conf/machine/include/zaurus.inc @@ -52,7 +52,7 @@ KERNEL_IMAGETYPE = ${ZAURUS_KERNEL_IMAGETYPE} XZ_COMPRESSION_LEVEL = -e -7 # kernel bootlogo -LOGO_SIZE = '${@base_conditional(GUI_MACHINE_CLASS, bigscreen, vga, qvga, d)}' +LOGO_SIZE = '${@base_conditional(MACHINE_GUI_CLASS, bigscreen, vga, qvga, d)}' # machine tuning diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index f81ade3..8deb3e5 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -8,7 +8,7 @@ ROOT_FLASH_SIZE = 100 SERIAL_CONSOLE = 115200 ttyS1 -GUI_MACHINE_CLASS = bigscreen +MACHINE_GUI_CLASS = bigscreen MACHINE_EXTRA_RRECOMMENDS += kernel-module-snd-pxa2xx-ac97 \ kernel-module-pxa27x-keyboard \ diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf index b984667..a17aea3 100644 --- a/conf/machine/palmt680.conf +++ b/conf/machine/palmt680.conf @@ -8,7 +8,7 @@ ROOT_FLASH_SIZE = 100 SERIAL_CONSOLE = 115200 ttyS0 -GUI_MACHINE_CLASS = bigscreen +MACHINE_GUI_CLASS = bigscreen MACHINE_EXTRA_RRECOMMENDS += kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index 28db830..515ce4c 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -10,5 +10,5 @@ ROOT_FLASH_SIZE = 100 SERIAL_CONSOLE = 115200 ttyS0 -GUI_MACHINE_CLASS = bigscreen +MACHINE_GUI_CLASS = bigscreen diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf index 997c157..fbf225a 100644 --- a/conf/machine/palmtt5.conf +++ b/conf/machine/palmtt5.conf @@ -8,7 +8,7 @@ ROOT_FLASH_SIZE = 100 SERIAL_CONSOLE = 115200 ttyS0 -GUI_MACHINE_CLASS = bigscreen +MACHINE_GUI_CLASS = bigscreen MACHINE_EXTRA_RRECOMMENDS += kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts \ diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 6073d33..fbb2c67 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -14,7 +14,7 @@ require conf/machine/include/tune-strongarm1100.inc ROOT_FLASH_SIZE = 16 EXTRA_IMAGECMD_jffs2 = --little-endian --eraseblock=0x2 -GUI_MACHINE_CLASS = bigscreen +MACHINE_GUI_CLASS = bigscreen MACHINE_DISPLAY_WIDTH_PIXELS = 800 MACHINE_DISPLAY_HEIGHT_PIXELS= 600 SERIAL_CONSOLE = ttySA0 115200 vt100 -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-handheld][PATCH 08/10] kexecboot: import from meta-zaurus
* from rev 36ad029194d2b57efa07896b5cda3231bc71f357 in meta-smartphone repo http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=36ad029194d2b57efa07896b5cda3231bc71f357 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm | 43 ++ recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 56 +++ recipes-bsp/kexecboot/kexecboot-klibc_git.bb | 12 + recipes-bsp/kexecboot/kexecboot.inc | 61 ++ recipes-bsp/kexecboot/kexecboot_git.bb |9 5 files changed, 181 insertions(+), 0 deletions(-) create mode 100644 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm create mode 100644 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb create mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bb create mode 100644 recipes-bsp/kexecboot/kexecboot.inc create mode 100644 recipes-bsp/kexecboot/kexecboot_git.bb diff --git a/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm b/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm new file mode 100644 index 000..6e6fd77 --- /dev/null +++ b/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char * icon_xpm[] = { +32 32 8 1, + c None, +. c #D6DBDE, ++ c #9BA6AE, +@ c #60727D, +# c #B8BFC5, +$ c #A9E8F6, +% c #12BCE4, + c #57D2EC, +, +, +, + .++++. , + ++ , + ## , + +@@+ , +.++##+@., +@@@..@@@, + +@+#@+ , + #@. $$ .@# , + @. %% .@ , + #+ %% +# , + @ %% @ , +.. $% $% .., ++ %$%+, ++@@@+ $ $% $$ +@@@+, ++ $ $% $%$ +, +# %%% $%% #, +. %%% $%%% ., +# $%%% %% %%%$ #, ++@@@+ $ $ +@@@+, ++ +, +# #, + + %%$$%% + , + +. $%%$ .+ , + .@ $$ @. , + #. .# , +$%%$, +, +, +}; diff --git a/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb b/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb new file mode 100644 index 000..24dd2a4 --- /dev/null +++ b/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb @@ -0,0 +1,56 @@ +DESCRIPTION = Configuration file for kexecboot +SECTION = base +LICENSE = MIT +LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 + +PR = r12 + +SRC_URI = file://icon.xpm + +CMDLINE ?= +CMDLINE_DEBUG ?= ${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)} + +do_configure_prepend () { +install -m 0644 ${WORKDIR}/icon.xpm ${S} +} + +do_install_prepend () { +echo '# First kernel stanza. +# Specify full kernel path on target. +KERNEL=/boot/${KERNEL_IMAGETYPE} + +# Show this label in kexecboot menu. +LABEL=${DISTRO}-${MACHINE} +# +# Append this tags to the kernel cmdline. +APPEND=${CMDLINE} ${CMDLINE_DEBUG} +# +# Specify optional initrd/initramfs. +# INITRD=/boot/initramfs.cpio.gz +# +# Specify full path for a custom icon for the menu-item. +# If not set, use device-icons as default (NAND, SD, CF, ...). +# ICON=/boot/icon.xpm +# +# Priority of item in kexecboot menu. +# Items with highest priority will be shown at top of menu. +# Default: 0 (lowest, ordered by device ordering) +# PRIORITY=10 +# +# +# Second kernel stanza. +# KERNEL=/boot/${KERNEL_IMAGETYPE}-test +# LABEL=${DISTRO}-${MACHINE}-test +# APPEND=${CMDLINE} +#' ${S}/boot.cfg +} + +do_install () { +install -d ${D}/boot +install -m 0644 boot.cfg ${D}/boot/boot.cfg +install -m 0644 icon.xpm ${D}/boot/icon.xpm +} + +PACKAGE_ARCH = ${MACHINE_ARCH} + +FILES_${PN} += /boot/* diff --git a/recipes-bsp/kexecboot/kexecboot-klibc_git.bb b/recipes-bsp/kexecboot/kexecboot-klibc_git.bb new file mode 100644 index 000..22ef7de --- /dev/null +++ b/recipes-bsp/kexecboot/kexecboot-klibc_git.bb @@ -0,0 +1,12 @@ +RDEPENDS_${PN} = kexec-klibc +PV = 0.5.9 +PR = r7+gitr${SRCREV} + +SRC_URI = git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git +SRCREV = 14e6d1a3641a749e4408fda1eadffe4f396b0279 +S = ${WORKDIR}/git + +# the binary is statically linked against klibc +inherit klibc + +require kexecboot.inc diff --git a/recipes-bsp/kexecboot/kexecboot.inc b/recipes-bsp/kexecboot/kexecboot.inc new file mode 100644 index 000..b76abcc --- /dev/null +++ b/recipes-bsp/kexecboot/kexecboot.inc @@ -0,0 +1,61 @@ +### +# Configure options: +# +# --enable-static-linking compile kexecboot as static executable [default=no] +#
[oe] [meta-handheld][PATCH 10/10] initramfs-kexecboot*image: import from meta-zaurus
* from rev 36ad029194d2b57efa07896b5cda3231bc71f357 in meta-smartphone repo http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=36ad029194d2b57efa07896b5cda3231bc71f357 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- recipes-bsp/images/initramfs-kexecboot-image.bb| 23 .../images/initramfs-kexecboot-klibc-image.bb |3 ++ 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 recipes-bsp/images/initramfs-kexecboot-image.bb create mode 100644 recipes-bsp/images/initramfs-kexecboot-klibc-image.bb diff --git a/recipes-bsp/images/initramfs-kexecboot-image.bb b/recipes-bsp/images/initramfs-kexecboot-image.bb new file mode 100644 index 000..a1609d6 --- /dev/null +++ b/recipes-bsp/images/initramfs-kexecboot-image.bb @@ -0,0 +1,23 @@ +# Initramfs image providing kexecboot +# a linux as bootloader implementation + +LICENSE = MIT +LIC_FILES_CHKSUM = file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 + +IMAGE_FSTYPES = cpio.gz cpio.lzma + +# avoid circular dependencies +EXTRA_IMAGEDEPENDS = + +IMAGE_INSTALL = kexecboot + +IMAGE_LINGUAS = +IMAGE_LOGIN_MANAGER = +IMAGE_INIT_MANAGER = +IMAGE_INITSCRIPTS = +IMAGE_DEV_MANAGER = + +FEED_DEPLOYDIR_BASE_URI = +ONLINE_PACKAGE_MANAGEMENT = none + +inherit image diff --git a/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb new file mode 100644 index 000..d8e92ca --- /dev/null +++ b/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb @@ -0,0 +1,3 @@ +require initramfs-kexecboot-image.bb + +IMAGE_INSTALL = kexecboot-klibc -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/4] Pull request #21
The following changes since commit a577b53823d5a0e078777a5fb56a1e3d776b3130: lmbench: Add version 3.0-a9 (initial recipe) (2011-09-01 16:30:32 +0200) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe Martin Jansa (3): kbd: fix SRC_URI klibc: move comment outside multiline variable serial-forward, pty-forward-native: remove extra slash and '.git' from SRC_URI Sebastian Krzyszkowiak (1): xf86-video-omapfb: add patch for fixing segfault on starting X when using VRFB meta-oe/recipes-core/kbd/kbd_1.15.2.bb |2 +- meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb |2 +- .../0004-Attempt-to-fix-VRFB.patch | 320 .../xorg-driver/xf86-video-omapfb_git.bb |3 +- .../serial-utils/pty-forward-native.bb |2 +- .../serial-utils/serial-forward_git.bb |2 +- 6 files changed, 326 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/4] kbd: fix SRC_URI
* '/pub' is part of KERNELORG_MIRROR in oe-core already * old OE had in bitbake.conf:KERNELORG_MIRROR = http://kernel.org; and mirrors.bbclass:${KERNELORG_MIRROR} http://www.kernel.org/pub Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-core/kbd/kbd_1.15.2.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-core/kbd/kbd_1.15.2.bb b/meta-oe/recipes-core/kbd/kbd_1.15.2.bb index 5fdccad..36e68a0 100644 --- a/meta-oe/recipes-core/kbd/kbd_1.15.2.bb +++ b/meta-oe/recipes-core/kbd/kbd_1.15.2.bb @@ -7,7 +7,7 @@ inherit autotools gettext BBCLASSEXTEND = native -SRC_URI=${KERNELORG_MIRROR}/pub/linux/utils/kbd/kbd-1.15.2.tar.bz2 +SRC_URI=${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 SRC_URI[md5sum] = e850eb91e4d3b94b194efe8e953204c5 SRC_URI[sha256sum] = b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6 -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/4] klibc: move comment outside multiline variable
* new bitbake doesn't like it Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb b/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb index 8abaf30..124a416 100644 --- a/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb +++ b/meta-oe/recipes-devtools/klibc/klibc_1.5.24.bb @@ -31,10 +31,10 @@ FILES_libklibc = ${base_libdir}/klibc-*.so FILES_libklibc-dev = ${base_libdir}/klibc.so \ ${base_libdir}/klibc/lib/* \ ${base_libdir}/klibc/include/* \ + # see above # do not package it in -dev # ${base_bindir}/klcc \ - require klibc-utils.inc require klibc.inc require klibc-checksums_${PV}.inc -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/4] serial-forward, pty-forward-native: remove extra slash and '.git' from SRC_URI
* causing multiple files and checkouts in downloads directory for same revision 4,3Mdownloads/git2/git.freesmartphone.org.cornucopia 4,3Mdownloads/git2/git.freesmartphone.org.cornucopia.git 4,3Mdownloads/git2/git.freesmartphone.org.cornucopia.git. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../serial-utils/pty-forward-native.bb |2 +- .../serial-utils/serial-forward_git.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 72dfa22..6bf1d85 100644 --- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -7,7 +7,7 @@ SRCREV = 00dbec2636ae0385ad028587e20e446272ff97ec PV = 1.1+gitr${SRCPV} PR = r0 -SRC_URI = ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git +SRC_URI = ${FREESMARTPHONE_GIT}/cornucopia;protocol=git S = ${WORKDIR}/git/tools/serial_forward inherit autotools native diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0e4ec44..cf66556 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -7,7 +7,7 @@ SRCREV = 00dbec2636ae0385ad028587e20e446272ff97ec PV = 1.1+gitr${SRCPV} PR = r0 -SRC_URI = ${FREESMARTPHONE_GIT}/cornucopia.git/;protocol=git +SRC_URI = ${FREESMARTPHONE_GIT}/cornucopia;protocol=git S = ${WORKDIR}/git/tools/serial_forward inherit autotools -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/4] xf86-video-omapfb: add patch for fixing segfault on starting X when using VRFB
From: Sebastian Krzyszkowiak d...@dosowisko.net Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../0004-Attempt-to-fix-VRFB.patch | 320 .../xorg-driver/xf86-video-omapfb_git.bb |3 +- 2 files changed, 322 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch new file mode 100644 index 000..4d2ecd3 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch @@ -0,0 +1,320 @@ +From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001 +From: Eino-Ville Talvala talv...@stanford.edu +Date: Tue, 23 Aug 2011 18:37:01 +0200 +Subject: [PATCH] Attempt to fix VRFB Signed-off-by: Sebastian Krzyszkowiak + d...@dosowisko.net + +--- + src/image-format-conversions.c |4 +- + src/image-format-conversions.h |2 +- + src/omapfb-driver.c| 28 +-- + src/omapfb-xv-blizzard.c |1 + + src/omapfb-xv-generic.c| 72 +++ + src/omapfb-xv.c|3 ++ + 6 files changed, 88 insertions(+), 22 deletions(-) + +diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c +index dcefa9b..d43427d 100644 +--- a/src/image-format-conversions.c b/src/image-format-conversions.c +@@ -38,13 +38,13 @@ + #include image-format-conversions.h + + /* Basic line-based copy for packed formats */ +-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest) ++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest) + { + int i; + int len = w * 2; + for (i = 0; i h; i++) + { +- memcpy(dest + i * len, src + i * stride, len); ++ memcpy(dest + i * dst_stride, src + i * src_stride, len); + } + } + +diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h +index 584896a..ba7caf2 100644 +--- a/src/image-format-conversions.h b/src/image-format-conversions.h +@@ -27,7 +27,7 @@ + #include stdint.h + + /* Basic line-based copy for packed formats */ +-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); ++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest); + + /* Basic C implementation of YV12/I420 to UYVY conversion */ + void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); +diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c +index 48aa09c..07989f5 100644 +--- a/src/omapfb-driver.c b/src/omapfb-driver.c +@@ -66,6 +66,7 @@ + #define OMAPFB_VERSION 1000 + #define OMAPFB_DRIVER_NAME OMAPFB + #define OMAPFB_NAME omapfb ++#define ENFORCE_MODES + + static Bool OMAPFBProbe(DriverPtr drv, int flags); + static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); +@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = { + typedef enum { + OPTION_ACCELMETHOD, + OPTION_FB, ++ OPTION_ROTATE, + } FBDevOpts; + + static const OptionInfoRec OMAPFBOptions[] = { + { OPTION_ACCELMETHOD, AccelMethod, OPTV_STRING,{0},FALSE }, + { OPTION_FB,fb, OPTV_STRING,{0},FALSE }, ++ { OPTION_ROTATE,rotation, OPTV_STRING,{0},FALSE }, + { -1, NULL, OPTV_NONE, {0},FALSE } + }; + +@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + { + OMAPFBPtr ofb; + EntityInfoPtr pEnt; ++ char *rotate; + rgb zeros = { 0, 0, 0 }; + struct stat st; + +@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + pScrn-progClock = TRUE; + pScrn-chipset = omapfb; + ++ xf86DrvMsg(pScrn-scrnIndex, X_INFO, Rotate test version 0.02\n); ++ + /* Start with configured virtual size */ + pScrn-virtualX = pScrn-display-virtualX; + pScrn-virtualY = pScrn-display-virtualY; +@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + ofb-CloseScreen = pScreen-CloseScreen; + pScreen-CloseScreen = OMAPFBCloseScreen; + ++ /* Enforce the default mode (this is silly I guess) */ ++#ifdef ENFORCE_MODES ++ //xf86DrvMsg(pScrn-scrnIndex, X_INFO, Enforcing modes\n); ++ //set_mode(ofb, ofb-default_mode); ++ //pScrn-displayWidth = ofb-fixed_info.line_length / ++ // (ofb-state_info.bits_per_pixel3); //ofb-state_info.xres; ++#endif ++ + /* Map our framebuffer memory */ ++ ofb-mem_info.size = ofb-fixed_info.line_length * ofb-state_info.yres; + ofb-fb = mmap (NULL, ofb-mem_info.size, + PROT_READ | PROT_WRITE,
[oe] [meta-efl][PATCH 0/2] Pull request #10
The following changes since commit a577b53823d5a0e078777a5fb56a1e3d776b3130: lmbench: Add version 3.0-a9 (initial recipe) (2011-09-01 16:30:32 +0200) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/meta-efl http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-efl Martin Jansa (2): evas: add evas-loader-svg back to RRECOMMENDS e-base: EFL_SRCREV bump meta-efl/classes/e-base.bbclass |2 +- meta-efl/recipes-efl/efl/evas.inc |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-efl][PATCH 1/2] evas: add evas-loader-svg back to RRECOMMENDS
* it doesn't look like whole Gtk+ anymore, but still needs gdk-pixbuf, libcairo2 etc. Package: evas-loader-svg Depends: libxcb1 (= 1.7), libxrender1 (= 0.9.6), libpixman-1-0 (= 0.22.2), libxml2 (= 2.7.8), libz1 (= 1.2.5), librsvg-2-2 (= 2.32.1), libfreetype6 (= 2.4.6), eina (= 1.0.999+svnr62850), libgcrypt11 (= 1.4.6), libpng12-0 (= 1.2.46), libffi5 (= 3.0.9), gdk-pixbuf (= 2.22.1), libcairo2 (= 1.10.2), libstdc++6 (= 4.6.1+svnr175454), libglib-2.0-0 (= 2.29.3+gitr1+d97cbc6731deab137770bc0fe9c69b06f689f5b4), libxau6 (= 1.0.6), libjpeg8 (= 8c), libx11-6 (= 1.4.3), evas (= 1.0.999+svnr62850), libfribidi0 (= 0.19.2), libc6 (= 2.13), pango (= 1.28.3), libgpg-error0 (= 1.10), libgnutls26 (= 2.12.5), libeet1 (= 1.4.999+svnr62850), libtasn1-3 (= 2.9), libexpat1 (= 2.0.1), libxdmcp6 (= 1.1.0), libfontconfig1 (= 2.8.0) Package: librsvg-2-2 Depends: libx11-6 (= 1.4.3), libpixman-1-0 (= 0.22.2), libxcb1 (= 1.7), libc6 (= 2.13), libxrender1 (= 0.9.6), libffi5 (= 3.0.9), libxml2 (= 2.7.8), libz1 (= 1.2.5), libfreetype6 (= 2.4.6), gdk-pixbuf (= 2.22.1), libpng12-0 (= 1.2.46), libcairo2 (= 1.10.2), libstdc++6 (= 4.6.1+svnr175454), libglib-2.0-0 (= 2.29.3+gitr1+d97cbc6731deab137770bc0fe9c69b06f689f5b4), libxau6 (= 1.0.6), libexpat1 (= 2.0.1), pango (= 1.28.3), libxdmcp6 (= 1.1.0), libfontconfig1 (= 2.8.0) * but otherwise e-wm keeps complaining about missing svg support Enlightenment Error Enlightenment found Evas can't load SVG files. Check Evas has SVG loader support. * we can also RRECOMMEND it only from e-wm, so people using only evas without e-wm won't get it by default Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-efl/recipes-efl/efl/evas.inc |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc index 3f7eed3..bbe06cc 100644 --- a/meta-efl/recipes-efl/efl/evas.inc +++ b/meta-efl/recipes-efl/efl/evas.inc @@ -44,6 +44,7 @@ RRECOMMENDS_${PN} = \ evas-loader-jpeg \ evas-loader-eet \ evas-loader-gif \ + evas-loader-svg \ # Some upgrade path tweaking @@ -74,11 +75,6 @@ RREPLACES_evas-engine-buffer = liblibevas-ver-pre-svn-00-engine-buffer libevas- RREPLACES_evas-engine-xrender-x11 = liblibevas-ver-pre-svn-00-engine-xrender-x11 libevas-ver-pre-svn-00-engine-xrender-x11 RREPLACES_evas-engine-software-x11 = liblibevas-ver-pre-svn-00-engine-software-x11 libevas-ver-pre-svn-00-engine-software-x11 -# disabling this, since (due to OE bugs) it drags in whole Gtk+ -#RRECOMMENDS_${PN} += \ -# libevas-loader-svg \ -# - EVAS_CPU_TWEAKS = # Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194 EVAS_CPU_TWEAKS_armv7a = --disable-cpu-neon -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-efl][PATCH 2/2] e-base: EFL_SRCREV bump
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-efl/classes/e-base.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 6e8713d..b4b91f4 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -2,7 +2,7 @@ HOMEPAGE = http://www.enlightenment.org; SRCNAME ?= ${BPN} # usually tracks svn trunk HEAD -EFL_SRCREV ?= 62690 +EFL_SRCREV ?= 63052 # revision when 1.0.0 was released, for recipes which don't need rebuild so often EFL_SRCREV_1.0.0 ?= 56356 -- 1.7.6.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce] task-xfce-base: add thunar-volman
On Thursday, September 01, 2011 09:44:51 AM you wrote: This fixes: ERROR: There is a comment on line 34 of file /OE/tentacle/sources/meta-openembedded/meta-xfce/recipes-xfce/tasks/task-x fce-base.bb (#thunar-volman \) which is in the middle of a multiline expression. Bitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change. Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta-xfce/recipes-xfce/tasks/task-xfce-base.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb index 8a87203..7589f6d 100644 --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb +++ b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb @@ -2,7 +2,7 @@ DESCRIPTION = All packages required for a base installation of XFCE SECTION = x11/wm LICENSE = MIT LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 -PR = r0 +PR = r1 inherit task @@ -31,5 +31,5 @@ RDEPENDS_${PN} = \ xfce4-settings \ xfce-terminal \ thunar \ -#thunar-volman \ +thunar-volman \ Acked-by: Andreas Müller schnitzelt...@gmx.de By the way: what is the automated / correct workflow to * apply a patch ( wget from patchwork 'git am'? ) * generate 'acked by' / 'tested by' / .. messages Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce] task-xfce-base: add thunar-volman
Op 1 sep. 2011, om 19:06 heeft Andreas Müller het volgende geschreven: On Thursday, September 01, 2011 09:44:51 AM you wrote: This fixes: ERROR: There is a comment on line 34 of file /OE/tentacle/sources/meta-openembedded/meta-xfce/recipes-xfce/tasks/task-x fce-base.bb (#thunar-volman \) which is in the middle of a multiline expression. Bitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change. Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta-xfce/recipes-xfce/tasks/task-xfce-base.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb index 8a87203..7589f6d 100644 --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb +++ b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb @@ -2,7 +2,7 @@ DESCRIPTION = All packages required for a base installation of XFCE SECTION = x11/wm LICENSE = MIT LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 -PR = r0 +PR = r1 inherit task @@ -31,5 +31,5 @@ RDEPENDS_${PN} = \ xfce4-settings \ xfce-terminal \ thunar \ -#thunar-volman \ +thunar-volman \ Acked-by: Andreas Müller schnitzelt...@gmx.de By the way: what is the automated / correct workflow to * apply a patch ( wget from patchwork 'git am'? ) * generate 'acked by' / 'tested by' / .. messages What I do when applying a patch: $ /OE/org.openembedded.dev/contrib/patchwork/pw-am.sh 10827 $ git show $ git push patchwork will have gathered all acked-by/signed-off-by from the followup emails. When replying to a patch I type up the acked-by stuff manually. Not sure how correct and/or optimal this is, but this is how I do it :) regards, Koen ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-handheld][PATCH 09/10] spitz, akita: add iwmmxt to PACKAGE_EXTRA_ARCHS_tune-xscale not PACKAGE_EXTRA_ARCHS
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 01-09-11 17:39, Martin Jansa schreef: * otherwise fails with: ERROR: Poky's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (armv5te). Speaking of iwmmxt, any volunteers to add the pixman iwmmxt patches to meta-oe? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) iD8DBQFOX75xMkyGM64RGpERAujsAJ96zq03L6VQigOp57pgAEj1DfWuPwCfWzdW iSyIDpTbMQQrLiFSes95H2k= =2Kaf -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 4/4] xf86-video-omapfb: add patch for fixing segfault on starting X when using VRFB
Hi, Le 01/09/2011 17:50, Martin Jansa a écrit : From: Sebastian Krzyszkowiakd...@dosowisko.net Signed-off-by: Martin Jansamartin.ja...@gmail.com --- .../0004-Attempt-to-fix-VRFB.patch | 320 .../xorg-driver/xf86-video-omapfb_git.bb |3 +- 2 files changed, 322 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch why does this driver is inside meta-oe layer instead of the TI layer ? btw, as we are starting porting our bsp against meta-oc, is there a document describing how the layers are splitted ? Eric ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel