From 1454dd63e49b454d5106c5ea86e23bf17a1d6500 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Sep 2005 11:08:12 +0000 Subject: libmimedir_cvs: fix staging --- packages/libmimedir/libmimedir_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 1d32f65574..bdfef7d58e 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -15,7 +15,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gtk-doc" -headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h" +headers = "mimedir-recurrence.h mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h" do_stage() { install -d ${STAGING_INCDIR}/mimedir-1.0/mimedir -- cgit v1.2.3 From ace191a5c539328be0e8bc94e7d4ac09912d0960 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Sep 2005 11:14:23 +0000 Subject: set default_preference=-1 since it has problems --- packages/ipkg/ipkg_0.99.153.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb index 1898c6656e..f629b85f00 100644 --- a/packages/ipkg/ipkg_0.99.153.bb +++ b/packages/ipkg/ipkg_0.99.153.bb @@ -1 +1,3 @@ +DEFAULT_PREFERENCE=-1 + include ipkg.inc -- cgit v1.2.3 From 5ed5634d5b92df2bc2a4023136b4cbcc2642b97b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Sep 2005 11:15:49 +0000 Subject: conf/distro/preferred-gpe-versions-2.7.inc: update gpe-bluetooth to 0.44 --- conf/distro/preferred-gpe-versions-2.7.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 118dc17302..6e6a07aa58 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -49,7 +49,7 @@ PREFERRED_VERSION_gpe-today ?= "0.09" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-beam ?= "0.2.8" -PREFERRED_VERSION_gpe-bluetooth ?= "0.43" +PREFERRED_VERSION_gpe-bluetooth ?= "0.44" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" PREFERRED_VERSION_gpe-clock ?= "0.21" -- cgit v1.2.3 From f93c784435e67299aecd58dd9eb85b51b52c681d Mon Sep 17 00:00:00 2001 From: Derek Young Date: Fri, 2 Sep 2005 11:16:21 +0000 Subject: ipkg: Add the libdir.patch that keeps getting lost --- packages/ipkg/files/libdir.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/ipkg/files/libdir.patch diff --git a/packages/ipkg/files/libdir.patch b/packages/ipkg/files/libdir.patch new file mode 100644 index 0000000000..38f0b4d286 --- /dev/null +++ b/packages/ipkg/files/libdir.patch @@ -0,0 +1,11 @@ +--- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100 ++++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100 +@@ -36,7 +36,7 @@ + #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" + #define IPKG_PKG_VERSION_SEP_CHAR '_' + +-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg" ++#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg" + #define IPKG_LISTS_DIR_SUFFIX "lists" + #define IPKG_INFO_DIR_SUFFIX "info" + #define IPKG_STATUS_FILE_SUFFIX "status" -- cgit v1.2.3 From 8a6042e13530e98df54ddac99799e191a1768092 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 30 Aug 2005 10:14:46 +0000 Subject: Pin ipkg to 0.99.152 until it's fixed for depends --- conf/machine/nslu2.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 7f56b32282..b17f9a4b3c 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -135,3 +135,6 @@ CVSDATE_ipkg-link ?= "20050713" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" + +PREFERRED_VERSION_ipkg ?= "0.99.152" +PREFERRED_VERSION_ipkg-native ?= "0.99.152" -- cgit v1.2.3 From 93eebe9e41f1d03ead4e7a84de6c20bf5e814ab6 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 18:45:00 +0000 Subject: task-e-x11, e-image: Rename e tasks, fix dependency problems after -core split - task-enlightenment-x11(-core) has been renamed to task-e-x11(-core) - Add PROVIDES since bb can't figure it out from PACKAGES - use DEPENDS instead of DEPENDS_package --- packages/meta/e-image-core.bb | 6 +++--- packages/meta/e-image.bb | 5 +++-- packages/meta/meta-e-x11.bb | 17 +++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb index c7a7630da4..46957d1c53 100644 --- a/packages/meta/e-image-core.bb +++ b/packages/meta/e-image-core.bb @@ -1,11 +1,11 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager" LICENSE = "MIT" -PR = "r0" +PR = "r1" export IMAGE_BASENAME = "e-image-core" export IMAGE_LINGUAS = "" -DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive" +DEPENDS = "task-bootstrap xserver-kdrive task-e-x11-core" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/evas = "evas-x11" @@ -13,6 +13,6 @@ PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" -export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11-core xserver-kdrive-fbdev" +export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev" inherit image_ipk diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index 2183674b6f..a523ff0243 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,7 +1,8 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r2" +PR = "r3" include e-image-core.bb export IMAGE_BASENAME = "e-image" -export IPKG_INSTALL += "task-enlightenment-x11" \ No newline at end of file +export IPKG_INSTALL += "task-e-x11" +DEPENDS += "task-e-x11" \ No newline at end of file diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 47bec68cac..c12afc3d31 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" LICENSE = "MIT" -PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core" -PR = "r5" +PACKAGES = "task-e-x11-core task-e-x11" +PROVIDES = "task-e-x11-core task-e-x11" +PR = "r6" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -11,20 +12,20 @@ ALLOW_EMPTY = 1 # # X # -DEPENDS_task-enlightenment-x11-core += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ +DEPENDS = "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ ttf-bitstream-vera chkhinge" -RDEPENDS_task-enlightenment-x11-core += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ +RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ ttf-bitstream-vera chkhinge" # # E-core # -DEPENDS_task-enlightenment-x11-core += "entrance e-wm" -RDEPENDS_task-enlightenment-x11-core += "entrance e-wm" +DEPENDS += "entrance e-wm" +RDEPENDS_task-e-x11-core += "entrance e-wm" # # E # -DEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire" -RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire" +DEPENDS += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" +RDEPENDS_task-e-x11 += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" -- cgit v1.2.3 From 7bab9963f8c9484d712c729514593df6fbedebe8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 1 Sep 2005 19:34:25 +0000 Subject: zd1211: Updated to new version Supports bigendian arch. Fix install part Add wireless-tools dependency --- packages/zd1211/zd1211_20050822.bb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/zd1211/zd1211_20050822.bb diff --git a/packages/zd1211/zd1211_20050822.bb b/packages/zd1211/zd1211_20050822.bb new file mode 100644 index 0000000000..3b01d8e317 --- /dev/null +++ b/packages/zd1211/zd1211_20050822.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung " +LICENSE = "GPL" +PR = "r0" +DEPENDS = "wireless-tools" + +SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz" + +S = "${WORKDIR}/zd1211" + +inherit module + +#do_compile_prepend() { +# cp -f ${WORKDIR}/Makefile ${S}/ +#} + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net + install -m 0644 ${S}/src/modules-${KERNEL_VERSION}/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net +} + -- cgit v1.2.3 From 2860dd45b20c36df5f7a69a18b32f0c112c7d9ed Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 20:27:29 +0000 Subject: entrance: add edb-native to depends -We can remove this when we update to a newer entrance which uses ecore_config instead of edb_ed --- packages/e17/entrance_20050810.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 09f3de4adc..8a7a08b881 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Entrance is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" +DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" RDEPENDS += "bash keylaunch detect-stylus x11-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin " -- cgit v1.2.3 From 98d1b6dce4628add6d934c4e4aa4d8466728e87a Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 20:32:50 +0000 Subject: mete-e-x11: Remove task-e-x11-core from DEPENDS as it will already be built --- packages/meta/meta-e-x11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index c12afc3d31..449467a10d 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -26,6 +26,6 @@ RDEPENDS_task-e-x11-core += "entrance e-wm" # # E # -DEPENDS += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" +DEPENDS += " entice eclair examine evidence e-modules e-utils elitaire" RDEPENDS_task-e-x11 += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" -- cgit v1.2.3 From 52550314f9f7c5a7c5ff517e734b414178fc4a50 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 20:49:09 +0000 Subject: ecore, evas, imlib2, esmart: Update vitrual and native PROVIDES - Moved all virtual PROVIDES into inc files - Made inc file PROVIDES always += and removed any extra PROVIDES in main files - Made native builds override PROVIDES (native builds should not provide virtual) --- packages/efl/ecore-native_0.9.9.013.bb | 1 + packages/efl/ecore.inc | 4 ++-- packages/efl/esmart.inc | 1 + packages/efl/evas-native_0.9.9.013.bb | 1 + packages/efl/evas-x11_0.9.9.013.bb | 1 - packages/efl/evas.inc | 2 +- packages/efl/imlib2-fb_1.2.1.004.bb | 1 - packages/efl/imlib2-native_1.2.1.004.bb | 1 + packages/efl/imlib2-x11_1.2.1.004.bb | 1 - packages/efl/imlib2.inc | 1 + 10 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb index abfb41d63b..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ b/packages/efl/ecore-native_0.9.9.013.bb @@ -3,3 +3,4 @@ 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.inc b/packages/efl/ecore.inc index ccc88b10c3..441d780a47 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -4,8 +4,8 @@ timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" LICENSE = "MIT" # can also have openssl, dbus -DEPENDS = "virtual/evas curl eet" -PROVIDES = "virtual/ecore" +DEPENDS += "virtual/evas curl eet" +PROVIDES += "virtual/ecore" inherit efl diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index 452222e93b..f4a5191462 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -1,6 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool" +PROVIDES += "virtual/esmart" inherit efl diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb index fd94b48ef2..60bf7f6ae5 100644 --- a/packages/efl/evas-native_0.9.9.013.bb +++ b/packages/efl/evas-native_0.9.9.013.bb @@ -1,3 +1,4 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" \ No newline at end of file diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb index 901a23d2a8..8e51a2a873 100644 --- a/packages/efl/evas-x11_0.9.9.013.bb +++ b/packages/efl/evas-x11_0.9.9.013.bb @@ -1,5 +1,4 @@ include evas.inc -PROVIDES += "virtual/evas" DEPENDS += "x11 xext" PR = "r3" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 5876c1fd4e..521ecb9912 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -5,7 +5,7 @@ your CPU or graphics hardware are too slow." LICENSE = "MIT" # can also depend on valgrind (?) DEPENDS = "freetype libpng jpeg eet edb" -PROVIDES = "virtual/evas" +PROVIDES += "virtual/evas" inherit efl diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb index fdf9b17afc..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.004.bb +++ b/packages/efl/imlib2-fb_1.2.1.004.bb @@ -1,5 +1,4 @@ include imlib2.inc -PROVIDES += "virtual/imlib2" EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb index e3a46c4aba..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.004.bb +++ b/packages/efl/imlib2-native_1.2.1.004.bb @@ -1,5 +1,6 @@ include imlib2.inc inherit native +PROVIDES = "imlib2-native" DEPENDS = "freetype-native libpng-native jpeg-native" EXTRA_OECONF = "--disable-mmx \ diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb index 383473e589..165321355c 100644 --- a/packages/efl/imlib2-x11_1.2.1.004.bb +++ b/packages/efl/imlib2-x11_1.2.1.004.bb @@ -1,5 +1,4 @@ include imlib2.inc -PROVIDES += "virtual/imlib2" DEPENDS += "x11 xext" EXTRA_OECONF = "--disable-mmx \ diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index a6982e21c7..4691bf2ce0 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -2,6 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg" +PROVIDES += "virtual/imlib2" inherit efl -- cgit v1.2.3 From e2cd89b113b057dfa997f438b8e228e181d0dab1 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 21:24:32 +0000 Subject: entice: change esmart dependency to esmart-x11 --- packages/e17/entice_20050810.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb index 094944ead4..364e65cbbf 100644 --- a/packages/e17/entice_20050810.bb +++ b/packages/e17/entice_20050810.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Entice is the E17 picture viewer" SECTION = "e/apps" # can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin " -- cgit v1.2.3 From 832d1100440065b8e3267faf44216917ca604b43 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 21:25:09 +0000 Subject: e-modules: change DEPENDS to use -x11 instead of virtual as they are part of the WM and need X11 --- packages/e17/e-modules_20050810.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb index c019c441e1..9ab3330c97 100644 --- a/packages/e17/e-modules_20050810.bb +++ b/packages/e17/e-modules_20050810.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Enlightenment Window Manager Extra Modules" -DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet e" +DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " -- cgit v1.2.3 From 9e55889203fda8c56e2ed5516849ed64b6b57fcd Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 21:27:14 +0000 Subject: openzaurus-3.5.4: no need for preferred-e-versions currently --- conf/distro/openzaurus-3.5.4.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index e35f997529..7b83dae13b 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -53,5 +53,5 @@ include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc +#include conf/distro/preferred-e-versions.inc -- cgit v1.2.3 From f62bcb687b55dd044efdd5c489be06c7adcf0996 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 21:35:00 +0000 Subject: elitaire: change esmart to esmart-x11 --- packages/elitaire/elitaire_0.0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elitaire/elitaire_0.0.4.bb b/packages/elitaire/elitaire_0.0.4.bb index 220b6ace16..5891fba9ae 100644 --- a/packages/elitaire/elitaire_0.0.4.bb +++ b/packages/elitaire/elitaire_0.0.4.bb @@ -1,5 +1,5 @@ DESCRIPTION = "EFL-based solitaire" -DEPENDS = "evas-x11 ecore-x11 edje esmart ewl" +DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " -- cgit v1.2.3 From e22b40e0fef7e2f645282058937453b839aac113 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 1 Sep 2005 21:39:07 +0000 Subject: esmart: fix typo in package name --- packages/efl/esmart.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index 452222e93b..4e09f1461a 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -40,4 +40,4 @@ DEPENDS_libesmart-container += "libesmart-container-plugins" FILES_libesmart-container-plugins = "${libdir}/esmart/layout/*.so" FILES_libesmart-file-dialog = "${libdir}/libesmart_file_dialog*.so*" FILES_libesmart-draggies = "${libdir}/libesmart_draggies*.so*" -FILES_libesarmt-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" +FILES_libesmart-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" -- cgit v1.2.3 From 5638e03ebf55374a57a9996c2289001d79803f55 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 21:43:11 +0000 Subject: meta-e-x11: break task-e-x11-core out into its own file so that e-image-core builds don't have to build all the extra stuff --- packages/meta/meta-e-x11-core.bb | 24 ++++++++++++++++++++++++ packages/meta/meta-e-x11.bb | 26 ++++---------------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 packages/meta/meta-e-x11-core.bb diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb new file mode 100644 index 0000000000..594e5b3f62 --- /dev/null +++ b/packages/meta/meta-e-x11-core.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Meta-package for Enlightenment/X11 Core" +PACKAGES = "task-e-x11-core" +PROVIDES = "task-e-x11-core" +PR = "r6" + +FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ + e##http://openzaurus.org/official/unstable/3.5.2/feed/e" + +ALLOW_EMPTY = 1 + +# +# X +# +DEPENDS = "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ + ttf-bitstream-vera chkhinge" +RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera chkhinge" + +# +# E-core +# +DEPENDS += "entrance e-wm" +RDEPENDS_task-e-x11-core += "entrance e-wm" + diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 449467a10d..f0ed8b446c 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" -LICENSE = "MIT" -PACKAGES = "task-e-x11-core task-e-x11" -PROVIDES = "task-e-x11-core task-e-x11" +PACKAGES = "task-e-x11" +PROVIDES = "task-e-x11" PR = "r6" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ @@ -9,23 +8,6 @@ FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ ALLOW_EMPTY = 1 -# -# X -# -DEPENDS = "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera chkhinge" -RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" - -# -# E-core -# -DEPENDS += "entrance e-wm" -RDEPENDS_task-e-x11-core += "entrance e-wm" - -# -# E -# -DEPENDS += " entice eclair examine evidence e-modules e-utils elitaire" -RDEPENDS_task-e-x11 += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" +DEPENDS = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" +RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" -- cgit v1.2.3 From 5116ef7f43fe9d2969ee2d210d8d0c9075e41686 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 1 Sep 2005 22:45:20 +0000 Subject: linux-oz-2.6: Add 2.6.13-mm1 as a new development branch (for now). Several patches merged with mainline, others needed updates. Also some pm changes to add fatal battery and batter cover interrupt functionality. --- .../linux-openzaurus-2.6.13-mm1/.mtn2git_empty | 0 .../add-elpp-stuff.patch | 26985 +++++++++++++++++++ .../add-oz-release-string.patch | 24 + .../connectplus-remove-ide-HACK.patch | 12 + .../linux-openzaurus-2.6.13-mm1/defconfig-c7x0 | 1548 ++ .../linux-openzaurus-2.6.13-mm1/defconfig-collie | 821 + .../defconfig-ipaq-pxa-2.6 | 891 + .../linux-openzaurus-2.6.13-mm1/defconfig-poodle | 933 + .../linux-openzaurus-2.6.13-mm1/defconfig-spitz | 1423 + .../linux-openzaurus-2.6.13-mm1/defconfig-tosa | 1546 ++ .../dtl1_cs-add-socket-revE.patch | 40 + .../pxa-serial-hack.patch | 82 + packages/linux/linux-openzaurus_2.6.13-mm1.bb | 221 + 13 files changed, 34526 insertions(+) create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0 create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6 create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch create mode 100644 packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch create mode 100644 packages/linux/linux-openzaurus_2.6.13-mm1.bb diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch new file mode 100644 index 0000000000..04ab185f4f --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch @@ -0,0 +1,26985 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- /dev/null ++++ linux-2.6.12/Documentation/fb/elpp.txt +@@ -0,0 +1,181 @@ ++ ++ ELPP, The Enhanced Linux Progress Patch v1.0 ++ -------------------------------------------- ++ ++CONTENTS ++0. ChangeLog. ++1. What is ELPP. ++2. Who needs it. ++3. Requirements. ++4. How to use it. ++5. Uninstalling. ++6. Creating Themes. ++7. Sample Bootloader entries. ++ ++ ++0. The following is the summary of changes from ELPP-v0.1 ++ -> New format for themes ++ -> Fixes ++ -> Reserving part of palette for ELPP colors ++ ++ ++1. What is ELPP? ++ Hides the bootup messages and shows a fancy logo at boot. It ++can however show a configurable number of messages while at the same ++time showing the logo and a progress bar. The success, failure and ++the warning messages of the initscripts can also be shown here. ++ ++ ++2. Who needs it? ++ A few rare people who are not interested in the messages shown when ++booting. (like the friend of Cajus Pollmeier, The author of the original ++Linux Progress Patch). A few of my friends use it but I dont. ++ ++ ++3. Requirements: ++ Requires a vesa capable machine. Linux 2.6 or later are supported. ++If you are looking for patch for 2.4, you can have a look at the Linux ++Progress Patch at "http://freshmeat.net/projects/lpp/". You ++might also be interested in the bootsplash ++ ++ ++4. How to use it? ++ -> Download a fresh 2.6 kernel from http://www.kernel.org/ ++ -> Download the patch from http://elpp.foofighter.de/ ++ -> Apply the patch... ++ cd linux-2.6.XX ++ bzip2 -cd /path/to/patch/elpp-1.0-2.6.XX.bz2 | patch -p1 ++ -> Configure and compile the Kernel ++ ++ make xconfig (or menuconfig etc.); ++ ++ and then enable the following ++ ++ File systems ++ -> Pseudo filesystems ++ -> /proc file system ++ ++ Device Drivers ++ -> Block Devices ++ -> RAM disk support (and INITRD support too) ++ ++ Device Drivers ++ -> Graphics Support ++ -> Support for FrameBuffer devices ++ -> Enhanced Linux Progress Patch ++ ++ Device Drivers ++ -> Graphics Support ++ -> Console Display Driver Support ++ -> Framebuffer Console support ++ ++ and select atleast one driver (VESA Preffered) for FB under ++ DeviceDrivers -> Graphics Support -> Support for FrameBuffer Devices. ++ ++ After finishing with the configuration, you need to do a ++ make bzImage, make modules, make modules_install and a make install ++ to install the new kernel. ++ ++ -> Configure your boot loader. ++ ++ Based on your hardware you need to select a vesa mode. Check ++ linux-2.6.XX/Documentation/fb/vesafb.txt for more information. ++ passing vga=0x301 would in most cases be sufficient. However ++ higher resolutions are also supported. ++ ++ To display the display of messages, you need to pass the ++ arguments "console=/dev/tty2 CONSOLE=/dev/tty2" to the kernel. ++ ++ Please refer to the sample LILO and GRUB entries at the bottom. ++ ++ -> Change the initscripts. ++ Changing the init scripts would do the job of passing messages ++ and progress to the kernel. Take a look at the distributed ++ files etc/rc and etc/init.d/functions for the modifications. ++ ++ Hint: Search for the word progress and the matches would ++ reveal the changes done. ++ ++ In case of RedHat9 The distributed initscripts can directly be used. ++ ++ Here's what the modifications mean... ++ 1. If you echo a string "10 Hello world" into /proc/progress ++ the initial number is taken as progress and the other ++ part of the string forms the message to be displayed. ++ ++ 2. If the message starts with a '=' it indicates the ++ success/failure of the previous message. ++ =s is for success. ++ =f is for failure. ++ =w is for warning. ++ ++ 3. If the message starts with a '!' its a command. ++ !c to clear the previous messages. ++ !s to enable/disable the progress bar. ++ ++ ++5. Uninstalling: ++ For uninstalling ELPP you can install your backup kernel and ++for the initscripts you may need to reinstall the package that provides ++them. ++ ++ ++6. Creating Themes: ++ Themes for ELPP-v1.0 are in the form of initrd files. The ++application which is also distributed along with this patch can be used ++for creating themes. ++ For creating themes using the application, load an image into ++the application and select the locations/colors for the progress bar ++and messages to appear. For distortion free boot-screen use images ++with not more than 200 colors. For this you can use the GNU image ++manipulation program (GIMP). The steps involved are as below: ++ ++ -> Open your favorite image in GIMP. ++ -> In the context menu... go to Image->Mode->Indexed ++ -> In the dialog that pops up, se the colors to 200. ++ -> Save the image in PNG (avoid gif please) ++ ++once you create the theme, save it and you get a file with .eti extension. ++You can either use this file directly as your initrd or append this ++to your initrd. ie., cat IMG_NAME.eti >> /boot/initrd... See your ++bootloaders documentation for further information on using initrd. ++ ++Note: The size of the theme image will be equal to the size of the input ++ image. Please ensure that the size of image is according to the ++ entry in BootLoader... If the resolution of theme is greater than ++ that of the screen, the system would not crash but the behaviour of ++ the boot screen is not assured. However, when a smaller image is ++ given... it is centered to the screen. ++ ++Note2: If no themes are loaded using the INITRD, the default inbuilt theme ++ is shown. ++ ++7. Sample Boot Loader entries: ++ The following examples demonstrate using a theme from file smile.eti ++on a 640x480 resolution. For more details on the FB modes refer to the Linux ++kernel documentation... Documentation/fb/vesa.txt in the kernel source tree. ++The following the summary of modes: ++ ++ | 640x480 800x600 1024x768 1280x1024 ++ ----+------------------------------------- ++ 256 | 0x301 0x303 0x305 0x307 ++ 32k | 0x310 0x313 0x316 0x319 ++ 64k | 0x311 0x314 0x317 0x31A ++ 16M | 0x312 0x315 0x318 0x31B ++ ++ ++ -> In lilo its done as.. ++ image=/boot/vmlinux-2.6.XX ++ label=Linux-ELPP ++ vga=0x301 ++ append="console=/dev/tty2 CONSOLE=/dev/tty2" ++ initrd=/boot/smile.eti ++ ++ ->In grub its just ++ kernel /boot/vmlinux vga=0x301 console=/dev/tty2 CONSOLE=/dev/tty2 ++ initrd /boot/initrd-2.6.XX ++ ++ ++ ----------------------------------------- ++ Comments, queries and changes welcome at: ++ Matthias Kunze +--- linux-2.6.12/drivers/video/Kconfig~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/Kconfig +@@ -108,6 +108,11 @@ + This is particularly important to one driver, matroxfb. If + unsure, say N. + ++config FB_ELPP ++ bool "Enhanced Linux Progress Patch" ++ depends on FB && PROC_FS ++ default y ++ + config FB_CIRRUS + tristate "Cirrus Logic support" + depends on FB && (ZORRO || PCI) +--- linux-2.6.12/drivers/video/console/Makefile~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/console/Makefile +@@ -31,6 +31,8 @@ + obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o + endif + ++obj-$(CONFIG_FB_ELPP) += elpp.o symbols_16x16.o ++ + obj-$(CONFIG_FB_STI) += sticore.o font.o + + # Targets that kbuild needs to know about +--- /dev/null ++++ linux-2.6.12/drivers/video/console/elpp.c +@@ -0,0 +1,685 @@ ++ ++/* ++ * The Enhanced Linux Progress Patch ++ * by Prasad , IIIT - Hyderabad, INDIA ++ * ++ * drivers/video/console/elpp.c ELPP implementation file ++ * ++ * This file is part of the Enhanced Linux Progress Patch. ++ * ++ * ELPP is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * Foobar is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with ELPP; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define MAX_MSG_LENGTH 100 ++ ++struct elpp_messages { ++ char text[MAX_MSG_LENGTH]; ++ short success; ++ short flag; ++}; ++ ++extern const struct linux_logo logo_linux_elpp; ++ ++struct elpp_prefs backup_prefs = { ++ .bar_x = 275, ++ .bar_y = 300, ++ .bar_length = 365, ++ .bar_width = 10, ++ .msg_length = 45, ++ .num_messages = 7, ++ .msg_x = 275, ++ .msg_y = 185, ++ .bar_bg = {0x00,0x00,0xff}, ++ .bar_fg = {0xff,0x00,0x00}, ++ .warning_bg = {0x00,0x00,0x00}, ++ .warning_fg = {0xff,0xff,0xff}, ++ .error_bg = {0x00,0x00,0x00}, ++ .error_fg = {0xff,0xff,0xff}, ++ .success_bg = {0x00,0x00,0x00}, ++ .success_fg = {0xff,0xff,0xff}, ++ .warning_symbol_bg = {0x00,0x00,0x00}, ++ .warning_symbol_fg = {0xff,0xff,0x00}, ++ .error_symbol_bg = {0x00,0x00,0x00}, ++ .error_symbol_fg = {0xff,0x00,0x00}, ++ .success_symbol_bg = {0x00,0x00,0x00}, ++ .success_symbol_fg = {0x00,0xff,0x00} ++}; ++ ++struct elpp_struct elpp = {NULL,0,1,0,0,NULL,NULL,NULL, ++ NULL,NULL,NULL,0,0,0,0,0}; ++ ++static u16 translated_bar_x, translated_bar_y; ++static u16 translated_msg_x, translated_msg_y; ++ ++#define BAR_X translated_bar_x ++#define BAR_Y translated_bar_y ++#define BAR_WIDTH elpp.prefs->bar_length ++#define BAR_HEIGHT elpp.prefs->bar_width ++#define MSG_LENGTH elpp.prefs->msg_length ++#define NUM_MSGS elpp.prefs->num_messages ++#define MSG_X translated_msg_x ++#define MSG_Y translated_msg_y ++#define BAR_BG elpp.prefs->bar_bg ++#define BAR_FG elpp.prefs->bar_fg ++#define WRN_BG elpp.prefs->warning_bg ++#define WRN_FG elpp.prefs->warning_fg ++#define WRN_SYM_BG elpp.prefs->warning_symbol_bg ++#define WRN_SYM_FG elpp.prefs->warning_symbol_fg ++#define ERR_BG elpp.prefs->error_bg ++#define ERR_FG elpp.prefs->error_fg ++#define ERR_SYM_BG elpp.prefs->error_symbol_bg ++#define ERR_SYM_FG elpp.prefs->error_symbol_fg ++#define SUC_BG elpp.prefs->success_bg ++#define SUC_FG elpp.prefs->success_fg ++#define SUC_SYM_BG elpp.prefs->success_symbol_bg ++#define SUC_SYM_FG elpp.prefs->success_symbol_fg ++ ++#define MSG_CUR \ ++ elpp.messages[(elpp.msg_position + NUM_MSGS ) % NUM_MSGS] ++#define MSG_PREV \ ++ elpp.messages[(elpp.msg_position + NUM_MSGS - 1) % NUM_MSGS] ++#define MSG_NEXT \ ++ elpp.messages[(elpp.msg_position + 1) % NUM_MSGS] ++#define COLOR(x) (elpp.colors_base + x) ++ ++static const unsigned char colors[14][3]; ++ ++enum ELPP_COLORS { eBAR_FG, eBAR_BG, ++ eSUC_FG, eSUC_BG, eSUC_SYM_FG, eSUC_SYM_BG, ++ eWRN_FG, eWRN_BG, eWRN_SYM_FG, eWRN_SYM_BG, ++ eERR_FG, eERR_BG, eERR_SYM_FG, eERR_SYM_BG }; ++ ++enum ELPP_STATUS { eSUCCESS=1, eWARNING, eFAILURE }; ++ ++/* ASCII to Integer... needed for progress */ ++static int elpp_atoi(const char *name) ++{ ++ int val = 0; ++ ++ for (;; name++) { ++ switch (*name) { ++ case '0'...'9': ++ val = 10*val+(*name-'0'); ++ break; ++ default: ++ return val; ++ } ++ } ++} ++ ++/* Parse the message passed from userspace */ ++static int elpp_parse(const char *str) ++{ ++ int progress = -1, success = 0; ++ char *msg_text; ++ ++ if( str[0] == '!' ) { ++ ++ /* Its a command... */ ++ if( str[1] == 'c' ) { ++ ++ int i; ++ for(i=0; i 100)? 100: progress; ++ return progress; ++} ++ ++/* Based on accel_putc in fbcon.c */ ++static void elpp_render_char(struct font_desc *font, ++ int ch, int xx, int yy, int fgcol, int bgcol) ++{ ++ struct fb_image image; ++ unsigned short charmask = 0xff; ++ unsigned int scan_align = elpp.info->pixmap.scan_align - 1; ++ unsigned int buf_align = elpp.info->pixmap.buf_align - 1; ++ unsigned int size, pitch; ++ unsigned int width = (font->width + 7) >> 3; ++ u8 *src, *dst; ++ ++ image.dx = xx; ++ image.dy = yy; ++ image.width = font->width; ++ image.height = font->height; ++ image.fg_color = fgcol; ++ image.bg_color = bgcol; ++ image.depth = 1; ++ ++ pitch = width + scan_align; ++ pitch &= ~scan_align; ++ size = pitch * font->height; ++ size += buf_align; ++ size &= ~buf_align; ++ dst = fb_get_buffer_offset(elpp.info, &(elpp.info->pixmap), size); ++ image.data = dst; ++ src = font->data + (ch & charmask) * font->height * width; ++ ++ fb_pad_aligned_buffer(dst, pitch, src, width, image.height); ++ elpp.info->fbops->fb_imageblit(elpp.info, &image); ++} ++ ++/* Show the messages */ ++static void elpp_show_messages(void) ++{ ++ struct font_desc *font = get_default_font(elpp.info->var.xres, ++ elpp.info->var.yres); ++ struct font_desc *icons = &symbols_16x16; ++ int i,counter=0; ++ struct fb_fillrect rect; ++ ++ rect.dy = MSG_Y; ++ rect.dx = MSG_X; ++ rect.width = MSG_LENGTH * font->width; ++ rect.height = font->height * NUM_MSGS; ++ rect.rop = 0; ++ rect.color = COLOR(eSUC_BG); ++ elpp.info->fbops->fb_fillrect(elpp.info, &rect); ++ ++ i = elpp.msg_position ? elpp.msg_position - 1 : NUM_MSGS - 1; ++ ++ for(counter = 0; counter < NUM_MSGS; i = i ? i-1 : NUM_MSGS-1, counter++){ ++ ++ int j; ++ int textbg,textfg,iconbg,iconfg; ++ ++ rect.dy = MSG_Y + font->height * (NUM_MSGS-counter-1); ++ rect.height = font->height; ++ ++ /* Set the background for text */ ++ switch(elpp.messages[i].success) { ++ default: ++ case eSUCCESS: ++ rect.color = COLOR(eSUC_BG); ++ textbg = COLOR(eSUC_BG); ++ textfg = COLOR(eSUC_FG); ++ iconbg = COLOR(eSUC_SYM_BG); ++ iconfg = COLOR(eSUC_SYM_FG); ++ break; ++ case eWARNING: ++ rect.color = COLOR(eWRN_BG); ++ textbg = COLOR(eWRN_BG); ++ textfg = COLOR(eWRN_FG); ++ iconbg = COLOR(eWRN_SYM_BG); ++ iconfg = COLOR(eWRN_SYM_FG); ++ break; ++ case eFAILURE: ++ rect.color = COLOR(eERR_BG); ++ textbg = COLOR(eERR_BG); ++ textfg = COLOR(eERR_FG); ++ iconbg = COLOR(eERR_SYM_BG); ++ iconfg = COLOR(eERR_SYM_FG); ++ break; ++ } ++ elpp.info->fbops->fb_fillrect(elpp.info, &rect); ++ ++ if(elpp.messages[i].flag == 0) ++ break; ++ ++ /* Show the text now */ ++ for( j = 0; j < strlen(elpp.messages[i].text); j++ ) { ++ elpp_render_char( font, elpp.messages[i].text[j], ++ MSG_X + font->width * j, ++ MSG_Y + font->height * (NUM_MSGS-counter-1), textfg, textbg ); ++ } ++ ++ /* Show the bitmap for success/failure/warning */ ++ if(elpp.messages[i].success != 0) { ++ elpp_render_char( icons, (elpp.messages[i].success - 1) * 2, ++ MSG_X + (font->width * (MSG_LENGTH - 3)), ++ MSG_Y + font->height * (NUM_MSGS - counter - 1), ++ iconfg, iconbg ); ++ elpp_render_char( icons, (elpp.messages[i].success - 1) * 2 + 1, ++ MSG_X + (font->width * (MSG_LENGTH - 2)), ++ MSG_Y + font->height * (NUM_MSGS - counter - 1), ++ iconfg, iconbg ); ++ } ++ } ++} ++ ++/* Update the contents on the screen */ ++static void elpp_show_progress(int progress) ++{ ++ struct fb_fillrect rect; ++ ++ /* Draw the BG of progress Bar */ ++ rect.dx = BAR_X; ++ rect.dy = BAR_Y; ++ rect.height = BAR_HEIGHT; ++ rect.width = BAR_WIDTH; ++ rect.color = COLOR(eBAR_BG); ++ rect.rop = 0; ++ elpp.info->fbops->fb_fillrect(elpp.info, &rect); ++ ++ /* Draw the progress */ ++ rect.dx = BAR_X; ++ rect.dy = BAR_Y + 1; ++ rect.width = (progress * BAR_WIDTH)/100; ++ rect.height = BAR_HEIGHT - 2; ++ rect.color = COLOR(eBAR_FG); ++ elpp.info->fbops->fb_fillrect(elpp.info, &rect); ++ ++} ++ ++/* Function that can be called from other parts of kernel */ ++void elpp_progress(char *str) ++{ ++ int progress; ++ ++ progress = elpp_parse(str); ++ if( progress > 0 ) { ++ elpp_show_progress(progress); ++ elpp_show_messages(); ++ } ++} ++ ++/* Something written into /proc/progress */ ++static ssize_t elpp_proc_write(struct file *file, const char *buf, ++ size_t length, loff_t *offset) ++{ ++ int progress; ++ char tmp_string[MSG_LENGTH]; ++ int len = length < MSG_LENGTH ? length : MSG_LENGTH; ++ ++ /* If disabled do not process input */ ++ if( elpp.disable == 1 ) ++ return length; ++ ++ copy_from_user(tmp_string,buf, len ); ++ tmp_string[len-1] = '\0'; ++ progress = elpp_parse(tmp_string); ++ if( progress > 0 ) { ++ elpp_show_progress(progress); ++ elpp_show_messages(); ++ } ++ ++ /* We have read the entire string */ ++ return length; ++} ++ ++/* /proc/progress access permissions */ ++int elpp_permissions(struct inode *inode, int op, struct nameidata *dummy) ++{ ++ /* W for root */ ++ if ( op == 2 && current->euid == 0 ) ++ return 0; ++ return -EACCES; ++} ++ ++/* Create proc entry */ ++static struct file_operations elpp_file_operations = { ++ .owner = THIS_MODULE, ++ .write = elpp_proc_write ++}; ++ ++static struct inode_operations elpp_inode_operations = { ++ .lookup = &elpp_file_operations, ++ .permission = elpp_permissions ++}; ++ ++/* Registers an entry in the /proc directory */ ++void __init elpp_register(void) ++{ ++ elpp.proc_progress_entry = create_proc_entry("progress", ++ S_IFREG | S_IRUGO | S_IWUSR, &proc_root ); ++ if( elpp.proc_progress_entry == NULL ) ++ { ++ printk("[ELPP] Unable to create proc entry.\n"); ++ return; ++ } ++ ++ elpp.proc_progress_entry->owner = THIS_MODULE; ++ elpp.proc_progress_entry->proc_iops = &elpp_inode_operations; ++ elpp.proc_progress_entry->write_proc = elpp_proc_write; ++} ++ ++static inline unsigned safe_shift(unsigned d, int n) ++{ ++ return n < 0 ? d >> -n : d << n; ++} ++ ++/* Based on fb_set_logocmap() */ ++static void __init elpp_set_cmap(void) ++{ ++ struct fb_cmap palette_cmap; ++ u16 palette_green[14]; ++ u16 palette_blue[14]; ++ u16 palette_red[14]; ++ int i; ++ ++ palette_cmap.len = 14; ++ palette_cmap.red = palette_red; ++ palette_cmap.green = palette_green; ++ palette_cmap.blue = palette_blue; ++ palette_cmap.transp = NULL; ++ palette_cmap.start = 235; ++ for (i = 0; i < 14; ++i) { ++ palette_cmap.red[i] = colors[i][0] << 8 | colors[i][0]; ++ palette_cmap.green[i] = colors[i][1] << 8 | colors[i][1]; ++ palette_cmap.blue[i] = colors[i][2] << 8 | colors[i][2]; ++ } ++ fb_set_cmap(&palette_cmap, elpp.info); ++ ++ elpp.colors_base = 235; ++} ++ ++/* Based on fb_set_logo_truepalette() */ ++static void __init elpp_set_truepalette(void) ++{ ++ unsigned char mask[9] = { 0,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff }; ++ struct fb_info *info = elpp.info; ++ unsigned char redmask, greenmask, bluemask; ++ int redshift, greenshift, blueshift; ++ int i; ++ ++ /* ++ * We have to create a temporary palette since console palette is only ++ * 16 colors long. ++ */ ++ /* Bug: Doesn't obey msb_right ... (who needs that?) */ ++ redmask = mask[info->var.red.length < 8 ? info->var.red.length : 8]; ++ greenmask = mask[info->var.green.length < 8 ? info->var.green.length : 8]; ++ bluemask = mask[info->var.blue.length < 8 ? info->var.blue.length : 8]; ++ redshift = info->var.red.offset - (8 - info->var.red.length); ++ greenshift = info->var.green.offset - (8 - info->var.green.length); ++ blueshift = info->var.blue.offset - (8 - info->var.blue.length); ++ ++ for ( i = 0; i < 14; i++) { ++ elpp.palette[i+32] = (safe_shift((colors[i][0] & redmask), redshift) | ++ safe_shift((colors[i][1] & greenmask), greenshift) | ++ safe_shift((colors[i][2] & bluemask), blueshift)); ++ } ++ ++ elpp.colors_base = 32; ++} ++ ++/* Based on fb_set_logo_directpalette() */ ++static void __init elpp_set_directpalette(void) ++{ ++ struct fb_info *info = elpp.info; ++ int redshift, greenshift, blueshift; ++ int i; ++ ++ redshift = info->var.red.offset; ++ greenshift = info->var.green.offset; ++ blueshift = info->var.blue.offset; ++ ++ for (i = 32; i < 46; i++) ++ elpp.palette[i] = i << redshift | i << greenshift | i << blueshift; ++ ++ elpp.colors_base = 32; ++} ++ ++void __init elpp_find_initrd_theme(void) ++{ ++ unsigned long i, j, k, theme_complete=0; ++ int imgW, imgH, img_size, clut_size; ++ ++ printk("[ELPP] Searching for initrd_theme preferences... "); ++#ifdef BLK_DEV_INITRD ++ if( ! initrd_start ) ++ goto find_initrd_theme_end; ++ for(i = initrd_start; i < initrd_end - sizeof(struct elpp_prefs); i++){ ++ if(strncmp((char *)i,"ELPP-THEME-START",16) == 0) { ++ printk("Found at 0x%08lx\n", i); ++ elpp.prefs = vmalloc(sizeof(struct elpp_prefs)); ++ memcpy(elpp.prefs, (void*)(i+16), sizeof(struct elpp_prefs)); ++ ++ printk("[ELPP] Searching for initrd_theme image... "); ++ for(j = i; j < initrd_end; j++) { ++ if(strncmp((char *)j,"ELPP-START-IMAGE",16) == 0) { ++ printk("Found at 0x%08lx\n", j); ++ elpp.logo = vmalloc(sizeof(struct linux_logo)); ++ memcpy(elpp.logo, (void*)(j+16), sizeof(struct linux_logo)); ++ elpp.logo->clut = NULL; ++ elpp.logo->data = NULL; ++ imgW = elpp.logo->width; ++ imgH = elpp.logo->height; ++ img_size = imgW * imgH * sizeof(char); ++ clut_size = elpp.logo->clutsize * 3 * sizeof(char); ++ printk("[ELPP] Image: (%d,%d), %d colors\n", ++ imgW, imgH, elpp.logo->clutsize); ++ ++ for(k = j+sizeof(struct linux_logo); k < initrd_end; k++){ ++ if(strncmp((char *)k, "ELPP-START-IMAGE-DATA",21) == 0){ ++ elpp.logo->data = vmalloc(img_size); ++ memcpy((void *)elpp.logo->data, ++ (void*)(k+21), img_size); ++ k+=img_size; ++ } ++ if(strncmp((char *)k, "ELPP-START-IMAGE-CLUT",21) == 0){ ++ elpp.logo->clut = vmalloc(clut_size); ++ memcpy((void*)elpp.logo->clut, ++ (void*)(k+21), clut_size); ++ k+=clut_size; ++ } ++ if(strncmp((char *)k, "ELPP-THEME-END", 14) == 0) { ++ theme_complete = 1; ++ goto find_initrd_theme_end; ++ } ++ } ++ goto find_initrd_theme_end; ++ } ++ } ++ goto find_initrd_theme_end; ++ } ++ } ++#endif ++find_initrd_theme_end: ++ if(theme_complete != 1) { ++ printk("Not found or Incomplete\n"); ++ printk("[ELPP] Disabling the Progress Patch\n"); ++ if(elpp.logo && elpp.logo->data) ++ vfree((void *)elpp.logo->data); ++ if(elpp.logo && elpp.logo->clut) ++ vfree((void *)elpp.logo->clut); ++ if(elpp.logo) ++ vfree(elpp.logo); ++ ++ elpp.logo = (struct linux_logo*)(&logo_linux_elpp); ++ elpp.prefs = &backup_prefs; ++ } ++} ++ ++u16 __init elpp_translate_x(u16 x) ++{ ++ if(elpp.logo->width < elpp.info->var.xres) ++ return (x + ((elpp.info->var.xres - elpp.logo->width)/2)); ++ else ++ return x; ++} ++ ++u16 __init elpp_translate_y(u16 y) ++{ ++ if(elpp.logo->height < elpp.info->var.yres) ++ return (y + ((elpp.info->var.yres - elpp.logo->height)/2)); ++ else ++ return y; ++} ++ ++/* Initialize ELPP */ ++int __init elpp_init(void) ++{ ++ extern signed char con2fb_map[MAX_NR_CONSOLES]; ++ struct fb_info *info; ++ ++ /* Are we using the FB */ ++ if(num_registered_fb == 0) { ++ printk("[ELPP] There is no registered frame buffer\n"); ++ goto error_return; ++ } ++ ++ /* Which console am I using for showing the ProgressBar */ ++ elpp.console = fg_console; ++ elpp.info = registered_fb[(int)con2fb_map[elpp.console]]; ++ if(elpp.info == NULL) { ++ printk("[ELPP] The current console is not on a FrameBuffer\n"); ++ goto error_return; ++ } ++ ++ info = elpp.info; ++ if(elpp.logo->width > info->var.xres ) { ++ printk("[ELPP] Logo is bigger than the screen\n"); ++ goto error_return; ++ } ++ ++ /* Prepare the colors */ ++ ++ memcpy((void*)colors[eBAR_BG], elpp.prefs->bar_bg, 3); ++ memcpy((void*)colors[eBAR_FG], elpp.prefs->bar_fg, 3); ++ ++ memcpy((void*)colors[eSUC_FG], elpp.prefs->success_fg, 3); ++ memcpy((void*)colors[eSUC_BG], elpp.prefs->success_bg, 3); ++ memcpy((void*)colors[eSUC_SYM_FG], elpp.prefs->success_symbol_fg, 3); ++ memcpy((void*)colors[eSUC_SYM_BG], elpp.prefs->success_symbol_bg, 3); ++ ++ memcpy((void*)colors[eWRN_FG], elpp.prefs->warning_fg, 3); ++ memcpy((void*)colors[eWRN_BG], elpp.prefs->warning_bg, 3); ++ memcpy((void*)colors[eWRN_SYM_FG], elpp.prefs->warning_symbol_fg, 3); ++ memcpy((void*)colors[eWRN_SYM_BG], elpp.prefs->warning_symbol_bg, 3); ++ ++ memcpy((void*)colors[eERR_FG], elpp.prefs->error_fg, 3); ++ memcpy((void*)colors[eERR_BG], elpp.prefs->error_bg, 3); ++ memcpy((void*)colors[eERR_SYM_FG], elpp.prefs->error_symbol_fg, 3); ++ memcpy((void*)colors[eERR_SYM_BG], elpp.prefs->error_symbol_bg, 3); ++ ++ switch (info->fix.visual) { ++ ++ case FB_VISUAL_TRUECOLOR: ++ if (info->var.bits_per_pixel >= 8) ++ elpp.needs_truepalette = 1; ++ break; ++ case FB_VISUAL_DIRECTCOLOR: ++ if (info->var.bits_per_pixel >= 24) { ++ elpp.needs_directpalette = 1; ++ elpp.needs_cmapreset = 1; ++ } ++ break; ++ case FB_VISUAL_PSEUDOCOLOR: ++ elpp.needs_cmapreset = 1; ++ break; ++ } ++ ++ if(elpp.needs_cmapreset) ++ elpp_set_cmap(); ++ ++ if(elpp.needs_truepalette || elpp.needs_directpalette) { ++ elpp.palette = vmalloc(256*4); ++ if(!elpp.palette) ++ goto error_return; ++ if (elpp.needs_truepalette) ++ elpp_set_truepalette(); ++ else ++ elpp_set_directpalette(); ++ ++ elpp.saved_palette = info->pseudo_palette; ++ info->pseudo_palette = elpp.palette; ++ } ++ ++ /* Allocate memory to the message structures */ ++ elpp.messages = vmalloc(sizeof(struct elpp_messages)*NUM_MSGS); ++ if(!elpp.messages) ++ goto error_return; ++ memset(elpp.messages,0,sizeof(struct elpp_messages)*NUM_MSGS); ++ ++ /* Every thing is ok... now perform some calculations */ ++ translated_msg_x = elpp_translate_x(elpp.prefs->msg_x); ++ translated_msg_y = elpp_translate_y(elpp.prefs->msg_y); ++ translated_bar_x = elpp_translate_x(elpp.prefs->bar_x); ++ translated_bar_y = elpp_translate_y(elpp.prefs->bar_y); ++ ++ return 0; ++error_return: ++ elpp.disable = 1; ++ return -1; ++} ++ +--- linux-2.6.12/drivers/video/console/fbcon.c~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/console/fbcon.c +@@ -91,6 +91,9 @@ + #include + #include + #endif ++#ifdef CONFIG_FB_ELPP ++#include ++#endif + + #include "fbcon.h" + +@@ -107,7 +110,7 @@ + }; + + struct display fb_display[MAX_NR_CONSOLES]; +-static signed char con2fb_map[MAX_NR_CONSOLES]; ++signed char con2fb_map[MAX_NR_CONSOLES]; + static signed char con2fb_map_boot[MAX_NR_CONSOLES]; + static int logo_height; + static int logo_lines; +@@ -997,6 +1000,19 @@ + softback_top = 0; + } + } ++ ++ #ifdef CONFIG_FB_ELPP ++ extern struct elpp_struct elpp; ++ ++ if(elpp.init == 0) { ++ if(elpp_init() == 0) { ++ elpp_register(); ++ } ++ elpp.init = 1; ++ } ++ #endif ++ ++ + } + + static void fbcon_deinit(struct vc_data *vc) +@@ -1997,6 +2013,12 @@ + logo_shown = fg_console; + /* This is protected above by initmem_freed */ + fb_show_logo(info); ++#ifdef CONFIG_FB_ELPP ++ if(!elpp.disable) { ++ elpp_progress("!c"); ++ elpp_progress("1 [*] OpenZaurus w/ Kernel 2.6 [*]"); ++ } ++#endif + update_region(vc, + vc->vc_origin + vc->vc_size_row * vc->vc_top, + vc->vc_size_row * (vc->vc_bottom - +--- /dev/null ++++ linux-2.6.12/drivers/video/console/symbols_16x16.c +@@ -0,0 +1,123 @@ ++ ++#include ++ ++#define FONTDATAMAX 96 ++ ++static unsigned char symbols_data_8x16[FONTDATAMAX] = { ++ ++ /* Success, tick mark */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000001100 */ ++ 0x00, /* 0000000000011110 */ ++ 0x00, /* 0000000000111100 */ ++ 0x00, /* 0000000001111000 */ ++ 0x00, /* 0000000011110000 */ ++ 0x01, /* 0000000111100000 */ ++ 0x43, /* 0100001111000000 */ ++ 0xe7, /* 1110011110000000 */ ++ 0x7f, /* 0111111100000000 */ ++ 0x3e, /* 0011111000000000 */ ++ 0x1c, /* 0001110000000000 */ ++ 0x08, /* 0000100000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x0c, /* 0000000000001100 */ ++ 0x1e, /* 0000000000011110 */ ++ 0x3c, /* 0000000000111100 */ ++ 0x78, /* 0000000001111000 */ ++ 0xf0, /* 0000000011110000 */ ++ 0xe0, /* 0000000111100000 */ ++ 0xc0, /* 0100001111000000 */ ++ 0x80, /* 1110011110000000 */ ++ 0x00, /* 0111111100000000 */ ++ 0x00, /* 0011111000000000 */ ++ 0x00, /* 0001110000000000 */ ++ 0x00, /* 0000100000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++ /* Warning, exclamation mark */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x03, /* 0000001111000000 */ ++ 0x07, /* 0000011111100000 */ ++ 0x07, /* 0000011111100000 */ ++ 0x07, /* 0000011111100000 */ ++ 0x03, /* 0000001111000000 */ ++ 0x03, /* 0000001111000000 */ ++ 0x01, /* 0000000110000000 */ ++ 0x01, /* 0000000110000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x01, /* 0000000110000000 */ ++ 0x03, /* 0000001111000000 */ ++ 0x01, /* 0000000110000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0xc0, /* 0000001111000000 */ ++ 0xe0, /* 0000011111100000 */ ++ 0xe0, /* 0000011111100000 */ ++ 0xe0, /* 0000011111100000 */ ++ 0xc0, /* 0000001111000000 */ ++ 0xc0, /* 0000001111000000 */ ++ 0x80, /* 0000000110000000 */ ++ 0x80, /* 0000000110000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x80, /* 0000000110000000 */ ++ 0xc0, /* 0000001111000000 */ ++ 0x80, /* 0000000110000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++ /* Failure, cross mark */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x30, /* 0011000000001100 */ ++ 0x78, /* 0111100000011110 */ ++ 0x3c, /* 0011110000111100 */ ++ 0x1e, /* 0001111001111000 */ ++ 0x0f, /* 0000111111110000 */ ++ 0x07, /* 0000011111100000 */ ++ 0x07, /* 0000011111100000 */ ++ 0x0f, /* 0000111111110000 */ ++ 0x1e, /* 0001111001111000 */ ++ 0x3c, /* 0011110000111100 */ ++ 0x78, /* 0111100000011110 */ ++ 0x30, /* 0011000000001100 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ 0x0c, /* 0011000000001100 */ ++ 0x1e, /* 0111100000011110 */ ++ 0x3c, /* 0011110000111100 */ ++ 0x78, /* 0001111001111000 */ ++ 0xf0, /* 0000111111110000 */ ++ 0xe0, /* 0000011111100000 */ ++ 0xe0, /* 0000011111100000 */ ++ 0xf0, /* 0000111111110000 */ ++ 0x78, /* 0001111001111000 */ ++ 0x3c, /* 0011110000111100 */ ++ 0x1e, /* 0111100000011110 */ ++ 0x0c, /* 0011000000001100 */ ++ 0x00, /* 0000000000000000 */ ++ 0x00, /* 0000000000000000 */ ++ ++}; ++ ++struct font_desc symbols_16x16 = { ++ 8, ++ "SYMBOLS16", ++ 8, ++ 16, ++ symbols_data_8x16, ++ 0 ++}; ++ +--- linux-2.6.12/drivers/video/fbmem.c~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/fbmem.c +@@ -362,7 +362,13 @@ + fb_logo.depth = 4; + else + fb_logo.depth = 1; ++ ++#ifdef CONFIG_FB_ELPP ++ /* ELPP Needs the entire screen */ ++ return info->var.yres; ++#else + return fb_logo.logo->height; ++#endif + } + + int fb_show_logo(struct fb_info *info) +@@ -412,11 +418,22 @@ + + image.width = fb_logo.logo->width; + image.height = fb_logo.logo->height; ++ ++#ifdef CONFIG_FB_ELPP ++ /* Align the image vertically to the center of screen */ ++ image.dy = (info->var.yres - fb_logo.logo->height)/2; ++#else + image.dy = 0; ++#endif + + for (x = 0; x < num_online_cpus() * (fb_logo.logo->width + 8) && + x <= info->var.xres-fb_logo.logo->width; x += (fb_logo.logo->width + 8)) { ++#ifdef CONFIG_FB_ELPP ++ /* Align the image horizontally to the center of screen */ ++ image.dx = x + (info->var.xres - fb_logo.logo->width)/2; ++#else + image.dx = x; ++#endif + info->fbops->fb_imageblit(info, &image); + } + +--- linux-2.6.12/drivers/video/logo/Makefile~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/logo/Makefile +@@ -13,6 +13,7 @@ + obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o + obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o + obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o ++obj-$(CONFIG_FB_ELPP) += logo_linux_elpp.o + + # How to generate logo's + +--- linux-2.6.12/drivers/video/logo/logo.c~add-elpp-stuff.patch ++++ linux-2.6.12/drivers/video/logo/logo.c +@@ -14,6 +14,10 @@ + #include + #include + ++#ifdef CONFIG_FB_ELPP ++#include ++#endif ++ + #ifdef CONFIG_M68K + #include + #endif +@@ -34,6 +38,8 @@ + extern const struct linux_logo logo_superh_vga16; + extern const struct linux_logo logo_superh_clut224; + extern const struct linux_logo logo_m32r_clut224; ++extern const struct linux_logo logo_linux_elpp; ++extern struct elpp_struct elpp; + + + const struct linux_logo *fb_find_logo(int depth) +@@ -102,6 +108,12 @@ + /* M32R Linux logo */ + logo = &logo_m32r_clut224; + #endif ++#ifdef CONFIG_FB_ELPP ++ if( elpp.logo != (void*)0) ++ logo = elpp.logo; ++ else ++ logo = &logo_linux_elpp; ++#endif + } + return logo; + } +--- /dev/null ++++ linux-2.6.12/drivers/video/logo/logo_linux_elpp.c +@@ -0,0 +1,25669 @@ ++/* ++ * DO NOT EDIT THIS FILE! ++ * ++ * It was automatically generated from PNMs/finalfantasy.pnm ++ * ++ * Linux logo logo_linux_elpp ++ */ ++ ++#include ++ ++static unsigned char logo_linux_elpp_data[] __initdata = { ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, ++ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20