From 1ec950151937f828746c01c3bb52c43af77106d2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 26 Jan 2007 17:29:48 +0000 Subject: siteinfo.bbclass: Added support for armeb-linux-gnueabi and armeb-linux-uclibcgnueabi. Yes, I know neither of them work yet (or at least they don't work for me), but without adding support here no-one will be able to work on making it work. --- classes/siteinfo.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 94d25bf56f..5d6d5649c7 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -22,7 +22,9 @@ def get_siteinfo_list(d): targetinfo = {\ "armeb-linux": "endian-big bit-32 common-glibc arm-common",\ + "armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\ "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ + "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\ "arm-linux": "endian-little bit-32 common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ -- cgit v1.2.3 From fa1b97a2c5c2cd4efb467c352258eefc5aec0489 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 26 Jan 2007 17:32:42 +0000 Subject: angstrom-2007.1.conf (and -glibc.conf and -uclibc.conf): Added initial support for building on armeb - there are problems in the toolchain, but at least this allows someone to work on it --- conf/distro/angstrom-2007.1.conf | 3 +++ conf/distro/include/angstrom-glibc.inc | 2 +- conf/distro/include/angstrom-uclibc.inc | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index daa271da06..1694ef889a 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -153,11 +153,14 @@ PREFERRED_PROVIDER_libxss = "libxss" #EABI stuff PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" #shouldn't that be uclibc-initial???? PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.1" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 28e3b3eddd..ee41420cac 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 149b8ed9d8..9c3274e58f 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -- cgit v1.2.3 From 33c52495f6a3defd15779b714cf05a7a1d5349f5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 27 Jan 2007 14:13:36 +0000 Subject: zaurus machines includes: Fix jffs2 image generation to end in .jffs2 to fix magic symlinks, correctly set akita eraseblock size (removes empty flash warnings upon boot), remove temp images from saving some diskspace, generally clean up clamshell file (from poky) --- conf/machine/include/zaurus-2.6.conf | 5 ++++- conf/machine/include/zaurus-clamshell.conf | 19 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 45d8891b44..4e9e6a2ad9 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -6,7 +6,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" MACHINE_KERNEL_VERSION = "2.6" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" +ERASEBLOCKSIZE = "0x4000" +ERASEBLOCKSIZE_akita = "0x20000" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 83d17aeb78..5e51566484 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,14 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \ + sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=${ERASEBLOCKSIZE} -l -p; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" - -# add a summary to the jffs2 file to make it mount a lot faster -EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ - --eraseblock=0x4000 -l -p" - -IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img" + ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" -- cgit v1.2.3 From bccc702aacd2f82030baae66b3d80358820574f7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 27 Jan 2007 14:24:46 +0000 Subject: gtk+-2.6.10: patch GtkStatusBar .c|.h to work w/ glib >= 2.9.x --- .../gtk+-2.6.10/compile-against-newer-glib.patch | 59 ++++++++++++++++++++++ packages/gtk+/gtk+_2.6.10.bb | 5 +- 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch new file mode 100644 index 0000000000..c92070c7aa --- /dev/null +++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch @@ -0,0 +1,59 @@ +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.h,v +retrieving revision 1.17 +retrieving revision 1.17.2.1 +diff -u -r1.17 -r1.17.2.1 +--- gtkstatusbar.h 2005/03/20 07:01:22 1.17 ++++ gtkstatusbar.h 2005/12/06 14:25:30 1.17.2.1 +@@ -65,7 +65,7 @@ + { + GtkHBoxClass parent_class; + +- GMemChunk *messages_mem_chunk; ++ gpointer messages_mem_chunk; + + void (*text_pushed) (GtkStatusbar *statusbar, + guint context_id, +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.c,v +retrieving revision 1.56 +retrieving revision 1.56.2.1 +diff -u -r1.56 -r1.56.2.1 +--- gtkstatusbar.c 2005/07/21 19:10:48 1.56 ++++ gtkstatusbar.c 2005/12/06 14:25:30 1.56.2.1 +@@ -302,7 +302,7 @@ + g_return_val_if_fail (text != NULL, 0); + + class = GTK_STATUSBAR_GET_CLASS (statusbar); +- msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk); ++ msg = g_chunk_new (GtkStatusbarMsg, (GMemChunk *)class->messages_mem_chunk); + msg->text = g_strdup (text); + msg->context_id = context_id; + msg->message_id = statusbar->seq_message_id++; +@@ -343,7 +343,7 @@ + statusbar->messages = g_slist_remove_link (statusbar->messages, + list); + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + g_slist_free_1 (list); + break; + } +@@ -394,7 +394,7 @@ + class = GTK_STATUSBAR_GET_CLASS (statusbar); + statusbar->messages = g_slist_remove_link (statusbar->messages, list); + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + g_slist_free_1 (list); + + break; +@@ -459,7 +459,7 @@ + + msg = list->data; + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + } + g_slist_free (statusbar->messages); + statusbar->messages = NULL; diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index 8230515f3b..9af2dba568 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -23,7 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0 \ file://single-click.patch;patch=1 \ - file://menu-styling.patch;patch=1" + file://menu-styling.patch;patch=1 \ + file://compile-against-newer-glib.patch;patch=1" inherit autotools pkgconfig -- cgit v1.2.3 From ccdf1a772e36476ac991c1e9b48e6083e0d12759 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 27 Jan 2007 14:38:06 +0000 Subject: gtk+ 2.6.10 compile-against-newer-glib.patch rediff and make it -p1 --- .../gtk+/gtk+-2.6.10/compile-against-newer-glib.patch | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch index c92070c7aa..3d8f3f614b 100644 --- a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch +++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch @@ -1,10 +1,5 @@ -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.h,v -retrieving revision 1.17 -retrieving revision 1.17.2.1 -diff -u -r1.17 -r1.17.2.1 ---- gtkstatusbar.h 2005/03/20 07:01:22 1.17 -+++ gtkstatusbar.h 2005/12/06 14:25:30 1.17.2.1 +--- gtk+-2.6.10/gtk/gtkstatusbar.h 2005/03/20 07:01:22 1.17 ++++ gtk+-2.6.10/gtk/gtkstatusbar.h 2005/12/06 14:25:30 1.17.2.1 @@ -65,7 +65,7 @@ { GtkHBoxClass parent_class; @@ -14,13 +9,8 @@ diff -u -r1.17 -r1.17.2.1 void (*text_pushed) (GtkStatusbar *statusbar, guint context_id, -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.c,v -retrieving revision 1.56 -retrieving revision 1.56.2.1 -diff -u -r1.56 -r1.56.2.1 ---- gtkstatusbar.c 2005/07/21 19:10:48 1.56 -+++ gtkstatusbar.c 2005/12/06 14:25:30 1.56.2.1 +--- gtk+-2.6.10/gtk/gtkstatusbar.c 2005/07/21 19:10:48 1.56 ++++ gtk+-2.6.10/gtk/gtkstatusbar.c 2005/12/06 14:25:30 1.56.2.1 @@ -302,7 +302,7 @@ g_return_val_if_fail (text != NULL, 0); -- cgit v1.2.3 From 8a979a6304232624b772cc4b34e3cb24f25deed9 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 19:09:15 +0000 Subject: libnl: add 0.5.0 (stable) --- packages/libnl/files/fix-helpers.patch | 49 +++++++++++++++++++++++++++ packages/libnl/files/libnl-0.5.0-include.diff | 10 ++++++ packages/libnl/libnl_0.5.0.bb | 11 ++++++ 3 files changed, 70 insertions(+) create mode 100644 packages/libnl/files/fix-helpers.patch create mode 100644 packages/libnl/files/libnl-0.5.0-include.diff create mode 100644 packages/libnl/libnl_0.5.0.bb diff --git a/packages/libnl/files/fix-helpers.patch b/packages/libnl/files/fix-helpers.patch new file mode 100644 index 0000000000..b6a6ff8509 --- /dev/null +++ b/packages/libnl/files/fix-helpers.patch @@ -0,0 +1,49 @@ +Index: libnl-0.5.0/lib/helpers.c +=================================================================== +--- libnl-0.5.0.orig/lib/helpers.c ++++ libnl-0.5.0/lib/helpers.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + int nl_debug = 0; + +Index: libnl-0.5.0/lib/route/filter.c +=================================================================== +--- libnl-0.5.0.orig/lib/route/filter.c ++++ libnl-0.5.0/lib/route/filter.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + static struct rtnl_filter_ops *filter_ops; + +Index: libnl-0.5.0/lib/Makefile +=================================================================== +--- libnl-0.5.0.orig/lib/Makefile ++++ libnl-0.5.0/lib/Makefile +@@ -68,7 +68,7 @@ distclean: + + install: + mkdir -p $(DESTDIR)$(prefix)/lib/ +- install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib ++ install -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib + rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \ + $(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) + rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \ +Index: libnl-0.5.0/include/Makefile +=================================================================== +--- libnl-0.5.0.orig/include/Makefile ++++ libnl-0.5.0/include/Makefile +@@ -37,5 +37,5 @@ distclean: + + install: + mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/ +- install -o root -g root -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ +- install -o root -g root -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ ++ install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ ++ install -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ diff --git a/packages/libnl/files/libnl-0.5.0-include.diff b/packages/libnl/files/libnl-0.5.0-include.diff new file mode 100644 index 0000000000..f858953c8a --- /dev/null +++ b/packages/libnl/files/libnl-0.5.0-include.diff @@ -0,0 +1,10 @@ +--- libnl-0.5.0.orig/include/netlink/route/tc.h 2005-09-08 19:13:15.000000000 -0300 ++++ libnl-0.5.0/include/netlink/route/tc.h 2005-09-08 19:32:33.000000000 -0300 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #define TCA_HAS_HANDLE 0x001 + #define TCA_HAS_PARENT 0x002 diff --git a/packages/libnl/libnl_0.5.0.bb b/packages/libnl/libnl_0.5.0.bb new file mode 100644 index 0000000000..5d1e8d3fc0 --- /dev/null +++ b/packages/libnl/libnl_0.5.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Netlink library" +HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" +SECTION = "libraries/network" +LICENSE = "GPLv2.1" +PR = "r0" + +SRC_URI = "http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz \ + file://libnl-0.5.0-include.diff;patch=1 \ + file://fix-helpers.patch;patch=1" + +inherit autotools -- cgit v1.2.3 From 9a22ce8f81955d2c238d29ec43567506b27463e0 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 19:11:41 +0000 Subject: bmon: add 2.1.0 (depends on libnl-0.5.0) --- packages/bmon/.mtn2git_empty | 0 packages/bmon/bmon_2.1.0.bb | 16 ++++++++++++++++ packages/bmon/files/.mtn2git_empty | 0 packages/bmon/files/no-strip.patch | 13 +++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 packages/bmon/.mtn2git_empty create mode 100644 packages/bmon/bmon_2.1.0.bb create mode 100644 packages/bmon/files/.mtn2git_empty create mode 100644 packages/bmon/files/no-strip.patch diff --git a/packages/bmon/.mtn2git_empty b/packages/bmon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb new file mode 100644 index 0000000000..32e956fb26 --- /dev/null +++ b/packages/bmon/bmon_2.1.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Portable Bandwidth Monitor and rate estimator" +HOMEPAGE = "http://people.suug.ch/~tgr/bmon/" +SECTION = "console/utilities" +LICENSE = "MIT" +# only works with libnl-0.5.0 +DEPENDS = "libnl" +PR = "r0" + +SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \ + file://no-strip.patch;patch=1" + +inherit autotools + +do_compile() { + oe_runmake +} diff --git a/packages/bmon/files/.mtn2git_empty b/packages/bmon/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bmon/files/no-strip.patch b/packages/bmon/files/no-strip.patch new file mode 100644 index 0000000000..f09e816857 --- /dev/null +++ b/packages/bmon/files/no-strip.patch @@ -0,0 +1,13 @@ +Index: bmon-2.1.0/GNUmakefile +=================================================================== +--- bmon-2.1.0.orig/GNUmakefile ++++ bmon-2.1.0/GNUmakefile +@@ -50,7 +50,7 @@ distclean: clean + install: + ./install-sh -d -m 0755 $(DESTDIR)$(prefix)/bin + ./install-sh -d -m 0755 $(DESTDIR)$(mandir)/man1 +- ./install-sh -c -s -m 0755 src/bmon $(DESTDIR)$(prefix)/bin ++ ./install-sh -c -m 0755 src/bmon $(DESTDIR)$(prefix)/bin + ./install-sh -c -m 0644 man/bmon.1 $(DESTDIR)$(mandir)/man1 + + show: Makefile.opts -- cgit v1.2.3 From 86b3950bfb88bfadce14bfb09d81cfaeafed86cb Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 20:08:05 +0000 Subject: aalib: stage lib and headers --- packages/aalib/aalib_1.4rc5.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb index c2afe0856c..ed6ee78186 100644 --- a/packages/aalib/aalib_1.4rc5.bb +++ b/packages/aalib/aalib_1.4rc5.bb @@ -2,6 +2,7 @@ DEPENDS = "ncurses" DESCRIPTION = "An ASCII art gfx library." SECTION = "libs" LICENSE="LGPL" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \ file://configure.patch;patch=1" @@ -12,3 +13,9 @@ inherit autotools EXTRA_OECONF = '--without-x11-driver --without-slang-driver \ --with-curses-driver --without-gpm \ --without-x --with-ncurses=${STAGING_LIBDIR}/..' + +do_stage() { + oe_libinstall -a -so -C src libaa ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/ + install -m 0644 src/*.h ${STAGING_INCDIR}/ +} -- cgit v1.2.3 From 8db7cebf83b4a121f2596aa37b066740eb5abe02 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sat, 27 Jan 2007 20:58:07 +0000 Subject: packages/gnome/gnome-vfs_2.16.3.bb : spell RREPLACES right --- packages/gnome/gnome-vfs_2.16.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb index 6efbe7249d..0c6176428e 100644 --- a/packages/gnome/gnome-vfs_2.16.3.bb +++ b/packages/gnome/gnome-vfs_2.16.3.bb @@ -2,13 +2,13 @@ LICENSE = "GPL" DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" -PR = "r1" +PR = "r2" inherit gnome # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RRPEPLACES = "gnome-vfs-dbus" +RREPLACES = "gnome-vfs-dbus" SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" -- cgit v1.2.3 From 68e1462d95f8bdac57ce74e4583d92af8f754b40 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 27 Jan 2007 21:01:31 +0000 Subject: ixp4xx-related files: Replaced IXP4XX_MACHINE_ENDIAN with SITEINFO_ENDIANESS throughout OE, removing all instances of ixp4xx-specific ENDIAN checks in the OE metadata. --- conf/distro/include/slugos.inc | 4 +-- conf/distro/slugos-bag.conf | 2 +- conf/distro/slugos-bau.conf | 2 +- conf/distro/slugos-btu.conf | 2 +- conf/distro/slugos-lag.conf | 2 +- conf/distro/slugos-lau.conf | 2 +- conf/distro/slugos-ltu.conf | 2 +- conf/distro/unslung.conf | 1 - conf/machine/include/ixp4xx.conf | 8 ----- conf/machine/include/tune-xscale.conf | 2 +- conf/machine/ixp4xxbe.conf | 8 ++--- conf/machine/ixp4xxle.conf | 8 ++--- conf/machine/nslu2.conf | 13 +++---- packages/images/slugos-image.bb | 6 ++-- packages/ixp425-eth/ixp400-eth_1.4.bb | 2 +- packages/ixp425-eth/ixp400-eth_1.5.1.bb | 2 +- packages/ixp425-eth/ixp400-eth_1.5.bb | 2 +- packages/ixp4xx/ixp-osal_2.0.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.1.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.0.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.bb | 2 +- packages/linux/ixp4xx-kernel.inc | 62 ++++++++++++++++---------------- packages/obsolete/nslu2/nslu2-kernel.inc | 4 +-- 25 files changed, 64 insertions(+), 82 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 89ea08a157..4c849d095d 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -11,7 +11,6 @@ # slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian -# set IXP4XX_MACHINE_ENDIAN to match # # a or t - ARM or Thumb instructions in the low level libraries # set ARM_INSTRUCTION_SET to match @@ -45,7 +44,6 @@ DISTRO_FEED ?= "unstable" # The following must also be set, they define the basic format of the build # -#IXP4XX_MACHINE_ENDIAN "be" or "le" #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" #SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) @@ -55,7 +53,7 @@ DISTRO_FEED ?= "unstable" USE_NLS ?= "no" # To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_NAME ?= "INVALID-${SITEINFO_ENDIANESS}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" DISTRO_TYPE ?= "INVALID" # The following must not be changed. diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf index 89e61cb386..23e8690752 100644 --- a/conf/distro/slugos-bag.conf +++ b/conf/distro/slugos-bag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-bag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf index c6a609d3c5..5e461ff063 100644 --- a/conf/distro/slugos-bau.conf +++ b/conf/distro/slugos-bau.conf @@ -11,7 +11,7 @@ DISTRO_NAME ?= "slugos-bau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf index a378551665..4fbdd9e37b 100644 --- a/conf/distro/slugos-btu.conf +++ b/conf/distro/slugos-btu.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-btu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf index feefb88407..838d6cf48b 100644 --- a/conf/distro/slugos-lag.conf +++ b/conf/distro/slugos-lag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-lag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf index 098f8684b7..7294c1dfd2 100644 --- a/conf/distro/slugos-lau.conf +++ b/conf/distro/slugos-lau.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-lau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf index 2151446205..53fbb407a7 100644 --- a/conf/distro/slugos-ltu.conf +++ b/conf/distro/slugos-ltu.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-ltu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 9608b93885..b25b94d79f 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -18,7 +18,6 @@ TARGET_FPU = "soft" TARGET_OS = "linux" # select distro specific options to match that of the original LinkSys build -IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "arm" THUMB_INTERWORK = "no" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 42ca723d90..0558e03e35 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -21,14 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" # # description -IXP4XX_MACHINE_ENDIAN ?= "le" -# "be" "le" -# The memory byte sex and (on correctly implemented hardware - the IXP4XX is -# correct) the byte sex of the buses within the system. 'be' (big-endian) -# means that the first byte is the most significant byte on a bus, 'le' -# (little-endian) means that the first byte is the least significant byte. -# Default to little-endian mode (since EABI does not support big endian yet) - ARM_INSTRUCTION_SET = "arm" # "arm" "thumb" # The instruction set the compiler should use when generating application diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index e5fea93912..1d212946e4 100644 --- a/conf/machine/include/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "armv5te" +PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index cd02d7c821..d9737c9964 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode -IXP4XX_MACHINE_ENDIAN = "be" - -require conf/machine/include/ixp4xx.conf - TARGET_ARCH = "armeb" +# PACKAGE_ARCH is set in tune-xscale.conf +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" MACHINE_ARCH = "ixp4xxbe" -PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" +require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index e40b98b876..4747fa50c4 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode -IXP4XX_MACHINE_ENDIAN = "le" - -require conf/machine/include/ixp4xx.conf - TARGET_ARCH = "arm" +# PACKAGE_ARCH is set in tune-xscale.conf +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" MACHINE_ARCH = "ixp4xxle" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += " --little-endian" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index fa42771331..966334a0d6 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,23 +2,20 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -# Note that IXP4XX_MACHINE_ENDIAN gets set by the DISTRO for the "nslu2" machine. +# Note that TARGET_ARCH gets set by the DISTRO for the "nslu2" machine. # (Yes, this was a mistake, but it's legacy and can't be easily changed now.) # The "nslu2" machine is deprecated - use "nslu2le" or "nslu2be" instead. require conf/machine/include/ixp4xx.conf # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index a0be935613..64b7d8b8e0 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -123,7 +123,7 @@ slugos_pack_image() { ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${IXP4XX_MACHINE_ENDIAN} \ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 @@ -137,7 +137,7 @@ slugos_pack_image() { # Create an image for the DSM-G600 as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz @@ -154,7 +154,7 @@ slugos_pack_image() { # Create an image for the NAS 100d as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb index ad20f51b6b..6b1ff0c8d2 100644 --- a/packages/ixp425-eth/ixp400-eth_1.4.bb +++ b/packages/ixp425-eth/ixp400-eth_1.4.bb @@ -28,7 +28,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb index 66e765940e..2fa04fc672 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb @@ -39,7 +39,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index a708bd96f4..5e25deb1d4 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -38,7 +38,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb index 03fb7fbdb3..009d45d67a 100644 --- a/packages/ixp4xx/ixp-osal_2.0.bb +++ b/packages/ixp4xx/ixp-osal_2.0.bb @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb index 8a43d49117..481033fd0a 100644 --- a/packages/ixp4xx/ixp-osal_2.1.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.1.bb @@ -49,7 +49,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 8b1bce6720..dd70289598 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -37,7 +37,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb index fefb98858f..a160fe4609 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.0.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb @@ -38,7 +38,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}" # This is a somewhat arbitrary choice: diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb index 6d4c9d8c02..cc063b523e 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb @@ -53,7 +53,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 9be5072f29..e72de05071 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -46,7 +46,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 28b8d3b559..1a064a17e5 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -186,7 +186,7 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi @@ -246,70 +246,70 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${MACHINE_ARCH}-${KERNEL_VERSION nslu2_MACHID = "597" PACKAGES += "kernel-image-nslu2" PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2" -FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nslu2 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nslu2 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for Loft: loft_MACHID = "849" PACKAGES += "kernel-image-loft" PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-loft = "loft${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-loft = "loft${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board" -FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-loft () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-loft () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the NAS100D board: nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nas100d = "nas100d${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D" -FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nas100d () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nas100d () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the DSMG600 board: dsmg600_MACHID = "964" PACKAGES += "kernel-image-dsmg600" PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600" -FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-dsmg600 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-dsmg600 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the FSG-3 board: fsg3_MACHID = "1091" PACKAGES += "kernel-image-fsg3" PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3" -FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-fsg3 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-fsg3 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } #FIXUP: the correct instructions to copy the kernel prepended with the le fixup @@ -356,11 +356,11 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - install_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - install_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - install_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - install_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + install_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}' + install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' + install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' + install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' } do_deploy[dirs] = "${S}" @@ -374,11 +374,11 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - deploy_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - deploy_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - deploy_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - deploy_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - deploy_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + deploy_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}' + deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' + deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' + deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' } addtask deploy before do_build after do_compile diff --git a/packages/obsolete/nslu2/nslu2-kernel.inc b/packages/obsolete/nslu2/nslu2-kernel.inc index a622c50f08..6b866100ca 100644 --- a/packages/obsolete/nslu2/nslu2-kernel.inc +++ b/packages/obsolete/nslu2/nslu2-kernel.inc @@ -150,7 +150,7 @@ N2K_PATCHES ?= "" # Image suffix - actually set in conf/machine/nslu2.conf as it is also # used by anything which needs to know the name of the generated image. # Should be overridden in the distro if patches or defconfig are changed. -N2K_SUFFIX ?= "nslu2${IXP4XX_MACHINE_ENDIAN}" +N2K_SUFFIX ?= "nslu2${SITEINFO_ENDIANESS}" SRC_URI = "${N2K_SRCURI}" SRC_URI += "${N2K_PATCHES}" @@ -186,7 +186,7 @@ addtask unpacklocal before do_patch after do_unpack do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi -- cgit v1.2.3 From 38d79683af2a1cc808b8574cada33c1e333f43d6 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 21:34:01 +0000 Subject: bb: add bb 1.2, currently does not cross-compile --- packages/bb/.mtn2git_empty | 0 packages/bb/bb_1.2.bb | 15 ++++ packages/bb/files/.mtn2git_empty | 0 packages/bb/files/fix-compile.patch | 166 ++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+) create mode 100644 packages/bb/.mtn2git_empty create mode 100644 packages/bb/bb_1.2.bb create mode 100644 packages/bb/files/.mtn2git_empty create mode 100644 packages/bb/files/fix-compile.patch diff --git a/packages/bb/.mtn2git_empty b/packages/bb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb new file mode 100644 index 0000000000..9904acae24 --- /dev/null +++ b/packages/bb/bb_1.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "bb, The portable aalib demo" +HOMEPAGE = "http://aa-project.sourceforge.net/bb/" +SECTION = "console/misc" +DEPENDS = "aalib" +PR = "r1" + +SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \ + file://fix-compile.patch;patch=1" + +inherit autotools + +do_install() { + install -d ${D}${bindir} + install -m 755 bb ${D}${bindir} +} diff --git a/packages/bb/files/.mtn2git_empty b/packages/bb/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bb/files/fix-compile.patch b/packages/bb/files/fix-compile.patch new file mode 100644 index 0000000000..75641da1e5 --- /dev/null +++ b/packages/bb/files/fix-compile.patch @@ -0,0 +1,166 @@ +Index: bb-1.2/bb.h +=================================================================== +--- bb-1.2.orig/bb.h ++++ bb-1.2/bb.h +@@ -23,7 +23,11 @@ + + #ifndef BB_H + #define BB_H ++//#include + #include ++struct parameters { ++ unsigned int p[AA_NPARAMS]; ++}; + #include "image.h" + #include "timers.h" + struct font { +Index: bb-1.2/textform.c +=================================================================== +--- bb-1.2.orig/textform.c ++++ bb-1.2/textform.c +@@ -155,41 +155,41 @@ static char *text = "#cWell we've reache + "#c\n" + "#bThree goals of AA-Project:#n" + "\n\n" +-"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib. +- +-2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp). +- +-3)Force IBM to start manufacturing MDA cards again. +- +-AA-project was started by Jan Hubicka. In that times just few people knew about \ +-it. Then a new demo named BB has been relased to show the power \ +-of AA-lib technology. Now the project is freely available and anyone can help. +- +-Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo. +- +-All programs covered under AA-project can be obtained at +-#c#bftp://ftp.ta.jcu.cz://pub/aa#n +-#c +-Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of \ +-examples of ascii-art generated by aalib, pointers to other AA-Project \ +-resources etc. +- +- We decided to distribute all of our aa-related programs freely (see \ +-COPYING for details). But if you want to help us develop more such software \ +-send a small amount (or big one ;-) to AA/BB maintainer address: +- +-Kamil Toman +-CS Armady 1930, Tabor +-390 03 +-Czech republic +- +-and contact us at: +- +-kupsaf@feld.cvut.cz (Filip Kupsa) +-hubicka@paru.cas.cz (Jan Hubicka) +-titania@horac.ta.jcu.cz (Mojmir Svoboda) +-toman@horac.ta.jcu.cz (Kamil Toman) +-#f" ++"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.\n" ++"\n" ++"2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).\n" ++"\n" ++"3)Force IBM to start manufacturing MDA cards again.\n" ++"\n" ++"AA-project was started by Jan Hubicka. In that times just few people knew about " ++"it. Then a new demo named BB has been relased to show the power " ++"of AA-lib technology. Now the project is freely available and anyone can help.\n" ++"\n" ++"Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.\n" ++"\n" ++"All programs covered under AA-project can be obtained at\n" ++"#c#bftp://ftp.ta.jcu.cz://pub/aa#n\n" ++"#c\n" ++"Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of " ++"examples of ascii-art generated by aalib, pointers to other AA-Project " ++"resources etc. \n" ++" \n" ++" We decided to distribute all of our aa-related programs freely (see " ++"COPYING for details). But if you want to help us develop more such software " ++"send a small amount (or big one ;-) to AA/BB maintainer address: \n" ++"\n" ++"Kamil Toman\n" ++"CS Armady 1930, Tabor\n" ++"390 03\n" ++"Czech republic\n" ++"\n" ++"and contact us at:\n" ++"\n" ++"kupsaf@feld.cvut.cz (Filip Kupsa)\n" ++"hubicka@paru.cas.cz (Jan Hubicka)\n" ++"titania@horac.ta.jcu.cz (Mojmir Svoboda)\n" ++"toman@horac.ta.jcu.cz (Kamil Toman)\n" ++"#f" + "\n" + "#l\n" + "#c#bAvailable programs#n\n" +@@ -245,37 +245,37 @@ toman@horac.ta.jcu.cz (Kamil Toman) + "\n#l" + "\n" + "#c#bThe AA-Lib#n\n" +-"#f#c +-AA-lib is a low level gfx library just as many other libraries are. The \ +-main difference is that AA-lib does not require graphics device. In fact, \ +-there is no graphical output possible. AA-lib replaces those old-fashioned \ +-output methods with powerful ascii-art renderer. Now my linux boots \ +-with a nice penguin logo at secondary display (yes! Like Win95 does:) \ +-AA-lib API is designed to be similar to other graphics libraries. Learning \ +-a new API would be a piece of cake! \ +-#f +- +-#l +-#c#bThe history#n +-#f +-Once upon a time we've (my friend Kamil and I) bought two old Herculeses \ +-as secondary monitors. We didn't know for that time that our Diamond \ +-Stealths 64 cards would become obsolete soon. Next day we downloaded \ +-the logo of Linux Texas Users Group \ +-- nice silly penguin looking like a cowboy! It was so exciting logo ... we \ +-decided that we couldn't live without it and we wanted to see it every time \ +-at a boot time as a logo on our secondary monitors. There was a small problem \ +-- Hercules doesn't support color graphics. So we decided to convert an image \ +-to ascii art using netpbm tools. +- +-The output was very ugly because the converting algorithm was absolutly stupid. \ +-During the night I designed a new convertor that used a font bitmap for \ +-creating aproximation table. The output wasn't very good since the algorithm \ +-wasn't so well tuned. Many months this small piece of code was waiting on my \ +-disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) \ +-with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! \ +-I was really impressed by the result! XaoS was faster, portable and looking \ +-much better than ever before. I found a new way to go... " ++"#f#c" ++"AA-lib is a low level gfx library just as many other libraries are. The " ++"main difference is that AA-lib does not require graphics device. In fact, " ++"there is no graphical output possible. AA-lib replaces those old-fashioned " ++"output methods with powerful ascii-art renderer. Now my linux boots " ++"with a nice penguin logo at secondary display (yes! Like Win95 does:) " ++"AA-lib API is designed to be similar to other graphics libraries. Learning " ++"a new API would be a piece of cake! " ++"#f" ++"\n" ++"#l" ++"#c#bThe history#n" ++"#f" ++"Once upon a time we've (my friend Kamil and I) bought two old Herculeses " ++"as secondary monitors. We didn't know for that time that our Diamond " ++"Stealths 64 cards would become obsolete soon. Next day we downloaded " ++"the logo of Linux Texas Users Group " ++"- nice silly penguin looking like a cowboy! It was so exciting logo ... we " ++"decided that we couldn't live without it and we wanted to see it every time " ++"at a boot time as a logo on our secondary monitors. There was a small problem " ++"- Hercules doesn't support color graphics. So we decided to convert an image " ++"to ascii art using netpbm tools." ++"\n" ++"The output was very ugly because the converting algorithm was absolutly stupid. " ++"During the night I designed a new convertor that used a font bitmap for " ++"creating aproximation table. The output wasn't very good since the algorithm " ++"wasn't so well tuned. Many months this small piece of code was waiting on my " ++"disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) " ++"with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! " ++"I was really impressed by the result! XaoS was faster, portable and looking " ++"much better than ever before. I found a new way to go... " + "#c\n" + "#f\n" + "\n" -- cgit v1.2.3 From 94bd7ff377096c9bbfd0bb5954005e2c7294e6c0 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 21:39:14 +0000 Subject: xaos: add 3.2.2, compiles but cannot find drivers when run --- packages/xaos/.mtn2git_empty | 0 packages/xaos/files/.mtn2git_empty | 0 packages/xaos/files/fix-aalib-configure.patch | 81 +++++++++++++++++++++++++++ packages/xaos/files/fix-build.patch | 61 ++++++++++++++++++++ packages/xaos/xaos_3.2.3.bb | 29 ++++++++++ 5 files changed, 171 insertions(+) create mode 100644 packages/xaos/.mtn2git_empty create mode 100644 packages/xaos/files/.mtn2git_empty create mode 100644 packages/xaos/files/fix-aalib-configure.patch create mode 100644 packages/xaos/files/fix-build.patch create mode 100644 packages/xaos/xaos_3.2.3.bb diff --git a/packages/xaos/.mtn2git_empty b/packages/xaos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xaos/files/.mtn2git_empty b/packages/xaos/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xaos/files/fix-aalib-configure.patch b/packages/xaos/files/fix-aalib-configure.patch new file mode 100644 index 0000000000..120d85b6fe --- /dev/null +++ b/packages/xaos/files/fix-aalib-configure.patch @@ -0,0 +1,81 @@ +Index: XaoS-3.2.3/configure.in +=================================================================== +--- XaoS-3.2.3.orig/configure.in ++++ XaoS-3.2.3/configure.in +@@ -130,25 +130,7 @@ if test -z "`${CC-cc} -mno-ieee-fp -c co + rm -f conftest* + ])]) + +-AC_DEFUN(AC_PROG_AALIB_VER_OK, +-[AC_CACHE_CHECK(whether aalib version >= 1.4, ac_aalib_ver_ok, +-[echo '#include +-#include +-void f(){ +-#if AA_LIB_VERSIONCODE < 104000 +-#error aa_lib is probably buggy +-/* I am using SuSE 7.3 and 8.0. Both contains version 1.3, +- * however they report 102000 version code. +- */ +-#endif +-}' > conftest.c +-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then +- ac_aalib_ver_ok=yes +- else +- ac_aalib_ver_ok=no +- fi +- rm -f conftest* +-])]) ++ac_aalib_ver_ok=yes + + AC_DEFUN(PROG_CC_SWITCH1, + [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_$2, +@@ -478,7 +460,6 @@ AC_DEFUN(AC_AALIB, [ + AC_CHECK_LIB(aa, aa_init) + if test "x$ac_cv_lib_aa_aa_init" = xyes; then + AC_MSG_RESULT(Found aalib on $1/aalib.h) +- AC_PROG_AALIB_VER_OK + if test $ac_aalib_ver_ok = yes; then + #LIBS="$LIBS $2" + x11_linked=yes +@@ -616,22 +597,22 @@ if test "$aa_driver_test" = yes; then + dnl Replace `main' with a function in -lm: + AC_CHECK_LIB(slang, SLsmg_init_smg) + +- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include") +- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") +- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local") +- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses , "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, ,-L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, "ncurses on /usr/local") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib/ncurses, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") + +- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") + +- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") +- AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_CURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, curses.h, , , "curses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") + + dnl + dnl We couldn't find ncurses, try SysV curses + dnl + if $search_ncurses + then +- AC_EGREP_HEADER(init_color, /usr/include/curses.h, ++ AC_EGREP_HEADER(init_color, /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/curses.h, + AC_USE_SYSV_CURSES) + fi + +@@ -653,8 +634,8 @@ if test "$aa_driver_test" = yes; then + LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + fi +- AC_AALIB(/usr/include, , ) +- AC_AALIB(/usr/local/include, -L/usr/local/lib, -I/usr/local/include) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, , ) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include) + for name in ../aalib-*.* + do + AC_AALIB($name,"-L$name","-I$name") diff --git a/packages/xaos/files/fix-build.patch b/packages/xaos/files/fix-build.patch new file mode 100644 index 0000000000..064c0fb853 --- /dev/null +++ b/packages/xaos/files/fix-build.patch @@ -0,0 +1,61 @@ +Index: XaoS-3.2.3/src/util/xstdio.c +=================================================================== +--- XaoS-3.2.3.orig/src/util/xstdio.c ++++ XaoS-3.2.3/src/util/xstdio.c +@@ -1,3 +1,4 @@ ++#define DATAPATH "/usr/share/XaoS" + #ifndef _plan9_ + #include + #if defined(__EMX__) || defined(__APPLE__) +Index: XaoS-3.2.3/src/engine/formulas.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/formulas.c ++++ XaoS-3.2.3/src/engine/formulas.c +@@ -69,6 +69,8 @@ + #endif + + ++#include "../include/complex.h" ++ + CONST char *CONST incolorname[] = { + "0", + "zmag", +Index: XaoS-3.2.3/src/engine/plane.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/plane.c ++++ XaoS-3.2.3/src/engine/plane.c +@@ -53,6 +53,8 @@ CONST char *CONST planename[] = { + }; + + ++#include "../include/complex.h" ++ + REGISTERS (3) + void recalculate (int plane, number_t * x1, number_t * y1) + { +Index: XaoS-3.2.3/src/engine/fractal.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/fractal.c ++++ XaoS-3.2.3/src/engine/fractal.c +@@ -66,6 +66,8 @@ + #endif + #include + ++#include "../include/complex.h" ++ + struct symetryinfo2 cursymetry; + struct palette cpalette; + struct image cimage; +Index: XaoS-3.2.3/src/engine/zoom.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/zoom.c ++++ XaoS-3.2.3/src/engine/zoom.c +@@ -69,6 +69,8 @@ + #define gettext(STRING) STRING + #endif + ++#include "../include/complex.h" ++ + #define ASIZE 16 + #define ALIGN(x) (((x)+ASIZE-1)&(~(ASIZE-1))) + static int nsymetrized; diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb new file mode 100644 index 0000000000..c54f646c2b --- /dev/null +++ b/packages/xaos/xaos_3.2.3.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer" +HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php" +SECTION = "graphics" +LICENSE = "GPLv2" +DEPENDS = "aalib x11 zlib libpng" +RDEPENDS += "libxxf86dga1" +PR = "r0" + +SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \ + file://fix-build.patch;patch=1 \ + file://fix-aalib-configure.patch;patch=1" + +S = "${WORKDIR}/XaoS-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-nls" +#--with-x --with-ncurses=${STAGING_INCDIR} --with-dga-driver=no --with-x11-driver=no --with-aa-driver=yes + +do_configure_prepend() { + sed -i 's~/usr/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/local/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/lib~${STAGING_LIBDIR}~' ${S}/configure.in + sed -i 's~/usr/local/lib~${STAGING_LIBDIR}~' ${S}/configure.in +} + +FILES_${PN} = "${bindir} ${datadir}/XaoS/catalogs" + +CFLAGS = "-L${STAGING_LIBDIR}" -- cgit v1.2.3 From 0ff0fc1e03d059a9c69e95d389b9ab00949bdc5a Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 21:41:37 +0000 Subject: bb: add LICENSE --- packages/bb/bb_1.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb index 9904acae24..0629f74faf 100644 --- a/packages/bb/bb_1.2.bb +++ b/packages/bb/bb_1.2.bb @@ -1,6 +1,7 @@ DESCRIPTION = "bb, The portable aalib demo" HOMEPAGE = "http://aa-project.sourceforge.net/bb/" SECTION = "console/misc" +LICENSE = "GPLv2" DEPENDS = "aalib" PR = "r1" -- cgit v1.2.3 From 3e37a0c55a6f7232bc2e02ef81829dd9874a8c6e Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 21:47:12 +0000 Subject: xaos: fix DEPENDS --- packages/xaos/xaos_3.2.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb index c54f646c2b..22cedeb296 100644 --- a/packages/xaos/xaos_3.2.3.bb +++ b/packages/xaos/xaos_3.2.3.bb @@ -2,8 +2,8 @@ DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer" HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php" SECTION = "graphics" LICENSE = "GPLv2" -DEPENDS = "aalib x11 zlib libpng" -RDEPENDS += "libxxf86dga1" +DEPENDS = "aalib libx11 zlib libpng" +RDEPENDS += "libxxf86dga" PR = "r0" SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \ -- cgit v1.2.3 From 5f953ef49e4be710792f1bd829d540d986a20952 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 22:32:20 +0000 Subject: mpd: add pulse support, fix mod support --- packages/musicpd/mpd/fix-mod-support.patch | 21 +++++++++++++++++++++ packages/musicpd/mpd_svn.bb | 9 +++++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 packages/musicpd/mpd/fix-mod-support.patch diff --git a/packages/musicpd/mpd/fix-mod-support.patch b/packages/musicpd/mpd/fix-mod-support.patch new file mode 100644 index 0000000000..bbf0513e58 --- /dev/null +++ b/packages/musicpd/mpd/fix-mod-support.patch @@ -0,0 +1,21 @@ +Index: trunk/src/inputPlugins/mod_plugin.c +=================================================================== +--- trunk.orig/src/inputPlugins/mod_plugin.c ++++ trunk/src/inputPlugins/mod_plugin.c +@@ -64,9 +64,13 @@ static MDRIVER drv_mpd = { + "MPD Output Driver v0.1", + 0, + 255, +- "mpd", +- NULL, +- mod_mpd_IsThere, ++#if (LIBMIKMOD_VERSION > 0x030106) ++ "mpd", /* alias */ ++ NULL, /* cmd help line*/ ++#endif ++#if (LIBMIKMOD_VERSION >= 0x030200) ++ NULL, /*Command Line */ ++#endif mod_mpd_IsThere, + VC_SampleLoad, + VC_SampleUnload, + VC_SampleSpace, diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index bc10a923fb..a9c30b2104 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" LICENSE = "GPLv2" SECTION = "console/multimedia" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" +DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" -PR = "r0" +PR = "r1" -SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https" +SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ + file://fix-mod-support.patch;patch=1" # file://save-volume-state.patch;patch=1" S = "${WORKDIR}/trunk" @@ -26,7 +27,7 @@ EXTRA_OECONF = "--enable-ogg \ --with-faad-libraries=${STAGING_LIBDIR} \ --with-faad-includes=${STAGING_INCDIR} \ --disable-jack \ - --disable-pulse \ + --enable-pulse \ --enable-mod \ --disable-oggflac" -- cgit v1.2.3 From 4e14757e455f60c3d29747412a2364b29aec53e8 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 22:37:14 +0000 Subject: efl, e17: update ot newest versions --- packages/e17/e-wm_0.16.999.036.bb | 41 --------------------- packages/e17/e-wm_0.16.999.037.bb | 41 +++++++++++++++++++++ packages/e17/entrance/Sessions/Enlightenment | 3 +- packages/e17/entrance_0.9.0.007.bb | 4 +- packages/efl/ecore-fb_0.9.9.036.bb | 29 --------------- packages/efl/ecore-fb_0.9.9.037.bb | 31 ++++++++++++++++ packages/efl/ecore-native_0.9.9.036.bb | 6 --- packages/efl/ecore-native_0.9.9.037.bb | 6 +++ packages/efl/ecore-x11_0.9.9.036.bb | 30 --------------- packages/efl/ecore-x11_0.9.9.037.bb | 30 +++++++++++++++ packages/efl/ecore.inc | 2 +- packages/efl/ecore/fix-tslib-configure.patch | 24 ++++++------ packages/efl/edb-native/.mtn2git_empty | 0 packages/efl/edb-native/no-gtk-forkbomb.patch | 12 ++++++ packages/efl/edb-native_1.0.5.007.bb | 2 + packages/efl/edb_1.0.5.007.bb | 1 + packages/efl/edje-native_0.5.0.036.bb | 20 ---------- packages/efl/edje-native_0.5.0.037.bb | 20 ++++++++++ packages/efl/edje-utils_0.5.0.036.bb | 23 ------------ packages/efl/edje-utils_0.5.0.037.bb | 23 ++++++++++++ packages/efl/edje_0.5.0.036.bb | 32 ---------------- packages/efl/edje_0.5.0.037.bb | 32 ++++++++++++++++ packages/efl/eet-native_0.9.10.036.bb | 4 -- packages/efl/eet-native_0.9.10.037.bb | 4 ++ packages/efl/eet_0.9.10.036.bb | 9 ----- packages/efl/eet_0.9.10.037.bb | 9 +++++ packages/efl/embryo-native_0.9.1.036.bb | 7 ---- packages/efl/embryo-native_0.9.1.037.bb | 7 ++++ packages/efl/embryo-utils_0.9.1.036.bb | 18 --------- packages/efl/embryo-utils_0.9.1.037.bb | 18 +++++++++ packages/efl/embryo_0.9.1.036.bb | 11 ------ packages/efl/embryo_0.9.1.037.bb | 11 ++++++ packages/efl/evas-fb_0.9.9.036.bb | 47 ------------------------ packages/efl/evas-fb_0.9.9.037.bb | 47 ++++++++++++++++++++++++ packages/efl/evas-native_0.9.9.036.bb | 5 --- packages/efl/evas-native_0.9.9.037.bb | 5 +++ packages/efl/evas-x11_0.9.9.036.bb | 53 --------------------------- packages/efl/evas-x11_0.9.9.037.bb | 53 +++++++++++++++++++++++++++ packages/efl/evas/fix-configure.patch | 19 +++++----- 39 files changed, 378 insertions(+), 361 deletions(-) delete mode 100644 packages/e17/e-wm_0.16.999.036.bb create mode 100644 packages/e17/e-wm_0.16.999.037.bb delete mode 100644 packages/efl/ecore-fb_0.9.9.036.bb create mode 100644 packages/efl/ecore-fb_0.9.9.037.bb delete mode 100644 packages/efl/ecore-native_0.9.9.036.bb create mode 100644 packages/efl/ecore-native_0.9.9.037.bb delete mode 100644 packages/efl/ecore-x11_0.9.9.036.bb create mode 100644 packages/efl/ecore-x11_0.9.9.037.bb create mode 100644 packages/efl/edb-native/.mtn2git_empty create mode 100644 packages/efl/edb-native/no-gtk-forkbomb.patch delete mode 100644 packages/efl/edje-native_0.5.0.036.bb create mode 100644 packages/efl/edje-native_0.5.0.037.bb delete mode 100644 packages/efl/edje-utils_0.5.0.036.bb create mode 100644 packages/efl/edje-utils_0.5.0.037.bb delete mode 100644 packages/efl/edje_0.5.0.036.bb create mode 100644 packages/efl/edje_0.5.0.037.bb delete mode 100644 packages/efl/eet-native_0.9.10.036.bb create mode 100644 packages/efl/eet-native_0.9.10.037.bb delete mode 100644 packages/efl/eet_0.9.10.036.bb create mode 100644 packages/efl/eet_0.9.10.037.bb delete mode 100644 packages/efl/embryo-native_0.9.1.036.bb create mode 100644 packages/efl/embryo-native_0.9.1.037.bb delete mode 100644 packages/efl/embryo-utils_0.9.1.036.bb create mode 100644 packages/efl/embryo-utils_0.9.1.037.bb delete mode 100644 packages/efl/embryo_0.9.1.036.bb create mode 100644 packages/efl/embryo_0.9.1.037.bb delete mode 100644 packages/efl/evas-fb_0.9.9.036.bb create mode 100644 packages/efl/evas-fb_0.9.9.037.bb delete mode 100644 packages/efl/evas-native_0.9.9.036.bb create mode 100644 packages/efl/evas-native_0.9.9.037.bb delete mode 100644 packages/efl/evas-x11_0.9.9.036.bb create mode 100644 packages/efl/evas-x11_0.9.9.037.bb diff --git a/packages/e17/e-wm_0.16.999.036.bb b/packages/e17/e-wm_0.16.999.036.bb deleted file mode 100644 index 3084fd99bc..0000000000 --- a/packages/e17/e-wm_0.16.999.036.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo" -LICENSE = "MIT" -PR = "r4" - -inherit e update-alternatives - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://set-autoscroll-defaults.patch;patch=1 \ - file://Xsession.d/98enlightenment" - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -} - -ALTERNATIVE_PATH = "${bindir}/enlightenment" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb new file mode 100644 index 0000000000..3084fd99bc --- /dev/null +++ b/packages/e17/e-wm_0.16.999.037.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo" +LICENSE = "MIT" +PR = "r4" + +inherit e update-alternatives + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ + file://set-autoscroll-defaults.patch;patch=1 \ + file://Xsession.d/98enlightenment" + +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LOWRES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +} + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} + +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment index 4d33bbb2e9..61498c2c6c 100644 --- a/packages/e17/entrance/Sessions/Enlightenment +++ b/packages/e17/entrance/Sessions/Enlightenment @@ -1,4 +1,3 @@ #!/bin/sh -enlightenment - +enlightenment_start diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb index 7f0a9a181e..50126cb5a9 100644 --- a/packages/e17/entrance_0.9.0.007.bb +++ b/packages/e17/entrance_0.9.0.007.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Entrance is the Enlightenment login manager" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager" +DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager" RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes" HOMEPAGE = "http://www.enlightenment.org" -PR = "r13" +PR = "r14" inherit e diff --git a/packages/efl/ecore-fb_0.9.9.036.bb b/packages/efl/ecore-fb_0.9.9.036.bb deleted file mode 100644 index 49c32927af..0000000000 --- a/packages/efl/ecore-fb_0.9.9.036.bb +++ /dev/null @@ -1,29 +0,0 @@ -require ecore.inc -PR = "r2" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-poll \ - --enable-ecore-dbus \ - --enable-ecore-evas \ - --enable-ecore-evas-buffer \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x \ - --disable-ecore-evas-xrender \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-config \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --disable-ecore-x \ - --disable-curl \ - --without-curl-config \ - --enable-ecore-config \ - --enable-ecore-desktop \ - --disable-openssl" - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_Desktop" diff --git a/packages/efl/ecore-fb_0.9.9.037.bb b/packages/efl/ecore-fb_0.9.9.037.bb new file mode 100644 index 0000000000..b856d38bd9 --- /dev/null +++ b/packages/efl/ecore-fb_0.9.9.037.bb @@ -0,0 +1,31 @@ +require ecore.inc +PR = "r2" + +SRC_URI += "file://remove-bad-code.patch;patch=1" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-poll \ + --enable-ecore-dbus \ + --enable-ecore-evas \ + --enable-ecore-evas-buffer \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-xrender \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-config \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ + --enable-ecore-config \ + --enable-ecore-desktop \ + --disable-openssl" + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_Desktop" diff --git a/packages/efl/ecore-native_0.9.9.036.bb b/packages/efl/ecore-native_0.9.9.036.bb deleted file mode 100644 index 7d7ed2370a..0000000000 --- a/packages/efl/ecore-native_0.9.9.036.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ecore-fb_${PV}.bb -inherit native -# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it -# DEPENDS = "curl-native eet-native evas-native" -DEPENDS = "eet-native evas-native" -PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-native_0.9.9.037.bb b/packages/efl/ecore-native_0.9.9.037.bb new file mode 100644 index 0000000000..7d7ed2370a --- /dev/null +++ b/packages/efl/ecore-native_0.9.9.037.bb @@ -0,0 +1,6 @@ +require ecore-fb_${PV}.bb +inherit native +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-x11_0.9.9.036.bb b/packages/efl/ecore-x11_0.9.9.036.bb deleted file mode 100644 index 1deb641326..0000000000 --- a/packages/efl/ecore-x11_0.9.9.036.bb +++ /dev/null @@ -1,30 +0,0 @@ -require ecore.inc -DEPENDS += "evas-x11" -PR = "r3" - -SRC_URI += "file://configure-abstract-sockets.patch;patch=1" - -EXTRA_OECONF = "--disable-ecore-fb \ - --disable-ecore-dfb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-ecore-dbus \ - --disable-ecore-evas-fb \ - --disable-ecore-evas-dfb \ - --enable-ecore-evas-x \ - --enable-ecore-evas-buffer \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --enable-ecore-x \ - --enable-ecore-config \ - --disable-openssl \ - --enable-ecore-desktop \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} " - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_X Ecore_Desktop" diff --git a/packages/efl/ecore-x11_0.9.9.037.bb b/packages/efl/ecore-x11_0.9.9.037.bb new file mode 100644 index 0000000000..1deb641326 --- /dev/null +++ b/packages/efl/ecore-x11_0.9.9.037.bb @@ -0,0 +1,30 @@ +require ecore.inc +DEPENDS += "evas-x11" +PR = "r3" + +SRC_URI += "file://configure-abstract-sockets.patch;patch=1" + +EXTRA_OECONF = "--disable-ecore-fb \ + --disable-ecore-dfb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-ecore-dbus \ + --disable-ecore-evas-fb \ + --disable-ecore-evas-dfb \ + --enable-ecore-evas-x \ + --enable-ecore-evas-buffer \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --enable-ecore-x \ + --enable-ecore-config \ + --disable-openssl \ + --enable-ecore-desktop \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} " + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_X Ecore_Desktop" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index e0e65b69c0..7d89435598 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -3,7 +3,7 @@ foundation libraries. It makes makes doing selections, drag and drop, event loop timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" LICENSE = "MIT" -# can also have openssl, dbus +# can also have openssl, dbus, iconv DEPENDS += "virtual/evas curl eet" PROVIDES += "virtual/ecore" diff --git a/packages/efl/ecore/fix-tslib-configure.patch b/packages/efl/ecore/fix-tslib-configure.patch index 5a23f904dc..2c82b2741e 100644 --- a/packages/efl/ecore/fix-tslib-configure.patch +++ b/packages/efl/ecore/fix-tslib-configure.patch @@ -1,12 +1,12 @@ -diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in ---- ecore-0.9.9.015~/configure.in 2005-09-27 17:22:38.000000000 -0700 -+++ ecore-0.9.9.015/configure.in 2005-09-27 17:23:40.000000000 -0700 -@@ -103,7 +102,7 @@ - tslib_libs="" - AC_CHECK_HEADER(tslib.h, - [ -- tslib_libs="-ltslib" -+ tslib_libs="-lts" - AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) - ],[ - AC_MSG_RESULT("No tslib header found. No tslib support being built") +diff -Nur ecore-0.9.9.037~/configure.in ecore-0.9.9.037/configure.in +--- ecore-0.9.9.037~/configure.in 2007-01-14 20:21:42.000000000 -0800 ++++ ecore-0.9.9.037/configure.in 2007-01-14 20:22:18.000000000 -0800 +@@ -578,7 +578,7 @@ + if test "x$want_ecore_fb" = "xyes"; then + AC_CHECK_HEADER(tslib.h, + [ +- tslib_libs="-ltslib" ++ tslib_libs="-lts" + AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) + ] + ) diff --git a/packages/efl/edb-native/.mtn2git_empty b/packages/efl/edb-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/efl/edb-native/no-gtk-forkbomb.patch b/packages/efl/edb-native/no-gtk-forkbomb.patch new file mode 100644 index 0000000000..8fe226846e --- /dev/null +++ b/packages/efl/edb-native/no-gtk-forkbomb.patch @@ -0,0 +1,12 @@ +diff -Nur edb-1.0.5.007~/configure.in edb-1.0.5.007/configure.in +--- edb-1.0.5.007~/configure.in 2007-01-15 01:01:31.000000000 -0800 ++++ edb-1.0.5.007/configure.in 2007-01-15 01:01:40.000000000 -0800 +@@ -404,7 +404,7 @@ + ncurses_ok=no + gtk_ok=no + +-GTK_CONFIG=`which gtk-config` ++GTK_CONFIG= + if test -x "$GTK_CONFIG"; then + AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) + fi diff --git a/packages/efl/edb-native_1.0.5.007.bb b/packages/efl/edb-native_1.0.5.007.bb index 82095f03cc..f3f94086ce 100644 --- a/packages/efl/edb-native_1.0.5.007.bb +++ b/packages/efl/edb-native_1.0.5.007.bb @@ -2,6 +2,8 @@ require edb_${PV}.bb inherit native DEPENDS = "zlib-native" +SRC_URI += "file://no-gtk-forkbomb.patch;patch=1" + EXTRA_OECONF += "--disable-gtk --disable-ncurses" do_stage_append () { diff --git a/packages/efl/edb_1.0.5.007.bb b/packages/efl/edb_1.0.5.007.bb index a152530b47..9632fc4acc 100644 --- a/packages/efl/edb_1.0.5.007.bb +++ b/packages/efl/edb_1.0.5.007.bb @@ -1,6 +1,7 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" +# can depend on gtk and tcl/tk LICENSE = "BSD" PR = "r4" diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.036.bb deleted file mode 100644 index c66639d25e..0000000000 --- a/packages/efl/edje-native_0.5.0.036.bb +++ /dev/null @@ -1,20 +0,0 @@ -require edje_${PV}.bb -PR = "r3" - -inherit native - -DEPENDS = "evas-native ecore-native eet-native embryo-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c -} - -do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` - # could also use ${STAGING_DATADIR}/edje/include - install -d $edje_data_dir/include - install -m 0644 data/include/edje.inc $edje_data_dir/include -} diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb new file mode 100644 index 0000000000..c66639d25e --- /dev/null +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -0,0 +1,20 @@ +require edje_${PV}.bb +PR = "r3" + +inherit native + +DEPENDS = "evas-native ecore-native eet-native embryo-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c +} + +do_stage_append() { + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include +} diff --git a/packages/efl/edje-utils_0.5.0.036.bb b/packages/efl/edje-utils_0.5.0.036.bb deleted file mode 100644 index f8eb917e4d..0000000000 --- a/packages/efl/edje-utils_0.5.0.036.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "edje embryo-utils gcc" -LICENSE = "MIT" -PR = "r6" - -inherit efl - -PACKAGES = "edje-utils" -FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ - ${E_CVS};module=e17/libs/edje/m4;date=20060101" -S = "${WORKDIR}/edje-${PV}" - -libraries = "" -headers = "" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} diff --git a/packages/efl/edje-utils_0.5.0.037.bb b/packages/efl/edje-utils_0.5.0.037.bb new file mode 100644 index 0000000000..f8eb917e4d --- /dev/null +++ b/packages/efl/edje-utils_0.5.0.037.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +DEPENDS = "edje embryo-utils gcc" +LICENSE = "MIT" +PR = "r6" + +inherit efl + +PACKAGES = "edje-utils" +FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ + ${E_CVS};module=e17/libs/edje/m4;date=20060101" +S = "${WORKDIR}/edje-${PV}" + +libraries = "" +headers = "" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/edje_0.5.0.036.bb b/packages/efl/edje_0.5.0.036.bb deleted file mode 100644 index d51dd119e4..0000000000 --- a/packages/efl/edje_0.5.0.036.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" -LICENSE = "MIT" -PR = "r7" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "edje-utils" -#RPROVIDES_edje-utils += "libedje-utils" -#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -inherit efl - -SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -LEAD_SONAME = "libedje.so" - -FILES_${PN}-examples = "${datadir}/edje/data/images \ - ${datadir}/edje/data/src \ - ${datadir}/edje/data/test \ - ${datadir}/edje/data/*.sh" - -FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/edje_0.5.0.037.bb b/packages/efl/edje_0.5.0.037.bb new file mode 100644 index 0000000000..d51dd119e4 --- /dev/null +++ b/packages/efl/edje_0.5.0.037.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" +LICENSE = "MIT" +PR = "r7" + +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "edje-utils" +#RPROVIDES_edje-utils += "libedje-utils" +#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +inherit efl + +SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + +LEAD_SONAME = "libedje.so" + +FILES_${PN}-examples = "${datadir}/edje/data/images \ + ${datadir}/edje/data/src \ + ${datadir}/edje/data/test \ + ${datadir}/edje/data/*.sh" + +FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/eet-native_0.9.10.036.bb b/packages/efl/eet-native_0.9.10.036.bb deleted file mode 100644 index 9e2426ca9f..0000000000 --- a/packages/efl/eet-native_0.9.10.036.bb +++ /dev/null @@ -1,4 +0,0 @@ -require eet_${PV}.bb -inherit native -DEPENDS = "zlib-native jpeg-native" - diff --git a/packages/efl/eet-native_0.9.10.037.bb b/packages/efl/eet-native_0.9.10.037.bb new file mode 100644 index 0000000000..9e2426ca9f --- /dev/null +++ b/packages/efl/eet-native_0.9.10.037.bb @@ -0,0 +1,4 @@ +require eet_${PV}.bb +inherit native +DEPENDS = "zlib-native jpeg-native" + diff --git a/packages/efl/eet_0.9.10.036.bb b/packages/efl/eet_0.9.10.036.bb deleted file mode 100644 index 6e6032e098..0000000000 --- a/packages/efl/eet_0.9.10.036.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." -DEPENDS = "zlib jpeg" -LICENSE = "BSD" -PR = "r2" - -inherit efl diff --git a/packages/efl/eet_0.9.10.037.bb b/packages/efl/eet_0.9.10.037.bb new file mode 100644 index 0000000000..6e6032e098 --- /dev/null +++ b/packages/efl/eet_0.9.10.037.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "EET is a tiny library designed to write an \ +arbitary set of chunks of data to a file and optionally compress \ +each chunk (very much like a zip file) and allow fast \ +random-access reading of the file later on." +DEPENDS = "zlib jpeg" +LICENSE = "BSD" +PR = "r2" + +inherit efl diff --git a/packages/efl/embryo-native_0.9.1.036.bb b/packages/efl/embryo-native_0.9.1.036.bb deleted file mode 100644 index 76fe80fe3d..0000000000 --- a/packages/efl/embryo-native_0.9.1.036.bb +++ /dev/null @@ -1,7 +0,0 @@ -require embryo_${PV}.bb -inherit native - -do_stage_append() { - install -d ${STAGING_DATADIR}/embryo/include - install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include -} \ No newline at end of file diff --git a/packages/efl/embryo-native_0.9.1.037.bb b/packages/efl/embryo-native_0.9.1.037.bb new file mode 100644 index 0000000000..76fe80fe3d --- /dev/null +++ b/packages/efl/embryo-native_0.9.1.037.bb @@ -0,0 +1,7 @@ +require embryo_${PV}.bb +inherit native + +do_stage_append() { + install -d ${STAGING_DATADIR}/embryo/include + install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include +} \ No newline at end of file diff --git a/packages/efl/embryo-utils_0.9.1.036.bb b/packages/efl/embryo-utils_0.9.1.036.bb deleted file mode 100644 index d507c53cce..0000000000 --- a/packages/efl/embryo-utils_0.9.1.036.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" -S = "${WORKDIR}/embryo-${PV}" - -PACKAGES = "embryo-utils" -FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" - -libraries = "" -headers = "" diff --git a/packages/efl/embryo-utils_0.9.1.037.bb b/packages/efl/embryo-utils_0.9.1.037.bb new file mode 100644 index 0000000000..d507c53cce --- /dev/null +++ b/packages/efl/embryo-utils_0.9.1.037.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r4" + +inherit efl + +SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" +S = "${WORKDIR}/embryo-${PV}" + +PACKAGES = "embryo-utils" +FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" + +libraries = "" +headers = "" diff --git a/packages/efl/embryo_0.9.1.036.bb b/packages/efl/embryo_0.9.1.036.bb deleted file mode 100644 index 0009c0a149..0000000000 --- a/packages/efl/embryo_0.9.1.036.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -FILES_${PN}-examples = "${datadir}/${PN}/examples" \ No newline at end of file diff --git a/packages/efl/embryo_0.9.1.037.bb b/packages/efl/embryo_0.9.1.037.bb new file mode 100644 index 0000000000..0009c0a149 --- /dev/null +++ b/packages/efl/embryo_0.9.1.037.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r4" + +inherit efl + +FILES_${PN}-examples = "${datadir}/${PN}/examples" \ No newline at end of file diff --git a/packages/efl/evas-fb_0.9.9.036.bb b/packages/efl/evas-fb_0.9.9.036.bb deleted file mode 100644 index 3e29b80cc0..0000000000 --- a/packages/efl/evas-fb_0.9.9.036.bb +++ /dev/null @@ -1,47 +0,0 @@ -require evas.inc -PR = "r5" - -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --disable-xrender-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --enable-convert-8-rgb-332 \ - --enable-convert-8-rgb-666 \ - --enable-convert-8-rgb-232 \ - --enable-convert-8-rgb-222 \ - --enable-convert-8-rgb-221 \ - --enable-convert-8-rgb-121 \ - --enable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --enable-convert-16-rgb-555 \ - --enable-convert-16-rgb-444 \ - --enable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --enable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --enable-convert-24-rgb-888 \ - --enable-convert-24-bgr-888 \ - --enable-convert-32-rgb-8888 \ - --enable-convert-32-rgbx-8888 \ - --enable-convert-32-bgr-8888 \ - --enable-convert-32-bgrx-8888 \ - --enable-convert-32-rgb-rot-0 \ - --enable-convert-32-rgb-rot-90 \ - --enable-convert-32-rgb-rot-270" - -headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" diff --git a/packages/efl/evas-fb_0.9.9.037.bb b/packages/efl/evas-fb_0.9.9.037.bb new file mode 100644 index 0000000000..3e29b80cc0 --- /dev/null +++ b/packages/efl/evas-fb_0.9.9.037.bb @@ -0,0 +1,47 @@ +require evas.inc +PR = "r5" + +EXTRA_OECONF = "--enable-fb \ + --disable-directfb \ + --enable-buffer \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-gl-x11 \ + --disable-xrender-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --enable-convert-8-rgb-332 \ + --enable-convert-8-rgb-666 \ + --enable-convert-8-rgb-232 \ + --enable-convert-8-rgb-222 \ + --enable-convert-8-rgb-221 \ + --enable-convert-8-rgb-121 \ + --enable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --enable-convert-16-rgb-555 \ + --enable-convert-16-rgb-444 \ + --enable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-90 \ + --enable-convert-32-rgb-rot-270" + +headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ + Evas.h" diff --git a/packages/efl/evas-native_0.9.9.036.bb b/packages/efl/evas-native_0.9.9.036.bb deleted file mode 100644 index 68dacbc809..0000000000 --- a/packages/efl/evas-native_0.9.9.036.bb +++ /dev/null @@ -1,5 +0,0 @@ -require evas-fb_${PV}.bb -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PROVIDES = "evas-native" - diff --git a/packages/efl/evas-native_0.9.9.037.bb b/packages/efl/evas-native_0.9.9.037.bb new file mode 100644 index 0000000000..68dacbc809 --- /dev/null +++ b/packages/efl/evas-native_0.9.9.037.bb @@ -0,0 +1,5 @@ +require evas-fb_${PV}.bb +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" + diff --git a/packages/efl/evas-x11_0.9.9.036.bb b/packages/efl/evas-x11_0.9.9.036.bb deleted file mode 100644 index 121922591e..0000000000 --- a/packages/efl/evas-x11_0.9.9.036.bb +++ /dev/null @@ -1,53 +0,0 @@ -require evas.inc -DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r7" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --enable-software-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --enable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-image-loader-svg \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ - ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ - ../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" - diff --git a/packages/efl/evas-x11_0.9.9.037.bb b/packages/efl/evas-x11_0.9.9.037.bb new file mode 100644 index 0000000000..121922591e --- /dev/null +++ b/packages/efl/evas-x11_0.9.9.037.bb @@ -0,0 +1,53 @@ +require evas.inc +DEPENDS += "edb virtual/libx11 libxext freetype" +PR = "r7" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --enable-buffer \ + --disable-software-qtopia \ + --enable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --enable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-image-loader-svg \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + +headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ + ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ + ../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ + Evas.h" + diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch index 61e2446c24..abf9b94bdf 100644 --- a/packages/efl/evas/fix-configure.patch +++ b/packages/efl/evas/fix-configure.patch @@ -1,17 +1,18 @@ ---- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 -+++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 -@@ -152,9 +152,7 @@ +diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in +--- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800 ++++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800 +@@ -161,9 +161,7 @@ + AC_CHECK_HEADER(X11/X.h, [ - AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" - ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" ], [ -@@ -423,10 +421,10 @@ + AC_MSG_RESULT(disabling software X11 engine) +@@ -407,10 +405,10 @@ AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) @@ -23,8 +24,8 @@ + gl_cflags="" gl_libs="-lGL -lGLU -lpthread" gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -489,7 +487,7 @@ + ], [ +@@ -471,7 +469,7 @@ AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) @@ -32,4 +33,4 @@ + x_dir=""; x_cflags="-I"$x_dir"/include" x_libs="-L"$x_dir"/lib -lX11 -lXext" - ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" + ], [ -- cgit v1.2.3 From 17b9b9959b55d5466d514eb9fe00ac3b6418ff81 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 28 Jan 2007 05:54:19 +0000 Subject: mpd: fix mod patch --- packages/musicpd/mpd/fix-mod-support.patch | 16 +++++++++------- packages/musicpd/mpd_svn.bb | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/musicpd/mpd/fix-mod-support.patch b/packages/musicpd/mpd/fix-mod-support.patch index bbf0513e58..f9010abd9b 100644 --- a/packages/musicpd/mpd/fix-mod-support.patch +++ b/packages/musicpd/mpd/fix-mod-support.patch @@ -1,21 +1,23 @@ -Index: trunk/src/inputPlugins/mod_plugin.c +Index: mpd/src/inputPlugins/mod_plugin.c =================================================================== ---- trunk.orig/src/inputPlugins/mod_plugin.c -+++ trunk/src/inputPlugins/mod_plugin.c -@@ -64,9 +64,13 @@ static MDRIVER drv_mpd = { +--- mpd.orig/src/inputPlugins/mod_plugin.c ++++ mpd/src/inputPlugins/mod_plugin.c +@@ -62,10 +62,16 @@ static MDRIVER drv_mpd = { + NULL, + "MPD", "MPD Output Driver v0.1", ++ 0, 255, - "mpd", - NULL, -- mod_mpd_IsThere, +#if (LIBMIKMOD_VERSION > 0x030106) + "mpd", /* alias */ + NULL, /* cmd help line*/ +#endif +#if (LIBMIKMOD_VERSION >= 0x030200) + NULL, /*Command Line */ -+#endif mod_mpd_IsThere, ++#endif + mod_mpd_IsThere, VC_SampleLoad, VC_SampleUnload, - VC_SampleSpace, diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index a9c30b2104..3478bc76fa 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -5,7 +5,7 @@ SECTION = "console/multimedia" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ file://fix-mod-support.patch;patch=1" -- cgit v1.2.3 From 7029d0f6cde4fc7be40fbb765ec64b78b6998d8b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 01:56:10 +0000 Subject: arm-kernel-shim: New package designed to provide ATAGs to the kernel when the normal bootloader does not do it's job properly. --- packages/arm-kernel-shim/.mtn2git_empty | 0 packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb | 34 ++++++++++++++++++++++ packages/arm-kernel-shim/files/.mtn2git_empty | 0 packages/arm-kernel-shim/files/config-nas100d.h | 30 +++++++++++++++++++ packages/arm-kernel-shim/files/config-nslu2.h | 30 +++++++++++++++++++ .../files/disable-commandline.patch | 28 ++++++++++++++++++ 6 files changed, 122 insertions(+) create mode 100644 packages/arm-kernel-shim/.mtn2git_empty create mode 100644 packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb create mode 100644 packages/arm-kernel-shim/files/.mtn2git_empty create mode 100644 packages/arm-kernel-shim/files/config-nas100d.h create mode 100644 packages/arm-kernel-shim/files/config-nslu2.h create mode 100644 packages/arm-kernel-shim/files/disable-commandline.patch diff --git a/packages/arm-kernel-shim/.mtn2git_empty b/packages/arm-kernel-shim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb new file mode 100644 index 0000000000..3f5da24991 --- /dev/null +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "ARM Kernel Shim" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://disable-commandline.patch;patch=1 \ + file://config-nslu2.h \ + file://config-nas100d.h" +S = ${WORKDIR}/apex-${PV}/arm-kernel-shim + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + # NSLU2 + cp ${WORKDIR}/config-nslu2.h ${S}/config.h + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 + make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" + # NAS100d + cp ${WORKDIR}/config-nas100d.h ${S}/config.h + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d + make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + . ${CONFIG_SITE} + cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ +} diff --git a/packages/arm-kernel-shim/files/.mtn2git_empty b/packages/arm-kernel-shim/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h new file mode 100644 index 0000000000..7547061165 --- /dev/null +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -0,0 +1,30 @@ +/* config.h + + written by Marc Singer + 23 Jun 2006 + + Copyright (C) 2006 Marc Singer + + ----------- + DESCRIPTION + ----------- + +*/ + +#if !defined (__CONFIG_H__) +# define __CONFIG_H__ + +#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ + +#define RAM_BANK0_START 0x00000000 +#define RAM_BANK0_LENGTH 0x02000000 + +//#define RAM_BANK1_START 0xd0000000 +//#define RAM_BANK1_LENGTH 0x10000000 + +//#define COMMANDLINE\ +// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" + +#define MACH_TYPE 597 + +#endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h new file mode 100644 index 0000000000..e1229edd59 --- /dev/null +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -0,0 +1,30 @@ +/* config.h + + written by Marc Singer + 23 Jun 2006 + + Copyright (C) 2006 Marc Singer + + ----------- + DESCRIPTION + ----------- + +*/ + +#if !defined (__CONFIG_H__) +# define __CONFIG_H__ + +#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ + +#define RAM_BANK0_START 0x00000000 +#define RAM_BANK0_LENGTH 0x02000000 + +//#define RAM_BANK1_START 0xd0000000 +//#define RAM_BANK1_LENGTH 0x10000000 + +//#define COMMANDLINE\ +// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" + +#define MACH_TYPE 865 + +#endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/disable-commandline.patch b/packages/arm-kernel-shim/files/disable-commandline.patch new file mode 100644 index 0000000000..d8c59f1a6b --- /dev/null +++ b/packages/arm-kernel-shim/files/disable-commandline.patch @@ -0,0 +1,28 @@ +--- arm-kernel-shim/main.c~ 2006-07-21 11:12:07.000000000 +0930 ++++ arm-kernel-shim/main.c 2007-01-28 11:56:35.000000000 +1030 +@@ -47,7 +47,9 @@ + + #define NAKED __attribute__((naked)) + ++#if defined (COMMANDLINE) + const char __attribute__((section(".rodata"))) cmdline[] = COMMANDLINE; ++#endif + + void NAKED __attribute__((section(".boot"))) boot (u32 r0, u32 r1, u32 r2) + { +@@ -82,6 +84,7 @@ + pv += H_SIZE(pv)*4; + #endif + ++#if defined (COMMANDLINE) + /* Command line */ + H_SIZE(pv) = tag_size(tag_cmdline) + (sizeof (cmdline)+1+3)/4; + H_TAG(pv) = ATAG_CMDLINE; +@@ -91,6 +94,7 @@ + P_CMDLINE(pv)->cmdline[i] = cmdline[i]; + } + pv += H_SIZE(pv)*4; ++#endif + + /* End */ + H_SIZE(pv) = 0; -- cgit v1.2.3 From f62292fb54449418834886f111bf6328dbced1ed Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 01:59:27 +0000 Subject: ixp4xx-kernel: Updated to 2.6.20-rc6, and made the defconfig local to OE. --- packages/linux/ixp4xx-kernel-svnpatch.inc | 4 +- packages/linux/ixp4xx-kernel/2.6.20/.mtn2git_empty | 0 packages/linux/ixp4xx-kernel/2.6.20/defconfig | 1988 ++++++++++++++++++++ packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb | 22 - packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb | 24 + 5 files changed, 2015 insertions(+), 23 deletions(-) create mode 100644 packages/linux/ixp4xx-kernel/2.6.20/.mtn2git_empty create mode 100644 packages/linux/ixp4xx-kernel/2.6.20/defconfig delete mode 100644 packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb create mode 100644 packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc index 992310b5a8..3bad229402 100644 --- a/packages/linux/ixp4xx-kernel-svnpatch.inc +++ b/packages/linux/ixp4xx-kernel-svnpatch.inc @@ -4,7 +4,9 @@ IXP4XX_KERNEL_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/kernel/trunk" do_svnpatch() { svn co ${IXP4XX_KERNEL_SVN_REPO}/patches/${IXP4XX_KERNEL_PATCH_DIR} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} - cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig + if [ ! -f ${WORKDIR}/defconfig ] ; then \ + cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig ; \ + fi rm -rf ${S}/patches cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches cd ${S} && rm -rf .pc && ${STAGING_BINDIR_NATIVE}/quilt push -av diff --git a/packages/linux/ixp4xx-kernel/2.6.20/.mtn2git_empty b/packages/linux/ixp4xx-kernel/2.6.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig new file mode 100644 index 0000000000..255d952cb9 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -0,0 +1,1988 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.20-rc5-git2 +# Wed Jan 24 01:08:16 2007 +# +CONFIG_ARM=y +CONFIG_GENERIC_TIME=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +CONFIG_ARCH_IXP4XX=y +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y + +# +# Intel IXP4xx Implementation Options +# + +# +# IXP4xx Platforms +# +CONFIG_MACH_NSLU2=y +CONFIG_MACH_AVILA=y +CONFIG_MACH_LOFT=y +# CONFIG_ARCH_ADI_COYOTE is not set +CONFIG_ARCH_IXDP425=y +# CONFIG_MACH_IXDPG425 is not set +# CONFIG_MACH_IXDP465 is not set +CONFIG_ARCH_IXCDP1100=y +# CONFIG_ARCH_PRPMC1100 is not set +CONFIG_MACH_NAS100D=y +CONFIG_MACH_DSMG600=y +CONFIG_ARCH_IXDP4XX=y +CONFIG_MACH_FSG=y +# CONFIG_MACH_GTWX5715 is not set + +# +# IXP4xx Options +# +CONFIG_DMABOUNCE=y +# CONFIG_IXP4XX_INDIRECT_PCI is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_BIG_ENDIAN is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_IWMMXT is not set +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y + +# +# Bus support +# +CONFIG_PCI=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +CONFIG_NF_CONNTRACK_ENABLED=m +CONFIG_NF_CONNTRACK_SUPPORT=y +# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set +CONFIG_NF_CONNTRACK=m +# CONFIG_NF_CT_ACCT is not set +# CONFIG_NF_CONNTRACK_MARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_ESP=m +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +# CONFIG_NF_NAT_SNMP_BASIC is not set +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_NF_CONNTRACK_IPV6 is not set +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIBCM203X=m +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y +CONFIG_MTD_REDBOOT_PARTS_READONLY=y +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +CONFIG_NFTL=y +CONFIG_NFTL_RW=y +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +# CONFIG_MTD_CFI_NOSWAP is not set +CONFIG_MTD_CFI_BE_BYTE_SWAP=y +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_IXP4XX=y +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_CAFE is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=4 +CONFIG_BLK_DEV_RAM_SIZE=10240 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +CONFIG_ISCSI_TCP=m +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_SRP is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA=m +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +CONFIG_SATA_VIA=m +# CONFIG_SATA_VITESSE is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +CONFIG_PATA_ARTOP=m +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +CONFIG_PATA_IXP4XX_CF=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +# CONFIG_DM_CRYPT is not set +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_IXP4XX_QMGR=y +CONFIG_IXP4XX_NPE=y +CONFIG_IXP4XX_NPE_FW_LOAD=y +CONFIG_IXP4XX_NPE_FW_MTD=y +CONFIG_IXP4XX_MAC=y +CONFIG_IXP4XX_CRYPTO=m +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Tulip family network device support +# +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_DGRS is not set +# CONFIG_EEPRO100 is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_VIA_RHINE is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +CONFIG_R8169_VLAN=y +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +CONFIG_VIA_VELOCITY=m +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_QLA3XXX is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set +# CONFIG_BCM43XX is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_NET_WIRELESS=y + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_IXP4XX_BEEPER=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +# CONFIG_VT is not set +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_MOXA_SMARTIO_NEW is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set +CONFIG_N_HDLC=m +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=m +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_IXP4XX_WATCHDOG=m + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_IXP4XX=y +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_DRM is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_IOP3XX is not set +CONFIG_I2C_ISA=m +CONFIG_I2C_IXP4XX=y +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +CONFIG_SENSORS_EEPROM=y +CONFIG_SENSORS_PCF8574=m +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y + +# +# Hardware Monitoring support +# +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +CONFIG_SENSORS_W83781D=m +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_AD7418=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_IXP4XX=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_VIVI=m +# CONFIG_VIDEO_BT848 is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +# CONFIG_VIDEO_CX88_BLACKBIRD is not set +# CONFIG_VIDEO_CAFE_CCIC is not set + +# +# V4L USB devices +# +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set +# CONFIG_USB_ET61X251 is not set +CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_ZC0301 is not set +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_USB_DSBR is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_VIDEOBUF=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set + +# +# ALSA ARM devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# HID Devices +# +CONFIG_HID=m + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +# CONFIG_USB_U132_HCD is not set +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +CONFIG_USB_YEALINK=m +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +CONFIG_USB_NET_MCS7830=m +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_MON is not set + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +# CONFIG_USB_SERIAL_KEYSPAN is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +CONFIG_USB_ADUTUX=m +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +# CONFIG_USB_IDMOUSE is not set +CONFIG_USB_FTDI_ELAN=m +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +CONFIG_RTC_DRV_X1205=y +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1553 is not set +CONFIG_RTC_DRV_ISL1208=y +CONFIG_RTC_DRV_DS1672=y +# CONFIG_RTC_DRV_DS1742 is not set +CONFIG_RTC_DRV_PCF8563=y +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_ZISOFS_FS=m +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb deleted file mode 100644 index 6229f87eed..0000000000 --- a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb +++ /dev/null @@ -1,22 +0,0 @@ -# Kernel for IXP4xx -# -# This bitbake file pulls patches and the defconfig straight -# from the NSLU2-Linux SVN repository. Information about this -# repository can be found at: -# http://trac.nslu2-linux.org/kernel/ -# -# The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "674" -# -# The directory containing the patches to be applied is -# specified below -IXP4XX_KERNEL_PATCH_DIR = "2.6.20" -# -# Increment the number below (i.e. the digits after PR) when -# the changes in SVN between revisions include changes in the -# patches applied to the kernel, rather than simply defconfig -# changes -PR = "r1.${IXP4XX_KERNEL_SVN_REV}" - -require ixp4xx-kernel.inc -require ixp4xx-kernel-svnpatch.inc diff --git a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb new file mode 100644 index 0000000000..4310526877 --- /dev/null +++ b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb @@ -0,0 +1,24 @@ +# Kernel for IXP4xx +# +# This bitbake file pulls patches and the defconfig straight +# from the NSLU2-Linux SVN repository. Information about this +# repository can be found at: +# http://trac.nslu2-linux.org/kernel/ +# +# The revision that is pulled from SVN is specified below +IXP4XX_KERNEL_SVN_REV = "679" +# +# The directory containing the patches to be applied is +# specified below +IXP4XX_KERNEL_PATCH_DIR = "2.6.20" +# +# Increment the number below (i.e. the digits after PR) when +# the changes in SVN between revisions include changes in the +# patches applied to the kernel, rather than simply defconfig +# changes +PR = "r1.${IXP4XX_KERNEL_SVN_REV}" + +require ixp4xx-kernel.inc +require ixp4xx-kernel-svnpatch.inc + +SRC_URI += "file://defconfig" -- cgit v1.2.3 From 60f142f4923ed5c780b67ed8ee744df07b1dec06 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 02:35:50 +0000 Subject: arm-kernel-shim: Added configs for nas100d, dsmg600 and fsg3 --- packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb | 17 +++++++++++- packages/arm-kernel-shim/files/config-dsmg600.h | 30 ++++++++++++++++++++++ packages/arm-kernel-shim/files/config-fsg3.h | 30 ++++++++++++++++++++++ packages/arm-kernel-shim/files/config-nas100d.h | 4 +-- 4 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 packages/arm-kernel-shim/files/config-dsmg600.h create mode 100644 packages/arm-kernel-shim/files/config-fsg3.h diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb index 3f5da24991..d75b829509 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb @@ -8,7 +8,10 @@ PR = "r1" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://disable-commandline.patch;patch=1 \ file://config-nslu2.h \ - file://config-nas100d.h" + file://config-nas100d.h \ + file://config-dmsg600.h \ + file://config-fsg3.h" + S = ${WORKDIR}/apex-${PV}/arm-kernel-shim EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" @@ -24,6 +27,16 @@ oe_runmake() { rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" + # DSMG-600 + cp ${WORKDIR}/config-dsmg600.h ${S}/config.h + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dmsg600 + make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dmsg600 || die "oe_runmake failed" + # FSG-3 + cp ${WORKDIR}/config-fsg3.h ${S}/config.h + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 + make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" } do_populate_staging() { @@ -31,4 +44,6 @@ do_populate_staging() { . ${CONFIG_SITE} cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/ } diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h new file mode 100644 index 0000000000..b0f37b3e3b --- /dev/null +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -0,0 +1,30 @@ +/* config.h + + written by Marc Singer + 23 Jun 2006 + + Copyright (C) 2006 Marc Singer + + ----------- + DESCRIPTION + ----------- + +*/ + +#if !defined (__CONFIG_H__) +# define __CONFIG_H__ + +#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ + +#define RAM_BANK0_START 0x00000000 +#define RAM_BANK0_LENGTH 0x04000000 + +//#define RAM_BANK1_START 0xd0000000 +//#define RAM_BANK1_LENGTH 0x10000000 + +//#define COMMANDLINE\ +// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" + +#define MACH_TYPE 964 + +#endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h new file mode 100644 index 0000000000..1222d959c2 --- /dev/null +++ b/packages/arm-kernel-shim/files/config-fsg3.h @@ -0,0 +1,30 @@ +/* config.h + + written by Marc Singer + 23 Jun 2006 + + Copyright (C) 2006 Marc Singer + + ----------- + DESCRIPTION + ----------- + +*/ + +#if !defined (__CONFIG_H__) +# define __CONFIG_H__ + +#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ + +#define RAM_BANK0_START 0x00000000 +#define RAM_BANK0_LENGTH 0x04000000 + +//#define RAM_BANK1_START 0xd0000000 +//#define RAM_BANK1_LENGTH 0x10000000 + +//#define COMMANDLINE\ +// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" + +#define MACH_TYPE 1091 + +#endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 7547061165..5f148a666a 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -17,7 +17,7 @@ #define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ #define RAM_BANK0_START 0x00000000 -#define RAM_BANK0_LENGTH 0x02000000 +#define RAM_BANK0_LENGTH 0x04000000 //#define RAM_BANK1_START 0xd0000000 //#define RAM_BANK1_LENGTH 0x10000000 @@ -25,6 +25,6 @@ //#define COMMANDLINE\ // "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" -#define MACH_TYPE 597 +#define MACH_TYPE 865 #endif /* __CONFIG_H__ */ -- cgit v1.2.3 From fe4b6061921811dfda5b07eed170084d999778a8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 02:38:20 +0000 Subject: arm-kernel-shim: Fixed typo in dsmg600 config --- packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb index d75b829509..532f1ef0f2 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://disable-commandline.patch;patch=1 \ @@ -30,8 +30,8 @@ oe_runmake() { # DSMG-600 cp ${WORKDIR}/config-dsmg600.h ${S}/config.h rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dmsg600 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dmsg600 || die "oe_runmake failed" + oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 + make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" # FSG-3 cp ${WORKDIR}/config-fsg3.h ${S}/config.h rm -f ${S}/main.o -- cgit v1.2.3 From d9f9fdd3cbec024f15d1da209ae01b7cb6f28b4c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 02:39:03 +0000 Subject: arm-kernel-shim: Fixed another typo in dsmg600 config --- packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb index 532f1ef0f2..e994e13814 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://disable-commandline.patch;patch=1 \ file://config-nslu2.h \ file://config-nas100d.h \ - file://config-dmsg600.h \ + file://config-dsmg600.h \ file://config-fsg3.h" S = ${WORKDIR}/apex-${PV}/arm-kernel-shim -- cgit v1.2.3 From b9139c7c8d5c3679b599f47fcfb49cc316ebd51c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 28 Jan 2007 03:28:13 +0000 Subject: arm-kernel-shim: Fixed the NSLU2 machine ID. --- packages/arm-kernel-shim/files/config-nslu2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index e1229edd59..7547061165 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -25,6 +25,6 @@ //#define COMMANDLINE\ // "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" -#define MACH_TYPE 865 +#define MACH_TYPE 597 #endif /* __CONFIG_H__ */ -- cgit v1.2.3 From 6baa6c1f96b3137abdaf5d50af955115844197ae Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 Jan 2007 15:32:12 +0000 Subject: gtk+ 2.6.10 fix order of sed parameters --- packages/gtk+/gtk+_2.6.10.bb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index 9af2dba568..b0eb0dbcdb 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -13,18 +13,18 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ file://automake-lossage.patch;patch=1 \ file://gtk+-handhelds.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://single-click.patch;patch=1 \ - file://menu-styling.patch;patch=1 \ - file://compile-against-newer-glib.patch;patch=1" + file://spinbutton.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://single-click.patch;patch=1 \ + file://menu-styling.patch;patch=1 \ + file://compile-against-newer-glib.patch;patch=1" inherit autotools pkgconfig @@ -57,7 +57,7 @@ LIBV = "2.4.0" do_configure_prepend() { for i in `find . -name "Makefile.am"` do - sed -e -i s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDES, $i + sed -i -e s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDES, $i done } -- cgit v1.2.3