From d0324aa3e0fc0294cb244be083e3ae0c744a5fe5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 May 2009 16:45:06 +0100 Subject: opie-packagemanager / opie-sheet: Add notes to recently added patches indicating upstream status. --- recipes/opie-packagemanager/files/split-config.patch | 2 ++ recipes/opie-sheet/opie-sheet/different-arg-names.patch | 2 ++ 2 files changed, 4 insertions(+) (limited to 'recipes') diff --git a/recipes/opie-packagemanager/files/split-config.patch b/recipes/opie-packagemanager/files/split-config.patch index 1feb6aea68..5abe5433aa 100644 --- a/recipes/opie-packagemanager/files/split-config.patch +++ b/recipes/opie-packagemanager/files/split-config.patch @@ -1,3 +1,5 @@ +# NOTE: This patch has been applied upstream and will be included in 1.2.5 +# - Paul Eggleton --- packagemanager/oipkg.cpp 2009-05-11 23:06:48.000000000 +0100 +++ packagemanager/oipkg.cpp 2009-05-11 23:06:50.000000000 +0100 @@ -30,6 +30,8 @@ diff --git a/recipes/opie-sheet/opie-sheet/different-arg-names.patch b/recipes/opie-sheet/opie-sheet/different-arg-names.patch index a86aa9edd3..fa1a527cf6 100644 --- a/recipes/opie-sheet/opie-sheet/different-arg-names.patch +++ b/recipes/opie-sheet/opie-sheet/different-arg-names.patch @@ -1,3 +1,5 @@ +# NOTE: This patch has been applied upstream and will be included in 1.2.5 +# - Paul Eggleton --- opie-sheet/sheet.h 2009-05-25 07:47:12.042719009 +0200 +++ opie-sheet/sheet.h 2009-05-25 08:07:19.291516199 +0200 @@ -209,7 +207,7 @@ -- cgit v1.2.3 From a0522baa70eb3a1ea9a9d8d814897262a6c43429 Mon Sep 17 00:00:00 2001 From: Tim Ellis Date: Sat, 30 May 2009 17:16:06 +0100 Subject: php: Add fastcgi support --- recipes/php/php_5.2.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/php/php_5.2.6.bb b/recipes/php/php_5.2.6.bb index 2cf5e285e6..c6cb00fa0f 100644 --- a/recipes/php/php_5.2.6.bb +++ b/recipes/php/php_5.2.6.bb @@ -2,7 +2,7 @@ require php.inc DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native" -PR = "r4" +PR = "r5" SRC_URI += "file://pear-makefile.patch;patch=1 " @@ -17,6 +17,7 @@ EXTRA_OECONF = " --without-iconv \ --enable-wddx \ --enable-embedded-mysqli \ --enable-magic-quotes \ + --enable-fastcgi \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-libxml-dir=${STAGING_BINDIR_CROSS} \ # --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ -- cgit v1.2.3 From f18439433c8795e31da60d20a2c49fb343db9dfb Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Sat, 23 May 2009 10:35:16 +0000 Subject: libnsbmp: add recipe for version 0.0.1 libnsbmp is BMP and ICO decoding library. Currently only Netsurf browser is using it, so we build just static library. Signed-off-by: Dmitry Artamonow Acked-by: Tom Rini --- recipes/netsurf/libnsbmp_0.0.1.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes/netsurf/libnsbmp_0.0.1.bb (limited to 'recipes') diff --git a/recipes/netsurf/libnsbmp_0.0.1.bb b/recipes/netsurf/libnsbmp_0.0.1.bb new file mode 100644 index 0000000000..a17cd31746 --- /dev/null +++ b/recipes/netsurf/libnsbmp_0.0.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Libnsbmp is a decoding library for the BMP and ICO image file formats" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libnsbmp/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsbmp-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libnsbmp ${STAGING_LIBDIR} + install -m 0644 include/*.h ${STAGING_INCDIR}/ +} + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From 6adb84f4f4d5b43e9ef85f156228dc2c0f04afe3 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Sat, 23 May 2009 10:35:17 +0000 Subject: libnsgif: add recipe for version 0.0.1 libnsgif is GIF decoding library. Currently only Netsurf browser is using it, so we build just static library. Signed-off-by: Dmitry Artamonow Acked-by: Tom Rini --- recipes/netsurf/libnsgif_0.0.1.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes/netsurf/libnsgif_0.0.1.bb (limited to 'recipes') diff --git a/recipes/netsurf/libnsgif_0.0.1.bb b/recipes/netsurf/libnsgif_0.0.1.bb new file mode 100644 index 0000000000..3b9cfc2930 --- /dev/null +++ b/recipes/netsurf/libnsgif_0.0.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Libnsgif is a decoding library for the GIF image file format" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libnsgif/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsgif-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libnsbmp is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libnsgif ${STAGING_LIBDIR} + install -m 0644 include/*.h ${STAGING_INCDIR}/ +} + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From 13cae2bad12a26706f60768572ca23cdb74a60e7 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Sat, 23 May 2009 10:35:18 +0000 Subject: libparserutils: add recipe for version 0.0.1 LibParserUtils is a library for building efficient parsers. Currently only Netsurf browser is using it (via hubbub), so we build just static library. Please note that this build doesn't use external iconv(), so only few built-in charsets are supported (UTF-8/16, windows-125x, iso-8859-*) We may revisit this later, if there's a need. Signed-off-by: Dmitry Artamonow Acked-by: Tom Rini --- recipes/netsurf/libparserutils_0.0.1.bb | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes/netsurf/libparserutils_0.0.1.bb (limited to 'recipes') diff --git a/recipes/netsurf/libparserutils_0.0.1.bb b/recipes/netsurf/libparserutils_0.0.1.bb new file mode 100644 index 0000000000..5317364a84 --- /dev/null +++ b/recipes/netsurf/libparserutils_0.0.1.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "LibParserUtils is a library for building efficient parsers" +HOMEPAGE = "http://www.netsurf-browser.org/projects/libparserutils/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/libparserutils-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as libparserutils is only used by Netsurf +# at the moment + +do_stage () { + oe_libinstall -a -C build-OE/ libparserutils ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/parserutils + install -d ${STAGING_INCDIR}/parserutils/charset + install -d ${STAGING_INCDIR}/parserutils/input + install -d ${STAGING_INCDIR}/parserutils/utils + install -m 0644 include/parserutils/*.h ${STAGING_INCDIR}/parserutils + install -m 0644 include/parserutils/charset/*.h \ + ${STAGING_INCDIR}/parserutils/charset + install -m 0644 include/parserutils/input/*.h \ + ${STAGING_INCDIR}/parserutils/input + install -m 0644 include/parserutils/utils/*.h \ + ${STAGING_INCDIR}/parserutils/utils +} + + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From b66852caed52146efcb1ae8145d535780ae6c943 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Sat, 23 May 2009 10:35:19 +0000 Subject: hubbub: add recipe for version 0.0.1 Hubbub is an HTML5 compliant parsing library, written in C. Currently only Netsurf browser is using it, so we build just static library. Signed-off-by: Dmitry Artamonow Acked-by: Tom Rini --- recipes/netsurf/hubbub_0.0.1.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes/netsurf/hubbub_0.0.1.bb (limited to 'recipes') diff --git a/recipes/netsurf/hubbub_0.0.1.bb b/recipes/netsurf/hubbub_0.0.1.bb new file mode 100644 index 0000000000..0d70b4165d --- /dev/null +++ b/recipes/netsurf/hubbub_0.0.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Hubbub is an HTML5 compliant parsing library" +HOMEPAGE = "http://www.netsurf-browser.org/projects/hubbub/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "libparserutils" + +SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz" + +inherit pkgconfig + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE" + +# NOTE: we're using default buildmode here, which results in building only +# static libraries (.a) Not a problem as hubbub is only used by Netsurf +# at the moment + +do_stage() { + oe_libinstall -a -C build-OE/ libhubbub ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/hubbub + install -m 0644 include/hubbub/*.h ${STAGING_INCDIR}/hubbub +} + + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From 8fdae48f8fcadabf049b378a48a9dfea11ba02f4 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Sat, 23 May 2009 22:45:05 +0000 Subject: netsurf: add recipe for version 2.1 It's gtk+ version built with GIF,JPEG,PNG and without SVG,MNG and PDF printing support. Signed-off-by: Dmitry Artamonow Acked-by: Tom Rini --- recipes/netsurf/netsurf-2.1/Makefile.config | 9 ++++ recipes/netsurf/netsurf-2.1/debugxml_fix.patch | 64 +++++++++++++++++++++++++ recipes/netsurf/netsurf-2.1/fix_makefile.patch | 12 +++++ recipes/netsurf/netsurf-2.1/netsurf.desktop | 10 ++++ recipes/netsurf/netsurf-2.1/netsurf.png | Bin 0 -> 9329 bytes recipes/netsurf/netsurf_2.1.bb | 32 +++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 recipes/netsurf/netsurf-2.1/Makefile.config create mode 100644 recipes/netsurf/netsurf-2.1/debugxml_fix.patch create mode 100644 recipes/netsurf/netsurf-2.1/fix_makefile.patch create mode 100644 recipes/netsurf/netsurf-2.1/netsurf.desktop create mode 100644 recipes/netsurf/netsurf-2.1/netsurf.png create mode 100644 recipes/netsurf/netsurf_2.1.bb (limited to 'recipes') diff --git a/recipes/netsurf/netsurf-2.1/Makefile.config b/recipes/netsurf/netsurf-2.1/Makefile.config new file mode 100644 index 0000000000..72c86003f5 --- /dev/null +++ b/recipes/netsurf/netsurf-2.1/Makefile.config @@ -0,0 +1,9 @@ +override NETSURF_USE_BMP := YES +override NETSURF_USE_GIF := YES +override NETSURF_USE_JPEG := YES +override NETSURF_USE_PNG := YES +override NETSURF_USE_MNG := NO +override NETSURF_USE_HARU_PDF := NO +override NETSURF_USE_RSVG := NO +override NETSURF_USE_ROSPRITE := NO + diff --git a/recipes/netsurf/netsurf-2.1/debugxml_fix.patch b/recipes/netsurf/netsurf-2.1/debugxml_fix.patch new file mode 100644 index 0000000000..3a6626abe8 --- /dev/null +++ b/recipes/netsurf/netsurf-2.1/debugxml_fix.patch @@ -0,0 +1,64 @@ +--- netsurf-2.0/gtk/gtk_scaffolding.c.orig 2009-05-15 01:18:44.000000000 +0400 ++++ netsurf-2.0/gtk/gtk_scaffolding.c 2009-05-15 01:24:32.000000000 +0400 +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include "content/content.h" + #include "desktop/browser.h" + #include "desktop/history_core.h" +@@ -1040,52 +1039,7 @@ + + MENUHANDLER(save_dom_tree) + { +- GtkWidget *save_dialog; +- struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; +- +- save_dialog = gtk_file_chooser_dialog_new("Save File", gw->window, +- GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, +- NULL); +- +- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog), +- getenv("HOME") ? getenv("HOME") : "/"); +- +- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_dialog), +- "domtree.txt"); +- +- if (gtk_dialog_run(GTK_DIALOG(save_dialog)) == GTK_RESPONSE_ACCEPT) { +- gchar *filename = gtk_file_chooser_get_filename( +- GTK_FILE_CHOOSER(save_dialog)); +- FILE *fh; +- LOG(("Saving dom tree to %s...\n", filename)); +- +- fh = fopen((const char *) filename, "w"); +- if (fh == NULL) { +- warn_user("Error saving box tree dump.", +- "Unable to open file for writing."); +- } else { +- struct browser_window *bw; +- bw = nsgtk_get_browser_window(gw->top_level); +- +- if (bw->current_content && +- bw->current_content->type == +- CONTENT_HTML) { +- xmlDebugDumpDocument(fh, +- bw->current_content-> +- data.html.document); +- } +- +- fclose(fh); +- } +- +- g_free(filename); +- } +- +- gtk_widget_destroy(save_dialog); +- +- return TRUE; ++ return FALSE; + } + + diff --git a/recipes/netsurf/netsurf-2.1/fix_makefile.patch b/recipes/netsurf/netsurf-2.1/fix_makefile.patch new file mode 100644 index 0000000000..1783921d1e --- /dev/null +++ b/recipes/netsurf/netsurf-2.1/fix_makefile.patch @@ -0,0 +1,12 @@ +Index: Makefile +=================================================================== +--- a/Makefile (revision 7536) ++++ b/Makefile (working copy) +@@ -820,7 +820,6 @@ + @cp -vRL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES) + @cp -vRL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber + @cp -vRL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES) +- @cp -vrL gtk/res/docs $(DESTDIR)/$(NETSURF_GTK_RESOURCES) + gzip -9v < gtk/res/messages > $(DESTDIR)$(NETSURF_GTK_RESOURCES)messages + gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade + gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)netsurf.glade diff --git a/recipes/netsurf/netsurf-2.1/netsurf.desktop b/recipes/netsurf/netsurf-2.1/netsurf.desktop new file mode 100644 index 0000000000..4188d3019d --- /dev/null +++ b/recipes/netsurf/netsurf-2.1/netsurf.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=NetSurf +Comment=NetSurf Web Browser +GenericName=Web Browser +Icon=netsurf +Exec=netsurf +Terminal=false +StartupNotify=false +Categories=Network;WebBrowser; diff --git a/recipes/netsurf/netsurf-2.1/netsurf.png b/recipes/netsurf/netsurf-2.1/netsurf.png new file mode 100644 index 0000000000..3064e5d4f3 Binary files /dev/null and b/recipes/netsurf/netsurf-2.1/netsurf.png differ diff --git a/recipes/netsurf/netsurf_2.1.bb b/recipes/netsurf/netsurf_2.1.bb new file mode 100644 index 0000000000..073f17f53b --- /dev/null +++ b/recipes/netsurf/netsurf_2.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Lightweight web browser capable of handling many of the \ +web standards in use today." +HOMEPAGE = "http://www.netsurf-browser.org/" +SECTION = "x11/network" +LICENSE = "GPLv2" + +SRC_URI = "http://www.netsurf-browser.org/downloads/releases/netsurf-${PV}-src.tar.gz \ + file://fix_makefile.patch;patch=1 \ + file://debugxml_fix.patch;patch=1 \ + file://netsurf.png \ + file://netsurf.desktop \ + file://Makefile.config" + +# Workaround for 2.1 tarball (unpacks into netsurf/, not netsurf-2.1/ ) +S = "${WORKDIR}/netsurf" + +DEPENDS = "gtk+ lemon-native re2c-native jpeg openssl curl libxml2 \ + libglade hubbub libnsgif libnsbmp lcms" + +EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix}" + +do_configure() { + cp ${WORKDIR}/Makefile.config ${S}/ +} + +do_install() { + oe_runmake install + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/netsurf.png ${D}/${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/netsurf.desktop ${D}/${datadir}/applications/ +} -- cgit v1.2.3 From 62f8d78721e7685e77a9262ef09215853bab41c9 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 28 May 2009 08:24:10 +0000 Subject: syslog-ng: fix SRC_URIs Signed-off-by: Michael Smith Acked-by: Denys Dmytriyenko --- recipes/syslog-ng/syslog-ng_1.6.11.bb | 2 +- recipes/syslog-ng/syslog-ng_1.6.8.bb | 2 +- recipes/syslog-ng/syslog-ng_2.0.5.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/syslog-ng/syslog-ng_1.6.11.bb b/recipes/syslog-ng/syslog-ng_1.6.11.bb index 794ad5335c..0ae0090da2 100644 --- a/recipes/syslog-ng/syslog-ng_1.6.11.bb +++ b/recipes/syslog-ng/syslog-ng_1.6.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon" DEPENDS = "libol flex" PR = "r0" -SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \ +SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \ file://syslog-ng.conf \ file://initscript" diff --git a/recipes/syslog-ng/syslog-ng_1.6.8.bb b/recipes/syslog-ng/syslog-ng_1.6.8.bb index d8e02d0da2..95356565dc 100644 --- a/recipes/syslog-ng/syslog-ng_1.6.8.bb +++ b/recipes/syslog-ng/syslog-ng_1.6.8.bb @@ -2,7 +2,7 @@ PR = "r9" DESCRIPTION = "Alternative system logger daemon" DEPENDS = "libol flex" -SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \ +SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \ file://syslog-ng.conf \ file://initscript" diff --git a/recipes/syslog-ng/syslog-ng_2.0.5.bb b/recipes/syslog-ng/syslog-ng_2.0.5.bb index 80f0fc59c6..5b3431c368 100644 --- a/recipes/syslog-ng/syslog-ng_2.0.5.bb +++ b/recipes/syslog-ng/syslog-ng_2.0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon" DEPENDS = "libol flex eventlog glib-2.0" PR = "r2" -SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/${P}.tar.gz \ +SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/${P}.tar.gz \ file://syslog-ng.conf \ file://initscript" -- cgit v1.2.3 From e8097fafd9c9fb0a7f86573859bfb72a28bd38f2 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 24 May 2009 11:10:07 +0000 Subject: directfb: added new version 1.2.8 Signed-off-by: Ihar Hrachyshka Acked-by: Denys Dmytriyenko Acked-by: Tom Rini --- .../directfb/directfb-1.2.8/ts_lib_autotools.patch | 22 ++++++++++++++++++ recipes/directfb/directfb_1.2.8.bb | 27 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch create mode 100644 recipes/directfb/directfb_1.2.8.bb (limited to 'recipes') diff --git a/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch b/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch new file mode 100644 index 0000000000..7c34b567d9 --- /dev/null +++ b/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch @@ -0,0 +1,22 @@ +--- + configure.in | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: DirectFB-1.2.8/configure.in +=================================================================== +--- DirectFB-1.2.8.orig/configure.in ++++ DirectFB-1.2.8/configure.in +@@ -1288,8 +1288,11 @@ fi + + enable_tslib=no + if test "$checkfor_tslib" = "yes"; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no, +- AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no]) ++ if test "$enable_tslib" = "no"; then ++ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no, ++ AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ fi + fi + + enable_ucb1x00_ts=no diff --git a/recipes/directfb/directfb_1.2.8.bb b/recipes/directfb/directfb_1.2.8.bb new file mode 100644 index 0000000000..bf0b95e280 --- /dev/null +++ b/recipes/directfb/directfb_1.2.8.bb @@ -0,0 +1,27 @@ +require directfb.inc + +RV = "1.2-0" + +DEPENDS += "sysfsutils" + +SRC_URI = " \ + http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ + file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \ + file://mkdfiff.patch;patch=1 \ + file://dont-use-linux-config.patch;patch=1 \ + file://ts_lib_autotools.patch;patch=1 \ +" + +EXTRA_OECONF = "\ + --enable-freetype=yes \ + --enable-zlib \ + --with-gfxdrivers=none \ + --disable-libmpeg3 \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ +" + +LDFLAGS_append = "" + +LEAD_SONAME = "libdirectfb-1.2.so.0" -- cgit v1.2.3 From b78152acaf5ae9a45f7c749291bf276f60707832 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 25 May 2009 20:34:53 +0000 Subject: Remove references to base_set_filespath() from recipes that don't need it. These recipes are covered by the default FILESPATHPKG setting. Signed-off-by: Michael Smith Acked-by: Tom Rini --- recipes/db/db3-native_3.2.9.bb | 1 - recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb | 1 - recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb | 1 - recipes/e2fsprogs/e2fsprogs-native_1.38.bb | 1 - recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb | 1 - recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb | 1 - recipes/e2tools/e2tools-native_0.0.16.bb | 1 - recipes/genext2fs/genext2fs-native_1.3.bb | 1 - recipes/mysql/mysql_4.1.22.bb | 2 -- recipes/recode/recode_3.6.bb | 7 ++----- recipes/slugimage/slugimage-native.bb | 2 -- recipes/slugtool/slugtool-native.bb | 1 - recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb | 2 -- recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb | 1 - recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb | 1 - recipes/squashfs-tools/squashfs-tools-native_3.3.bb | 1 - recipes/squashfs-tools/squashfs-tools-native_4.0.bb | 1 - 17 files changed, 2 insertions(+), 24 deletions(-) (limited to 'recipes') diff --git a/recipes/db/db3-native_3.2.9.bb b/recipes/db/db3-native_3.2.9.bb index 492f7407d1..f16b19f642 100644 --- a/recipes/db/db3-native_3.2.9.bb +++ b/recipes/db/db3-native_3.2.9.bb @@ -4,5 +4,4 @@ CONFLICTS = "db-native" inherit native require db3_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb index 9d0afa864b..5f94c08dd4 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb @@ -2,5 +2,4 @@ SECTION = "base" require e2fsprogs-libs_${PV}.bb inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb index 3db9e02f28..2632db485d 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb @@ -2,7 +2,6 @@ SECTION = "base" require e2fsprogs-libs_${PV}.bb inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "gettext-native" diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb index af49b0d7dd..13fd2beb0c 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb @@ -11,7 +11,6 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \ EXTRA_OECONF = "" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "" diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb index e79958cb2f..4ff399b10f 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1" EXTRA_OECONF = "" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "" diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb index b29064f5c8..295136328e 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb @@ -6,7 +6,6 @@ SRC_URI += "file://mkinstalldirs.patch;patch=1" EXTRA_OECONF = "" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "" diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb index e37eed2b18..f23a0b12a2 100644 --- a/recipes/e2tools/e2tools-native_0.0.16.bb +++ b/recipes/e2tools/e2tools-native_0.0.16.bb @@ -3,7 +3,6 @@ require e2tools_${PV}.bb inherit native DEPENDS = "e2fsprogs-libs-native e2fsprogs-native" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2tools-${PV}', '${FILE_DIRNAME}/e2tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail" diff --git a/recipes/genext2fs/genext2fs-native_1.3.bb b/recipes/genext2fs/genext2fs-native_1.3.bb index 2e26fa0110..50b371b97e 100644 --- a/recipes/genext2fs/genext2fs-native_1.3.bb +++ b/recipes/genext2fs/genext2fs-native_1.3.bb @@ -1,6 +1,5 @@ require genext2fs_${PV}.bb inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" do_stage () { install -m 0755 genext2fs ${STAGING_BINDIR}/ diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 7f32b4ddee..09c52ecbc2 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -14,8 +14,6 @@ SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ S = "${WORKDIR}/mysql-${PV}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - BINCONFIG_GLOB = "mysql_config" inherit autotools binconfig update-rc.d diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb index 6fd60ae399..37e3b2a8aa 100644 --- a/recipes/recode/recode_3.6.bb +++ b/recipes/recode/recode_3.6.bb @@ -3,11 +3,8 @@ SECTION = "console/utils" LICENSE = "GPL" PR = "r1" -SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/recode-${PV}', '${FILE_DIRNAME}' ], d)}" - -SRC_URI += "file://recode-bitfield-width.patch;patch=1 \ - " +SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \ + file://recode-bitfield-width.patch;patch=1" inherit autotools diff --git a/recipes/slugimage/slugimage-native.bb b/recipes/slugimage/slugimage-native.bb index 8b60ff1b59..f8408a150a 100644 --- a/recipes/slugimage/slugimage-native.bb +++ b/recipes/slugimage/slugimage-native.bb @@ -6,8 +6,6 @@ RDEPENDS = "" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_stage () { install -m 0755 slugimage ${STAGING_BINDIR}/ } diff --git a/recipes/slugtool/slugtool-native.bb b/recipes/slugtool/slugtool-native.bb index 2d1fe918de..088839cf80 100644 --- a/recipes/slugtool/slugtool-native.bb +++ b/recipes/slugtool/slugtool-native.bb @@ -2,7 +2,6 @@ SECTION = "unknown" require slugtool.bb inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb index 2423e47e77..9ba56844fd 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb @@ -1,11 +1,9 @@ require squashfs-tools_${PV}.bb DEPENDS = "lzma-native" -PN_BASE = "squashfs-tools" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb index b6ee6e7a22..9ba56844fd 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb @@ -4,7 +4,6 @@ DEPENDS = "lzma-native" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb index c35d183a08..c171e43f46 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb @@ -2,7 +2,6 @@ require squashfs-tools_${PV}.bb inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb index 87ba761ce4..5858bb18d6 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb @@ -3,7 +3,6 @@ PR = "r0" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb index 87ba761ce4..5858bb18d6 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb @@ -3,7 +3,6 @@ PR = "r0" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" do_stage () { -- cgit v1.2.3 From fd94b63f7036a6b2bedc1055c5fef510b27704b1 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 25 May 2009 20:34:54 +0000 Subject: Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes. Signed-off-by: Michael Smith Acked-by: Tom Rini --- recipes/cherokee/cherokee-nossl_0.5.3.bb | 2 +- recipes/freesmartphone/frameworkd-devel_git.bb | 2 +- recipes/initscripts/initscripts-openprotium_1.0.bb | 2 +- recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb | 2 +- recipes/vim/gvim_7.0.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb index 409366004a..3ea9068456 100644 --- a/recipes/cherokee/cherokee-nossl_0.5.3.bb +++ b/recipes/cherokee/cherokee-nossl_0.5.3.bb @@ -2,7 +2,7 @@ require cherokee_${PV}.bb DEPENDS = "libpcre" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "cherokee-${PV}:cherokee:" S = "${WORKDIR}/cherokee-${PV}" diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb index f5f6c0bc2d..a6439ee653 100644 --- a/recipes/freesmartphone/frameworkd-devel_git.bb +++ b/recipes/freesmartphone/frameworkd-devel_git.bb @@ -1,5 +1,5 @@ require frameworkd_git.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "frameworkd:" PROVIDES = "frameworkd" RPROVIDES = "frameworkd" PV = "0.8.5.x+gitr${SRCREV}" diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb index e787eede92..aa20e29644 100644 --- a/recipes/initscripts/initscripts-openprotium_1.0.bb +++ b/recipes/initscripts/initscripts-openprotium_1.0.bb @@ -13,7 +13,7 @@ RCONFLICTS = "initscripts" # a suffix PR := "${PR}.11" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "${P}:initscripts-${PV}:" PACKAGES = "${PN}-dbg ${PN}" diff --git a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb index 5520896a5a..8261ef55dc 100644 --- a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb +++ b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb @@ -4,7 +4,7 @@ DEPENDS = "lzma-native" inherit native -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "squashfs-tools-${PV}:squashfs-tools:" PACKAGES = "" do_stage () { diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb index 78a0c54f9d..a073e656a7 100644 --- a/recipes/vim/gvim_7.0.bb +++ b/recipes/vim/gvim_7.0.bb @@ -4,7 +4,7 @@ require vim.inc DEPENDS += "gtk+ xt" PR = "r1" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "vim-${PV}:vim:" EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \ --disable-xim --with-features=big \ -- cgit v1.2.3 From 75bfa83fffb270c871aee698c3899111901c576d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 25 May 2009 20:34:55 +0000 Subject: glibc/eglibc: remove calls to obsolete base_set_filespath() Some recipes can use the default FILESPATHPKG, others need to override. Signed-off-by: Michael Smith Acked-by: Tom Rini --- recipes/eglibc/eglibc-initial.inc | 1 - recipes/glibc/glibc-initial.inc | 2 +- recipes/glibc/glibc-initial_2.2.5.bb | 1 - recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb | 1 - recipes/glibc/glibc-initial_2.3.2.bb | 1 - recipes/glibc/glibc-initial_2.3.6.bb | 2 -- recipes/glibc/glibc-initial_cvs.bb | 3 ++- recipes/glibc/glibc_2.3.6.bb | 2 -- recipes/glibc/glibc_2.7.bb | 2 +- recipes/glibc/glibc_2.9.bb | 2 +- 10 files changed, 5 insertions(+), 12 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc index 5fbb5dbda5..7a5a7b22f4 100644 --- a/recipes/eglibc/eglibc-initial.inc +++ b/recipes/eglibc/eglibc-initial.inc @@ -1,7 +1,6 @@ SECTION = "libs" DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" PACKAGES_DYNAMIC = "" diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc index 5528cf8edb..cd65924047 100644 --- a/recipes/glibc/glibc-initial.inc +++ b/recipes/glibc/glibc-initial.inc @@ -1,7 +1,7 @@ SECTION = "libs" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "glibc-2.4:" PACKAGES = "" PACKAGES_DYNAMIC = "" diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb index 84412bd596..c7dde2310e 100644 --- a/recipes/glibc/glibc-initial_2.2.5.bb +++ b/recipes/glibc/glibc-initial_2.2.5.bb @@ -2,4 +2,3 @@ require glibc_${PV}.bb require glibc-initial.inc DEFAULT_PREFERENCE_sh3 = "-99" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb index 4d7129b7b8..c7dde2310e 100644 --- a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb +++ b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb @@ -2,4 +2,3 @@ require glibc_${PV}.bb require glibc-initial.inc DEFAULT_PREFERENCE_sh3 = "-99" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/recipes/glibc/glibc-initial_2.3.2.bb b/recipes/glibc/glibc-initial_2.3.2.bb index 84412bd596..c7dde2310e 100644 --- a/recipes/glibc/glibc-initial_2.3.2.bb +++ b/recipes/glibc/glibc-initial_2.3.2.bb @@ -2,4 +2,3 @@ require glibc_${PV}.bb require glibc-initial.inc DEFAULT_PREFERENCE_sh3 = "-99" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/recipes/glibc/glibc-initial_2.3.6.bb b/recipes/glibc/glibc-initial_2.3.6.bb index 8249cd696d..fa7836ad88 100644 --- a/recipes/glibc/glibc-initial_2.3.6.bb +++ b/recipes/glibc/glibc-initial_2.3.6.bb @@ -1,4 +1,2 @@ require glibc_${PV}.bb require glibc-initial.inc - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/recipes/glibc/glibc-initial_cvs.bb b/recipes/glibc/glibc-initial_cvs.bb index 81be5fc49b..0bfd665a59 100644 --- a/recipes/glibc/glibc-initial_cvs.bb +++ b/recipes/glibc/glibc-initial_cvs.bb @@ -1,4 +1,5 @@ require glibc_${PV}.bb require glibc-initial.inc -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +# glibc_cvs.bb overrides PV; glibc-cvs won't automatically be in FILESPATHPKG +FILESPATHPKG =. "glibc-cvs:" diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb index ab167daaa8..8d645409dd 100644 --- a/recipes/glibc/glibc_2.3.6.bb +++ b/recipes/glibc/glibc_2.3.6.bb @@ -2,8 +2,6 @@ require glibc.inc PR = "r5" -#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" - GLIBC_ADDONS ?= "linuxthreads" # ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1 diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb index 8ae84c1c7e..1a2902d646 100644 --- a/recipes/glibc/glibc_2.7.bb +++ b/recipes/glibc/glibc_2.7.bb @@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "glibc-2.4:" GLIBC_ADDONS ?= "ports,nptl,libidn" diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb index 7859876cb0..7709d26f66 100644 --- a/recipes/glibc/glibc_2.9.bb +++ b/recipes/glibc/glibc_2.9.bb @@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "glibc-2.4:" GLIBC_ADDONS ?= "ports,nptl,libidn" -- cgit v1.2.3 From 89136d9a18ab516424305b660b620867fb432d67 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 25 May 2009 20:34:56 +0000 Subject: uclibc: remove calls to obsolete base_set_filespath() Some recipes can use the default FILESPATHPKG, others need to override. Signed-off-by: Michael Smith Acked-by: Tom Rini --- recipes/uclibc/bfin-uclibc_svn.bb | 2 +- recipes/uclibc/uclibc-initial_0.9.26.bb | 2 -- recipes/uclibc/uclibc-initial_0.9.27.bb | 2 -- recipes/uclibc/uclibc-initial_0.9.28.bb | 2 -- recipes/uclibc/uclibc-initial_0.9.29.bb | 2 -- recipes/uclibc/uclibc-initial_0.9.30.1.bb | 2 -- recipes/uclibc/uclibc-initial_0.9.30.bb | 2 -- recipes/uclibc/uclibc_nptl.bb | 2 +- recipes/uclibc/uclibc_svn.bb | 2 +- 9 files changed, 3 insertions(+), 15 deletions(-) (limited to 'recipes') diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb index 9b438a25dc..93052452c5 100644 --- a/recipes/uclibc/bfin-uclibc_svn.bb +++ b/recipes/uclibc/bfin-uclibc_svn.bb @@ -25,7 +25,7 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc " SRC_URI += "file://uClibc.machine file://uClibc.distro" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "uclibc-${UCLIBC_BASE}:uclibc:" S = "${WORKDIR}/uClibc" diff --git a/recipes/uclibc/uclibc-initial_0.9.26.bb b/recipes/uclibc/uclibc-initial_0.9.26.bb index a6a83bdce9..d36a6478be 100644 --- a/recipes/uclibc/uclibc-initial_0.9.26.bb +++ b/recipes/uclibc/uclibc-initial_0.9.26.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc-initial_0.9.27.bb b/recipes/uclibc/uclibc-initial_0.9.27.bb index 3aecd802af..f48e81dc41 100644 --- a/recipes/uclibc/uclibc-initial_0.9.27.bb +++ b/recipes/uclibc/uclibc-initial_0.9.27.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb index b996f64e75..dbd90fc862 100644 --- a/recipes/uclibc/uclibc-initial_0.9.28.bb +++ b/recipes/uclibc/uclibc-initial_0.9.28.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc-initial_0.9.29.bb b/recipes/uclibc/uclibc-initial_0.9.29.bb index c56e5fb2f5..98ef7b291a 100644 --- a/recipes/uclibc/uclibc-initial_0.9.29.bb +++ b/recipes/uclibc/uclibc-initial_0.9.29.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb index c56e5fb2f5..98ef7b291a 100644 --- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb +++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc-initial_0.9.30.bb b/recipes/uclibc/uclibc-initial_0.9.30.bb index c56e5fb2f5..98ef7b291a 100644 --- a/recipes/uclibc/uclibc-initial_0.9.30.bb +++ b/recipes/uclibc/uclibc-initial_0.9.30.bb @@ -1,8 +1,6 @@ SECTION = "base" require uclibc_${PV}.bb -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index 18c88c8055..ba46a50933 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-nptl', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:" #as stated above, uclibc needs real kernel-headers #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_svn.bb index 127cea7cf0..d3f09737c8 100644 --- a/recipes/uclibc/uclibc_svn.bb +++ b/recipes/uclibc/uclibc_svn.bb @@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-svn', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +FILESPATHPKG =. "uclibc-svn:uclibc-${UCLIBC_BASE}:" #as stated above, uclibc needs real kernel-headers #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... -- cgit v1.2.3 From 2d3750e3dae84c89c9c749f95cf6b3b6cca3e8ce Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 28 May 2009 08:24:11 +0000 Subject: vim: be an alternative to /bin/vi; switch to INC_PR Signed-off-by: Michael Smith Acked-by: Tom Rini --- recipes/vim/gvim_7.0.bb | 2 +- recipes/vim/vim.inc | 9 ++++++++- recipes/vim/vim_6.4.bb | 2 ++ recipes/vim/vim_7.0.bb | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb index a073e656a7..60aa04127e 100644 --- a/recipes/vim/gvim_7.0.bb +++ b/recipes/vim/gvim_7.0.bb @@ -3,7 +3,7 @@ VIMVER = "70" require vim.inc DEPENDS += "gtk+ xt" -PR = "r1" +PR = "${INC_PR}.1" FILESPATHPKG =. "vim-${PV}:vim:" EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \ diff --git a/recipes/vim/vim.inc b/recipes/vim/vim.inc index f675ce839f..a766acc34d 100644 --- a/recipes/vim/vim.inc +++ b/recipes/vim/vim.inc @@ -3,12 +3,14 @@ SECTION = "console/utils" DEPENDS = "ncurses" LICENSE = "vim" +INC_PR = "r2" + SRC_URI = "ftp://ftp.vim.org/pub/vim/unix/vim-${PV}.tar.bz2 \ file://configure.patch;patch=1" S = "${WORKDIR}/vim${VIMVER}/src" -inherit autotools +inherit autotools update-alternatives do_configure () { rm -f auto/* @@ -28,3 +30,8 @@ FILES_vim-tutor = "${datadir}/vim/vim${VIMVER}/tutor ${bindir}/vimtutor" #FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ # ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ # /bin /sbin /lib/*/ /lib/*.so* ${datadir}/vim" + +ALTERNATIVE_NAME = "vi" +ALTERNATIVE_PATH = "vim" +ALTERNATIVE_LINK = "${base_bindir}/vi" +ALTERNATIVE_PRIORITY = "100" diff --git a/recipes/vim/vim_6.4.bb b/recipes/vim/vim_6.4.bb index 4cf6591a66..d062bc5236 100644 --- a/recipes/vim/vim_6.4.bb +++ b/recipes/vim/vim_6.4.bb @@ -2,6 +2,8 @@ VIMVER = "64" require vim.inc +PR = "${INC_PR}.1" + EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ --disable-xim --with-features=normal \ --disable-gpm --without-x --disable-netbeans \ diff --git a/recipes/vim/vim_7.0.bb b/recipes/vim/vim_7.0.bb index c821f6e974..e3fa7ab1e9 100644 --- a/recipes/vim/vim_7.0.bb +++ b/recipes/vim/vim_7.0.bb @@ -2,7 +2,7 @@ VIMVER = "70" require vim.inc -PR = "r1" +PR = "${INC_PR}.1" EXTRA_OECONF = "--enable-gui=none --disable-gtktest \ --disable-xim --with-features=big \ -- cgit v1.2.3 From 47f74ab0bc9fc498e3565c5d780f40b001c6dcbc Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 24 May 2009 10:54:00 +0000 Subject: udev: fixed obsolete udevadm syntax for udev init.d script. Fixed the following warning message when executing udev init script: "udevadm control commands requires the -- format, this will stop working in a future release." Signed-off-by: Ihar Hrachyshka Acked-by: Tom Rini --- recipes/udev/udev-141/init | 4 ++-- recipes/udev/udev_141.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init index efe44708ca..7188b5a777 100644 --- a/recipes/udev/udev-141/init +++ b/recipes/udev/udev-141/init @@ -56,10 +56,10 @@ kill_udevd > "/dev/null" 2>&1 echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug /sbin/udevd -d - /sbin/udevadm control env STARTUP=1 + /sbin/udevadm control --env STARTUP=1 if [ "$not_first_boot" != "" ];then /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)& + (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)& if [ "$DEVCACHE" != "" ]; then rm -f /tmp/uname rm -f /tmp/cmdline diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index e687989e9f..040189faf5 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r8" +PR = "r9" # needed for init.d script RDEPENDS_udev += "udev-utils" -- cgit v1.2.3 From faffb4e89389f47b6d953f36e0584ce50bc73de2 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Tue, 19 May 2009 23:04:38 +0000 Subject: (e)glibc-package: enable binary locale generation for powerpc It works there, so add to whitelist. --- recipes/eglibc/eglibc-package.bbclass | 4 +++- recipes/glibc/glibc-package.bbclass | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 22ff52b3ff..f2acc961fa 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*" @@ -289,6 +289,8 @@ python package_do_split_gconvs () { target_arch = bb.data.getVar("TARGET_ARCH", d, 1) if target_arch in ("i486", "i586", "i686"): target_arch = "i386" + elif target_arch == "powerpc": + target_arch = "ppc" kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) if kernel_ver is None: qemu = "qemu-%s -s 1048576" % target_arch diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index ac7e0f3670..78738c2629 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" @@ -250,7 +250,9 @@ python package_do_split_gconvs () { def output_locale_binary(name, locale, encoding): target_arch = bb.data.getVar("TARGET_ARCH", d, 1) if target_arch in ("i486", "i586", "i686"): - target_arch = "i386" + target_arch = "i386" + elif target_arch == "powerpc": + target_arch = "ppc" kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) if kernel_ver is None: -- cgit v1.2.3 From c58ac24fa1400d1d8a05cbf7342dd491f28c8e67 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 11 May 2009 16:16:10 +0000 Subject: python-native_2.6.1.bb: Add zlib-native to DEPENDS Do not use --with-zlib instead depend on zlib-native Acked-by: Tom Rini --- recipes/python/python-native_2.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb index 3ae48285b1..ca567a161a 100644 --- a/recipes/python/python-native_2.6.1.bb +++ b/recipes/python/python-native_2.6.1.bb @@ -1,5 +1,5 @@ require python.inc -DEPENDS = "openssl-native bzip2-full-native" +DEPENDS = "openssl-native bzip2-full-native zlib-native" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ -- cgit v1.2.3 From ba3644301f86b1badff7ef4117187aee3776adeb Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 30 May 2009 18:18:14 -0400 Subject: python-native: Add readline-native to DEPENDS, bump PR. It looks a little less trivial to switch python to INC_PR, so for now do 'PR .= ".1"' instead. --- recipes/python/python-native_2.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb index ca567a161a..8b03a8914e 100644 --- a/recipes/python/python-native_2.6.1.bb +++ b/recipes/python/python-native_2.6.1.bb @@ -1,5 +1,5 @@ require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native" +DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ -- cgit v1.2.3 From 2747ae6c34231fdb5efed4b11f064caadd24214e Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 31 May 2009 00:44:31 +0200 Subject: linux-rp-2.6.24: fix compilation with gcc-4.3 Since some architectures don't support __udivdi3(). Signed-off-by: Segher Boessenkool Cc: john stultz Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner --- ...ime-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 15 +++++++++++++++ recipes/linux/linux-rp_2.6.24.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch (limited to 'recipes') diff --git a/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..9d7020d9f1 --- /dev/null +++ b/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.24/include/linux/time.h +=================================================================== +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -172,6 +172,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/recipes/linux/linux-rp_2.6.24.bb b/recipes/linux/linux-rp_2.6.24.bb index 7b06916e1c..dd73738a3e 100644 --- a/recipes/linux/linux-rp_2.6.24.bb +++ b/recipes/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r22" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -23,6 +23,7 @@ DEFAULT_PREFERENCE_spitz = "1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ ${RPSRC}/export_atags-r2.patch;patch=1;status=pending \ ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending \ ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending \ -- cgit v1.2.3 From a90701a8b544ce809c137ad44395c18a116466c4 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 31 May 2009 00:50:23 +0200 Subject: linux-rp-2.6.23: fix compilation with gcc-4.3 Since some architectures don't support __udivdi3(). Signed-off-by: Segher Boessenkool Cc: john stultz Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner --- ...ime-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 15 +++++++++++++++ recipes/linux/linux-rp_2.6.23.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-rp-2.6.23/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch (limited to 'recipes') diff --git a/recipes/linux/linux-rp-2.6.23/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-rp-2.6.23/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..7e847d6a05 --- /dev/null +++ b/recipes/linux/linux-rp-2.6.23/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.23/include/linux/time.h +=================================================================== +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -172,6 +172,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/recipes/linux/linux-rp_2.6.23.bb b/recipes/linux/linux-rp_2.6.23.bb index 2293eea80e..460ac53012 100644 --- a/recipes/linux/linux-rp_2.6.23.bb +++ b/recipes/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r35" +PR = "r36" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -14,6 +14,7 @@ PR = "r35" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1;status=merged \ ${RPSRC}/lzo_jffs2-r3.patch;patch=1;status=merged \ ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1;status=merged \ -- cgit v1.2.3 From 2bd23469bebb3f491a8f75199056b7cec3933387 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 31 May 2009 01:13:28 +0200 Subject: linux-kexecboot-2.6.24: fix compilation with gcc-4.3. Bump PR Since some architectures don't support __udivdi3(). Signed-off-by: Segher Boessenkool Cc: john stultz Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner --- ...ime-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 15 +++++++++++++++ recipes/kexecboot/linux-kexecboot.inc | 2 +- recipes/kexecboot/linux-kexecboot_2.6.24.bb | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes/kexecboot/linux-kexecboot-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch (limited to 'recipes') diff --git a/recipes/kexecboot/linux-kexecboot-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/kexecboot/linux-kexecboot-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..9d7020d9f1 --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.24/include/linux/time.h +=================================================================== +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -172,6 +172,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 74767b0b12..5193212912 100644 --- a/recipes/kexecboot/linux-kexecboot.inc +++ b/recipes/kexecboot/linux-kexecboot.inc @@ -1,5 +1,5 @@ # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -PR = "r12" +PR = "r13" SRC_URI = "file://defconfig" diff --git a/recipes/kexecboot/linux-kexecboot_2.6.24.bb b/recipes/kexecboot/linux-kexecboot_2.6.24.bb index f728c7adc1..82484f45a0 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb @@ -21,6 +21,7 @@ DEFAULT_PREFERENCE_spitz = "1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ ${RPSRC}/export_atags-r2.patch;patch=1;status=pending \ ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending \ ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending \ -- cgit v1.2.3