diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-11-08 18:00:32 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-11-08 18:00:32 +0100 |
| commit | 4b03e3165fbc3593cf0da94f38736de950389688 (patch) | |
| tree | 8c11242a7a55e6fe9da8f4c1ca3efe6d27ff9a77 | |
| parent | ce0f6d41d8ecb160f7b53e9f05d584d4b0b0f9b2 (diff) | |
| parent | 5ef8dc482d56fdf0c59d9ce0eed32088611d491a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
52 files changed, 719 insertions, 395 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 2045697516..cb03650b48 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -24,6 +24,7 @@ gnome_stage_includes() { do_install_append() { rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* rm -f ${D}${datadir}/applications/*.cache } diff --git a/conf/checksums.ini b/conf/checksums.ini index 1737186b4c..fe22419c6e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1978,6 +1978,10 @@ sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd md5=cebfeb99c4a7c2a6cee2564770415fe7 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 +[http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/8.5.1/asciidoc-8.5.1.tar.gz] +md5=412fb0c86c3dcb4cc159ef63bd274c90 +sha256=ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20 + [http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2] md5=3e6bcedc549cb4c014227f882969db5c sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e @@ -19034,6 +19038,10 @@ sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff md5=14d9464043848eddd0bd0d35bbe63415 sha256=3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72 +[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.1.tar.bz2] +md5=e759af11a0844828e2b484ff42ee0498 +sha256=197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0 + [http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2] md5=50c5732c0c9736b7026bce1c6b0007dc sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07 diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 3978e8778f..5f33b46090 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # MIT Licensed # Initial version by Graeme 'XorA' Gregory, Further changes by Koen Kooi @@ -32,7 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq cat files-uniq files-local | sort | uniq -d > files-trans # Remove SGX files -rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*3.00.* +rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*kdrive*sgx* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." diff --git a/recipes/asciidoc/asciidoc_8.5.1.bb b/recipes/asciidoc/asciidoc_8.5.1.bb new file mode 100644 index 0000000000..7e7fde7e91 --- /dev/null +++ b/recipes/asciidoc/asciidoc_8.5.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." +HOMEPAGE = "http://www.methods.co.nz/asciidoc/" +LICENSE = "GPLv2" + +SRC_URI = "http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/${PV}/asciidoc-${PV}.tar.gz" + +inherit distutils-base autotools_stage pkgconfig + +export vimdir = "${D}${sysconfdir}/vim" +export DESTDIR = "${D}" + +do_install() { + sed -i -e s:/etc/vim::g ${S}/Makefile + oe_runmake -e install +} + +FILES_${PN} += "${sysconfdir}" + +# TODO: only depend on codecs, csv, doctest, fnmatch, getopt, HTMLParser, locale, optparse, os, re, shutil, StringIO, subprocess, sys, tempfile, time, traceback, urlparse, zipfile +RDEPENDS_${PN} += "python-modules" diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index 9dca7cb6b6..a8ee6ffa65 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS = "firefox gnome-mplayer" -PR = "r4" +PR = "r6" inherit autotools @@ -13,21 +13,23 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \ file://extensions \ " -# Yes, this needs to match the firefox version you are building *exactly* -MOZILLA_HOME = "firefox-3.5.4" - do_install_append() { - install -d ${D}${libdir}/${MOZILLA_HOME}/extensions/ cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ - ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com ${D}${libdir}/${MOZILLA_HOME}/extensions/ } PACKAGES =+ "${PN}-firefox-hack" RDEPENDS_${PN}-firefox-hack = "${PN}" -FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions ${libdir}/${MOZILLA_HOME}" +FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions" FILES_${PN} += "${sysconfdir}/* \ - ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}" + ${libdir}/mozilla/*" FILES_${PN}-dbg += "${libdir}/mozilla*/plugins/.debug/*" +pkg_postinst_${PN}-firefox-hack() { +for firefoxdir in $D${libdir}/firefox-* ; do + if [ -e $firefoxdir/extensions/ ] ; then + ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com $firefoxdir/extensions/ + fi +done +} diff --git a/recipes/gnome/gnome-icon-theme_1.3.3.bb b/recipes/gnome/gnome-icon-theme_1.3.3.bb deleted file mode 100644 index c601d2a5d0..0000000000 --- a/recipes/gnome/gnome-icon-theme_1.3.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib-2.0 intltool-native" -PR ="r1" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit autotools pkgconfig diff --git a/recipes/gnome/gnome-icon-theme_2.22.0.bb b/recipes/gnome/gnome-icon-theme_2.22.0.bb deleted file mode 100644 index d458d9ba74..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.22.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - -PACKAGE_ARCH = "all" diff --git a/recipes/gnome/gnome-icon-theme_2.24.0.bb b/recipes/gnome/gnome-icon-theme_2.24.0.bb deleted file mode 100644 index 755e39151e..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.24.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" - -PR = "r2" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - -pkg_postinst_${PN}() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -# Update the pixbuf loaders in case they haven't been registered yet -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders - -gtk-update-icon-cache -q /usr/share/icons/gnome -} - -pkg_postrm_${PN}() { -gtk-update-icon-cache -q /usr/share/icons/gnome -} - diff --git a/recipes/gnome/gnome-icon-theme_2.26.0.bb b/recipes/gnome/gnome-icon-theme_2.26.0.bb deleted file mode 100644 index 7e5c7b3af8..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.26.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - - diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index 38f212927f..e692287820 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -1,13 +1,16 @@ -LICENSE = "GPL" SECTION = "x11/gnome" +LICENSE = "GPL" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" + RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" -PACKAGE_ARCH = "all" -PR = "r1" -FILES_${PN} += "${datadir}/*" +PR = "r2" + +inherit gnome EXTRA_OECONF = "--disable-hicolor-check" -inherit gnome +PACKAGE_ARCH = "all" + +FILES_${PN} += "${datadir}/*" diff --git a/recipes/gnome/gnome-system-tools_2.27.1.bb b/recipes/gnome/gnome-system-tools_2.27.1.bb index a1e74bbf73..4839e5e9e6 100644 --- a/recipes/gnome/gnome-system-tools_2.27.1.bb +++ b/recipes/gnome/gnome-system-tools_2.27.1.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center" inherit gnome pkgconfig +PR = "r1" + EXTRA_OECONF = "--disable-scrollkeeper \ " LDFLAGS += "-lgthread-2.0" diff --git a/recipes/gnome/gnome-terminal_2.28.0.bb b/recipes/gnome/gnome-terminal_2.28.0.bb index 3a31bf3fbe..1bc87e735a 100644 --- a/recipes/gnome/gnome-terminal_2.28.0.bb +++ b/recipes/gnome/gnome-terminal_2.28.0.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "gnome-common glib-2.0 gtk+ gconf vte" inherit gnome pkgconfig +PR = "r1" + EXTRA_OECONF = "--disable-scrollkeeper" do_configure_prepend () { diff --git a/recipes/gnome/libgsf_1.14.16.bb b/recipes/gnome/libgsf_1.14.16.bb index 5697275f7a..9405b424bc 100644 --- a/recipes/gnome/libgsf_1.14.16.bb +++ b/recipes/gnome/libgsf_1.14.16.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "libs" -DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" +DEPENDS= "gtk+ libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" RDEPENDS = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " diff --git a/recipes/kexecboot/files/angstrom/icon.xpm b/recipes/kexecboot/files/angstrom/icon.xpm new file mode 100644 index 0000000000..77b6710bae --- /dev/null +++ b/recipes/kexecboot/files/angstrom/icon.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char * logo_xpm[] = { +"32 32 4 1", +" c None", +". c #729188", +"+ c #93ACA4", +"# c #CCCCCC", +" ", +" ++ ", +" ++ ", +" ++ ", +" .++. ", +" . . ", +" . . ", +" . ++ . ", +" ++++ ", +" ++++ ", +" +#++#+ ", +" +#++#+ ", +" +#+ +#+ ", +" +#+ +#+ ", +" ++ ++ ++ ", +" +#+ ++ +#+ ", +" ...+#+.++.+#+... ", +" ...#+..++..+#... ", +" +#+ ++ +#+ ", +" ++ ++ ++ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" +++ +++ ", +" .+ +. ", +" . . ", +" "}; diff --git a/recipes/kexecboot/files/icon.xpm b/recipes/kexecboot/files/icon.xpm new file mode 100644 index 0000000000..6e6fd776d8 --- /dev/null +++ b/recipes/kexecboot/files/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/kexecboot/kexecboot-0.4/add-reboot-option.patch b/recipes/kexecboot/kexecboot-0.4/add-reboot-option.patch deleted file mode 100644 index 52619229fd..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/add-reboot-option.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -536,11 +536,23 @@ int main(int argc, char **argv) - fread(&evt, sizeof(struct input_event), 1, f); - while(evt.type != EV_KEY || evt.value != 0); - -- if(evt.code == KEY_UP && choice >0) -- choice--; -- if(evt.code == KEY_DOWN && choice < bl->size-1) -- choice++; -- // printf("%d %d\n",choice, evt.code); -+ switch (evt.code) { -+ case KEY_UP: -+ if (choice > 0) choice--; -+ break; -+ case KEY_DOWN: -+ if ( choice < (bl->size - 1) ) choice++; -+ break; -+ case KEY_R: -+ /* FIXME: Should work while no boot devices is found */ -+ sync(); -+ sleep(1); -+ /* if ( -1 == reboot(LINUX_REBOOT_CMD_RESTART) ) { */ -+ if ( -1 == reboot(RB_AUTOBOOT) ) { -+ perror("Can't initiate reboot"); -+ } -+ break; -+ } - - }while(evt.code != 87 && evt.code != 63); - fclose(f); ---- a/kexecboot.h -+++ b/kexecboot.h -@@ -29,6 +29,7 @@ - #include <sys/wait.h> - #include <ctype.h> - #include <errno.h> -+#include <sys/reboot.h> - #include "fb.h" - #include "devicescan.h" - #include "res/logo-img.h" diff --git a/recipes/kexecboot/kexecboot-0.4/add-sleep.patch b/recipes/kexecboot/kexecboot-0.4/add-sleep.patch deleted file mode 100644 index 8f41b0ef10..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/add-sleep.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/kexecboot.c 2009-01-24 14:11:17.000000000 +0100 -+++ b/kexecboot.c 2009-01-24 14:15:03.000000000 +0100 -@@ -427,6 +427,9 @@ - - DPRINTF("I'm the init-process!\n"); - -+ /* extra delay for initializing slow SD/CF */ -+ sleep(1); -+ - /* Mount procfs */ - if ( -1 == mount("proc", "/proc", "proc", - 0, NULL) ) { diff --git a/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch b/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch deleted file mode 100644 index f3405e49d8..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: kexecboot-0.4/fb.c -=================================================================== ---- kexecboot-0.4.orig/fb.c 2009-01-29 22:03:34.000000000 +0000 -+++ kexecboot-0.4/fb.c 2009-01-29 22:08:22.000000000 +0000 -@@ -19,7 +19,15 @@ - - void fb_render(FB * fb) - { -- memcpy(fb->data, fb->backbuffer, fb->screensize); -+ uint16 *source, *dest; -+ int n = fb->screensize/2; -+ -+ source = (uint16 *)fb->backbuffer; -+ dest = (uint16 *)fb->data; -+ -+ while (n--) { -+ *dest++ = *source++; -+ } - } - - void fb_destroy(FB * fb) diff --git a/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch b/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch deleted file mode 100644 index b2cb214894..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -66,8 +66,15 @@ void display_menu(FB *fb, struct bootlist *bl, int current) - LOGO_IMG_WIDTH, - LOGO_IMG_HEIGHT, - LOGO_IMG_BYTES_PER_PIXEL, LOGO_IMG_RLE_PIXEL_DATA); -- fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -- "Make your choice by selecting\nan item with the cursor keys\nand press OK to continue"); -+ /* If no devices found print a message */ -+ if (0 == bl->size) { -+ fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -+ "No bootable devices found.\nInsert bootable device\nand press 'R' to reboot."); -+ } else { -+ fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -+ "Make your choice by selecting\nan item with the cursor keys\nand press OK to continue.\nPress 'R' to reboot."); -+ } -+ - if(current < firstslot) - firstslot=current; - if(current > firstslot + slots -1) diff --git a/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch b/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch deleted file mode 100644 index e1f4870853..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: kexecboot-0.4/kexecboot.c -=================================================================== ---- kexecboot-0.4.orig/kexecboot.c 2009-01-29 01:30:43.000000000 +0000 -+++ kexecboot-0.4/kexecboot.c 2009-01-29 01:39:17.000000000 +0000 -@@ -416,7 +416,7 @@ - {"Spitz", 270}, - - {"Collie", 270}, -- {"Tosa", 270}, -+ {"SHARP Tosa", 0}, - {"Poodle", 270}, - {NULL, 0} - }; -@@ -566,7 +566,9 @@ - break; - } - -- }while(evt.code != 87 && evt.code != 63); -+ }while(evt.code != 87 && evt.code != 63 && -+ evt.code != KEY_SPACE && evt.code != KEY_ENTER && -+ evt.code != KEY_HIRAGANA && evt.code != KEY_HENKAN); - fclose(f); - // reset terminal - tcsetattr(fileno(stdin), TCSANOW, &old); diff --git a/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch b/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch deleted file mode 100644 index 6b21d03a3d..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -508,28 +508,27 @@ int main(int argc, char **argv) - if ((fb = fb_new(angle)) == NULL) - exit(-1); - -- bl = scan_devices(); -- -- if(!bl->size){ -- puts("No bootable device found"); -- exit(-1); -- } -- - f = fopen(eventif,"r"); - if(!f){ - perror(eventif); - exit(3); - } - -- - // deactivate terminal input -- - tcgetattr(fileno(stdin), &old); - new = old; - new.c_lflag &= ~ECHO; - // new.c_cflag &=~CREAD; - tcsetattr(fileno(stdin), TCSANOW, &new); - -+ bl = scan_devices(); -+/* -+ if(!bl->size){ -+ puts("No bootable device found"); -+ exit(-1); -+ } -+*/ -+ - do{ - display_menu(fb, bl, choice); - do diff --git a/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch b/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch deleted file mode 100644 index abe8e84dd1..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/devicescan.c 2009-01-17 00:51:35.000000000 +0100 -+++ b/devicescan.c 2009-01-24 22:13:45.000000000 +0100 -@@ -120,14 +120,14 @@ - malloc((strlen(split) + strlen("/dev/") + - 1) * sizeof(char)); - sprintf(device, "/dev/%s", split); -- printf("Probing %s\n",device); -+ /* printf("Probing %s\n",device); */ - int fd = open(device, O_RDONLY); - if (fd < 0) { - perror(device); - free(device); - continue; - } -- printf("Device %s is opened\n", device); -+ /* printf("Device %s is opened\n", device); */ - if (-1 == identify_fs(fd, &fstype, NULL, 0)) { - free(device); - continue; -@@ -137,33 +137,33 @@ - free(device); - continue; - } -- printf("FS on device %s is %s\n", device, fstype); -+ /* printf("FS on device %s is %s\n", device, fstype); */ - // no unknown filesystems - if (contains(fstype, fl) == -1) { - free(device); - continue; - } -- printf("found %s (%s)\n",device, fstype); -+ /* printf("found %s (%s)\n",device, fstype); */ - // mount fs - if (mount(device, "/mnt", fstype, MS_RDONLY, NULL)) { -- printf("mount failed\n"); -+ /* printf("mount failed\n"); */ - perror(device); - free(device); - continue; - } -- printf("mount successful\n"); -+ /* printf("mount successful\n"); */ - if ( (g = fopen("/mnt/zImage", "r")) ) - kernelpath = "/mnt/zImage"; - else if ( (g = fopen("/mnt/boot/zImage", "r")) ) - kernelpath = "/mnt/boot/zImage"; - else { -- printf("%s no kernel found, umounting\n", device); -+ /* printf("%s no kernel found, umounting\n", device); */ - free(device); - umount("/mnt"); - continue; - } - fclose(g); -- printf("found kernel\n"); -+ /* printf("found kernel\n"); */ - bl->list[count] = malloc(sizeof(struct boot)); - bl->list[count]->device = device; - bl->list[count]->fstype = fstype; -@@ -174,7 +174,7 @@ - fgets(bl->list[count]->cmdline, COMMAND_LINE_SIZE, - g); - fclose(g); -- printf("found command line\n"); -+ /* printf("found command line\n"); */ - bl->list[count]->cmdline[strlen(bl->list[count]->cmdline)-1] = '\0'; - } else - bl->list[count]->cmdline = NULL; ---- a/kexecboot.c 2009-01-25 10:41:04.000000000 +0100 -+++ b/kexecboot.c 2009-01-24 22:13:45.000000000 +0100 -@@ -558,7 +558,7 @@ - case KEY_R: - /* FIXME: Should work while no boot devices is found */ - sync(); -- sleep(1); -+ /* REMOVE: we sleep on boot sleep(1); */ - /* if ( -1 == reboot(LINUX_REBOOT_CMD_RESTART) ) { */ - if ( -1 == reboot(RB_AUTOBOOT) ) { - perror("Can't initiate reboot"); diff --git a/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch b/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch deleted file mode 100644 index 632cc6a01c..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -512,6 +512,9 @@ int main(int argc, char **argv) - DPRINTF("FB angle is %d, input device is %s\n", angle, eventif); - DPRINTF("Going to fb mode\n"); - -+ /* Switch cursor off. NOTE: works only when master-console is tty */ -+ printf("\033[?25l\n"); -+ - if ((fb = fb_new(angle)) == NULL) - exit(-1); diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index 97407a8a0a..b867457e22 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -2,9 +2,11 @@ LICENSE = "GPL" SECTION = "base" DESCRIPTION = "Configuration file for kexecboot" -PR = "r5" +PR = "r7" PACKAGE_ARCH = "${MACHINE_ARCH}" +SRC_URI = "file://icon.xpm" + CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw" CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" @@ -29,18 +31,38 @@ CMDLINE += ${CMDLINE_DEBUG} FILES_${PN} += "/boot/*" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/icon.xpm ${S} +} + do_install_prepend () { - echo "DEFAULT=${DISTRO}" > ${S}/boot.cfg + + echo "# Show this label in kexecboot menu." >> ${S}/boot.cfg echo "LABEL=${DISTRO}" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Specify full path to the kernel." >> ${S}/boot.cfg echo "KERNEL=/boot/${KERNEL_IMAGETYPE}" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Append this tags to the kernel cmdline." >> ${S}/boot.cfg echo "APPEND=${CMDLINE}" >> ${S}/boot.cfg - echo "#ICON=/boot/my_icon.xpm" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Specify full path for a custom distro-icon for the menu-item." >> ${S}/boot.cfg + echo "# If not set, use device-icons as default (NAND, SD, CF, ...)." >> ${S}/boot.cfg + echo "#ICON=/boot/icon.xpm" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Priority of item in kexecboot menu." >> ${S}/boot.cfg + echo "# Items with highest priority will be shown at top of menu." >> ${S}/boot.cfg + echo "# Default: 0 (lowest, ordered by device ordering)" >> ${S}/boot.cfg + echo "#PRIORITY=10" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg } do_install () { - install -d ${D}/boot - install -m 0644 boot.cfg ${D}/boot/boot.cfg - - # old kexecboot versions < 0.52 were needing '/boot/kernel-cmdline' - # echo "${CMDLINE}"> ${D}/boot/kernel-cmdline + install -d ${D}/boot + install -m 0644 boot.cfg ${D}/boot/boot.cfg + install -m 0644 icon.xpm ${D}/boot/icon.xpm } diff --git a/recipes/kexecboot/kexecboot_0.4.bb b/recipes/kexecboot/kexecboot_0.4.bb deleted file mode 100644 index cf647a2c87..0000000000 --- a/recipes/kexecboot/kexecboot_0.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -PR = "r6" - -SRC_URI = "http://kexecboot.home.linuxtogo.org/kexecboot-${PV}.tar.gz \ - file://add-reboot-option.patch;patch=1 \ - file://scan_devices-top.patch;patch=1 \ - file://graphical-no-devices.patch;patch=1 \ - file://switch-cursor-off.patch;patch=1 \ - file://add-sleep.patch;patch=1 \ - file://silent-output-hack.patch;patch=1 \ - file://kexecboot-tosa.patch;patch=1 \ - file://fb-render-16bit.patch;patch=1" - -require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_0.5.bb b/recipes/kexecboot/kexecboot_0.5.bb deleted file mode 100644 index 04ab2772b4..0000000000 --- a/recipes/kexecboot/kexecboot_0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -PR = "r1" - -SRC_URI = "http://kexecboot.home.linuxtogo.org/kexecboot-${PV}.tar.gz" - -require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_git.bb b/recipes/kexecboot/kexecboot_git.bb index 3f63276386..e7b0990cd4 100644 --- a/recipes/kexecboot/kexecboot_git.bb +++ b/recipes/kexecboot/kexecboot_git.bb @@ -2,20 +2,8 @@ PV = "0.5" PR = "r5+gitr${SRCREV}" SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git " - -# v0.52 (using boot.cfg and new screen layout) -# looking forward to the new 0.6 version SRCREV = "8daf258fc5d1e5eb6127285c63d66f31f05cf80d" -# v0.51 (pre cfg-files, using kernel-cmdline) -#SRCREV = "c5f17845f0f620adff854c2239a8aaa5d9942255" - -# v0.5 (add rescan / reboot) -#SRCREV = "8823a939a38a8a3287f90dee062e8ab8569f884f" - -# v0.4 (add bootlogo) -#SRCREV = "d7af5356df4f25203831403c69f1a263c163f31a" - S = "${WORKDIR}/git" require kexecboot.inc diff --git a/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..008dabbe8d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch @@ -0,0 +1,43 @@ +From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Thu, 24 Jul 2008 16:05:09 -0400 +Subject: [PATCH 1/1] Remove -Werror from build + +Remove -Werror from build + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + configure | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +Index: mozilla-1.9.1/configure +=================================================================== +--- mozilla-1.9.1.orig/configure ++++ mozilla-1.9.1/configure +@@ -5525,7 +5525,7 @@ if test "$GNU_CC"; then + # Don't allow undefined symbols in libraries + DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" +@@ -7104,7 +7104,7 @@ EOF + IMPLIB='emximp -o' + FILTER='emxexp -o' + LDFLAGS='-Zmap' +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_DEBUG_FLAGS="-g -fno-inline" + MOZ_OPTIMIZE_FLAGS="-O2" + MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" +@@ -7283,7 +7283,7 @@ else + fi + rm -f conftest* + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_OPTIMIZE_FLAGS="-xO4" + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' diff --git a/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch new file mode 100644 index 0000000000..ce8d4d9948 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch @@ -0,0 +1,42 @@ +From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Fri, 25 Jul 2008 11:20:02 -0400 +Subject: [PATCH 1/1] Fix security cross compile cpu detection error + +Fix security cross compile cpu detection error. +Reference to bug 376279. + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + security/coreconf/arch.mk | 2 ++ + security/manager/Makefile.in | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk +index fba38ff..28da32e 100644 +--- a/security/coreconf/arch.mk ++++ b/security/coreconf/arch.mk +@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + ++ifndef OE_TEST + OS_TEST := $(shell uname -m) ++endif + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in +index 86119f7..86c09ca 100644 +--- a/security/manager/Makefile.in ++++ b/security/manager/Makefile.in +@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ + RC="$(RC) $(RCFLAGS)" \ + OS_ARCH="$(OS_ARCH)" \ + CPU_ARCH="$(TARGET_CPU)" \ ++ OS_TEST="$(TARGET_CPU)" \ + $(NULL) + SKIP_CHK=1 + endif +-- +1.5.4.3 diff --git a/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff new file mode 100644 index 0000000000..854100c4c3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff @@ -0,0 +1,56 @@ +# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler +# +--- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 ++++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 +@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask + /** + * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: + * ARM is a little endian architecture but 64 bit double words are stored + * differently: the 32 bit words are in little endian byte order, the two words + * are stored in big endian`s way. + */ + + #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) +-#define CPU_IS_ARM ++#if !defined(__VFP_FP__) ++#define FPU_IS_ARM_FPA ++#endif + #endif + + #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 + /** + * This version of the macros is safe for the alias optimizations + * that gcc does, but uses gcc-specific extensions. + */ + + typedef union txdpun { + PRFloat64 d; + struct { +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + PRUint32 lo, hi; + #else + PRUint32 hi, lo; + #endif + } s; + } txdpun; + + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + + #else // __GNUC__ + + /* We don't know of any non-gcc compilers that perform alias optimization, + * so this code should work. + */ + +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) + #else + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) + #endif + + #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff new file mode 100644 index 0000000000..0848e730d3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff @@ -0,0 +1,39 @@ +# XPTC_InvokeByIndex crashes +# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) +Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +=================================================================== +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -51,22 +51,32 @@ + #ifdef __ARM_EABI__ + #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) + #define VAR_STACK_SIZE_64 3 + #else + #define DOUBLEWORD_ALIGN(p) (p) + #define VAR_STACK_SIZE_64 2 + #endif + ++#ifdef __ARM_EABI__ ++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) ++#else ++#define DOUBLEWORD_ALIGN(p) (p) ++#endif ++ + // Remember that these 'words' are 32bit DWORDS + + static PRUint32 + invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) + { + PRUint32 result = 0; ++ ++ /* Note that we give a "worst case" estimate of how much stack _might_ be ++ * needed, rather than the real count - this should be safe */ ++ + for(PRUint32 i = 0; i < paramCount; i++, s++) + { + if(s->IsPtrData()) + { + result++; + continue; + } + switch(s->type) diff --git a/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff new file mode 100644 index 0000000000..486440c30e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff @@ -0,0 +1,33 @@ +diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h +--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 +@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) +-/* ARM/Linux */ ++#elif defined(__arm__) && !defined(__ARM_EABI__) ++/* ARM/Linux (old-ABI) */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) +@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux (EABI) */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + + #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff new file mode 100644 index 0000000000..f54f916a6a --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff @@ -0,0 +1,48 @@ +# Add atomic operations for ARM. +diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h +index 5b794c5..cb8d58e 100644 +--- a/nsprpub/pr/include/md/_linux.h ++++ b/nsprpub/pr/include/md/_linux.h +@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + }) + #endif + ++#if defined(__arm__) ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++ ++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); ++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) ++ ++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) ++#define _MD_ATOMIC_ADD(ptr, n) \ ++ ({ \ ++ PRInt32 ov, nv; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ nv = ov + (n); \ ++ } \ ++ while (__kernel_cmpxchg(ov, nv, vp)); \ ++ \ ++ nv; \ ++ }) ++#define _MD_ATOMIC_SET(ptr, nv) \ ++ ({ \ ++ PRInt32 ov; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ } \ ++ while (__kernel_cmpxchg(ov, (nv), vp)); \ ++ \ ++ ov; \ ++ }) ++#endif ++ + #define USE_SETJMP + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.5.5/configure-wchart.patch b/recipes/mozilla/firefox-3.5.5/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/configure-wchart.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2008-04-15 12:56:35.000000000 +0300 ++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 +@@ -2743,7 +2743,7 @@ + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_LINK([#include <stddef.h> ++ [AC_TRY_COMPILE([#include <stddef.h> + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch new file mode 100644 index 0000000000..d1d740989e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch @@ -0,0 +1,28 @@ +--- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 ++++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 +@@ -386,7 +386,7 @@ + #else + # define NO_TLS + #endif +-#if 0 ++ + #ifdef __i386__ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 +@@ -420,7 +420,6 @@ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 + #endif +-#endif + + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) + +@@ -2582,7 +2581,7 @@ + * knowledge of how _pthread_self() calculates values, we can't + * easily do much better than this. + */ +- ind = (unsigned long) _pthread_self() % narenas; ++ ind = 255255 % narenas; + + /* + * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.5.5/linkage-problem.patch b/recipes/mozilla/firefox-3.5.5/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/recipes/mozilla/firefox-3.5.5/mozconfig b/recipes/mozilla/firefox-3.5.5/mozconfig new file mode 100644 index 0000000000..d8d3f3923d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/mozconfig @@ -0,0 +1,72 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-bz2 +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache +ac_add_options --disable-updater + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +#ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul + +# Disable striping +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.5.5/plugins-dir.patch b/recipes/mozilla/firefox-3.5.5/plugins-dir.patch new file mode 100644 index 0000000000..2c8b8e9bd1 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/plugins-dir.patch @@ -0,0 +1,16 @@ +Index: mozilla-1.9.1/build/unix/mozilla.in +=================================================================== +--- mozilla-1.9.1.orig/build/unix/mozilla.in ++++ mozilla-1.9.1/build/unix/mozilla.in +@@ -52,6 +52,11 @@ + + moz_libdir=%MOZAPPDIR% + ++if test -d /usr/lib/mozilla/plugins; then ++ MOZ_PLUGIN_PATH="${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}/usr/lib/mozilla/plugins" ++ export MOZ_PLUGIN_PATH ++fi ++ + # Use run-mozilla.sh in the current dir if it exists + # If not, then start resolving symlinks until we find run-mozilla.sh + found=0 diff --git a/recipes/mozilla/firefox-3.5.5/security-cross.patch b/recipes/mozilla/firefox-3.5.5/security-cross.patch new file mode 100644 index 0000000000..b6c32fe52f --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/security-cross.patch @@ -0,0 +1,64 @@ +--- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 ++++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 +@@ -52,59 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq (,$(filter-out parisc%,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq (,$(filter-out i%86,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-else +-ifeq ($(OS_TEST),sh4a) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sh4 +-else +-# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = $(OS_TEST) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index 8526a8d151..0539a2d0c6 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -81,7 +81,6 @@ PRIVATE_LIBS = "libnssckbi.so \ libxul.so \ libplds4.so \ libnssutil3.so \ - libsqlite3.so \ libsoftokn3.so \ libnssdbm3.so \ libsmime3.so \ diff --git a/recipes/nautilus/nautilus_2.28.1.bb b/recipes/nautilus/nautilus_2.28.1.bb new file mode 100644 index 0000000000..e3a551c76f --- /dev/null +++ b/recipes/nautilus/nautilus_2.28.1.bb @@ -0,0 +1,37 @@ +# nautilus OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +inherit gnome + +SRC_URI += "file://idl-sysroot.patch;patch=1 \ + file://no-try-run-strftime.diff;patch=1 \ +" + +export SYSROOT = "${STAGING_DIR_HOST}" + +LICENSE="GPL" + +DEPENDS += "libunique gvfs tracker librsvg libexif eel esound gnome-desktop orbit2-native" +RDEPENDS = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash" + +EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " + +PACKAGES += " libnautilus" + +FILES_${PN} += "${datadir}/icons /usr/libexec/ " +FILES_libnautilus = "/usr/lib/*.so*" +FILES_${PN}-dbg += "/usr/libexec/.debug" + +do_configure_prepend() { + sed -i -e /docs/d Makefile.am +} + +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + +do_stage() { + autotools_stage_all +} diff --git a/recipes/openobex/obex-data-server_0.4.4.bb b/recipes/openobex/obex-data-server_0.4.4.bb index 34efcc738a..555f6df91f 100644 --- a/recipes/openobex/obex-data-server_0.4.4.bb +++ b/recipes/openobex/obex-data-server_0.4.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX client and server side functionality" LICENSE = "GPLv2" -DEPENDS = "bluez4 dbus-glib openobex" +DEPENDS = "gtk+ bluez4 dbus-glib openobex" SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" diff --git a/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch b/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch new file mode 100644 index 0000000000..951bd82461 --- /dev/null +++ b/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch @@ -0,0 +1,19 @@ +--- a/src/kernel/qpixmapcache.cpp 2005-01-23 14:00:46.000000000 +0000 ++++ b/src/kernel/qpixmapcache.cpp 2009-11-05 22:49:44.000000000 +0000 +@@ -119,13 +119,13 @@ + #include <time.h> + #include <stdio.h> + #include <signal.h> ++#include <unistd.h> + + #ifdef THROW_AWAY_UNUSED_PAGES + # include <sys/mman.h> // madvise +-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +-# ifndef PAGE_ALIGN ++# define PAGE_SIZE getpagesize() ++# define PAGE_MASK (~(PAGE_SIZE-1)) + # define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +-# endif // PAGE_ALIGN + #endif // THROW_AWAY_UNUSED_PAGES + + diff --git a/recipes/qte/qte-2.3.10/kernel-asm-page.patch b/recipes/qte/qte-2.3.10/kernel-asm-page.patch deleted file mode 100644 index bad2d95967..0000000000 --- a/recipes/qte/qte-2.3.10/kernel-asm-page.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp -index c2e7d9b..8d39585 100644 ---- a/src/kernel/qpixmapcache.cpp -+++ b/src/kernel/qpixmapcache.cpp -@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); - #ifdef THROW_AWAY_UNUSED_PAGES - # include <sys/mman.h> // madvise - # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN -+# include <unistd.h> // getpagesize() -+# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) -+# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -+# endif - # ifndef PAGE_ALIGN --# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) --# endif // PAGE_ALIGN -+# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) -+# endif - #endif // THROW_AWAY_UNUSED_PAGES - - diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc index f24a265bf0..cd2aa4f1a2 100644 --- a/recipes/qte/qte-common_2.3.10.inc +++ b/recipes/qte/qte-common_2.3.10.inc @@ -45,9 +45,9 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://keyboardless-buttonmap.patch;patch=1 \ file://kernel-keymap.patch;patch=1 \ file://kernel-keymap-corgi.patch;patch=1 \ - file://kernel-asm-page.patch;patch=1 \ file://remove-unused-kbdhandler.patch;patch=1 \ file://disable-dup-rotation.patch;patch=1 \ + file://fix-qte-asm-include.patch;patch=1 \ file://sharp_char.h \ file://switches.h " diff --git a/recipes/qte/qte-mt-static_2.3.10.bb b/recipes/qte/qte-mt-static_2.3.10.bb index 68ab2aceab..35640e5f3b 100644 --- a/recipes/qte/qte-mt-static_2.3.10.bb +++ b/recipes/qte/qte-mt-static_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r8" +PR = "r9" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/qte/qte-mt_2.3.10.bb b/recipes/qte/qte-mt_2.3.10.bb index 71873dc51a..00e5d72e64 100644 --- a/recipes/qte/qte-mt_2.3.10.bb +++ b/recipes/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r28" +PR = "r29" EXTRA_OECONF += "-thread" diff --git a/recipes/qte/qte_2.3.10.bb b/recipes/qte/qte_2.3.10.bb index 1183bc29bf..9a8be94a65 100644 --- a/recipes/qte/qte_2.3.10.bb +++ b/recipes/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r53" +PR = "r54" diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc index ae20ff5ead..fae8966ba2 100644 --- a/recipes/sqlite/sqlite3.inc +++ b/recipes/sqlite/sqlite3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "An Embeddable SQL Database Engine" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "readline ncurses" +DEPENDS = "tcl-native readline ncurses" LICENSE = "PD" SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ diff --git a/recipes/u-boot/files/omap3-touchbook/fw_env.config b/recipes/u-boot/files/omap3-touchbook/fw_env.config index a7bfec1ebb..4063144d36 100644 --- a/recipes/u-boot/files/omap3-touchbook/fw_env.config +++ b/recipes/u-boot/files/omap3-touchbook/fw_env.config @@ -3,4 +3,4 @@ # environment sector is assumed present. # MTD device name Device offset Env. size Flash sector size -/dev/mtd2 0x0000 0x20000 0x20000 +/dev/mtd2 0x0000 0x20000 0x40000 diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 39d6864a4d..e674e4d25b 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r34" +PR ="r35" FILESPATHPKG =. "u-boot-git:" |