diff options
26 files changed, 220 insertions, 492 deletions
diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf index 10f14ef42b..551f73b7e0 100644 --- a/conf/distro/generic-unstable.conf +++ b/conf/distro/generic-unstable.conf @@ -4,25 +4,63 @@ #@DESCRIPTION: An experimental distribution configuration #@-------------------------------------------------------------------- -require conf/distro/generic.conf +# +# Header +# +DISTRO_NAME = "generic-unstable-glibc" +DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" # -# Binutils & Compiler +# Naming schemes # -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" -PREFERRED_VERSION_binutils = "2.16.91.0.7" -PREFERRED_VERSION_binutils-cross = "2.16.91.0.7" -# PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" +PARALLEL_INSTALL_MODULES = "1" +INHERIT += "debian multimachine" # -# Target OS, FPU system and libc +# Packaging and output format # +INHERIT += "package_ipk" +IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" + +# +# Binutils & Compiler +# +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# +# Target OS & FPU system +# TARGET_OS = "linux" -TARGET_FPU = "soft" +TARGET_FPU_arm = "soft" +TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" PREFERRED_VERSION_glibc = "2.4" PREFERRED_VERSION_glibc-intermediate = "2.4" + +# +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +# +# GPE +# +require conf/distro/preferred-gpe-versions.inc + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" +require conf/distro/preferred-opie-versions.inc + +# +# Enlightenment +# +require conf/distro/preferred-e-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 0973e5b420..bbf96062c0 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -55,6 +55,7 @@ PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # Bootstrap & Init # PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +require conf/distro/include/sane-srcdates.conf # # GPE @@ -72,4 +73,3 @@ require conf/distro/preferred-opie-versions.inc # Enlightenment # require conf/distro/preferred-e-versions.inc - diff --git a/packages/corsair/corsair_0.2.0.bb b/packages/corsair/corsair_0.2.5.bb index b98e0df671..38d1cef860 100644 --- a/packages/corsair/corsair_0.2.0.bb +++ b/packages/corsair/corsair_0.2.5.bb @@ -6,17 +6,10 @@ AUTHOR = "Joe Rumsey <joe@rumsey.org>" HOMEPAGE = "http://corsair.sf.net/" DEPENDS = "opie-pics" RDEPENDS = "opie-pics" -PV = "0.2.0" -PR = "r4" - -SRCDATE = "20050911" -#application was released 20050910 - next versions will be released as tarballs -#corsair-024.patch from 'mistermix' http://www.oesf.org/forums/index.php?showtopic=14661 inherit palmtop -SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/corsair_cvs.sourceforge.net__20050911.tar.gz \ - file://corsair-024.patch;patch=1 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/corsair/corsair-${PV}.tar.gz \ file://corsair-opie.patch;patch=1" S = "${WORKDIR}/corsair" diff --git a/packages/corsair/files/corsair-024.patch b/packages/corsair/files/corsair-024.patch deleted file mode 100644 index 9cf160fdc8..0000000000 --- a/packages/corsair/files/corsair-024.patch +++ /dev/null @@ -1,351 +0,0 @@ -Index: corsair.control -=================================================================== -RCS file: /cvsroot/corsair/corsair/corsair.control,v -retrieving revision 1.6 -diff -u -u -r1.6 corsair.control ---- corsair/corsair.control 10 Sep 2005 20:05:51 -0000 1.6 -+++ corsair/corsair.control 31 Oct 2005 20:00:43 -0000 -@@ -1,9 +1,9 @@ --Files: bin/corsair apps/Applications/corsair.desktop pics/Corsair.png pics/newfeed.png pics/get.png pics/reload.png pics/play.png help/html/corsair.html help/html/corsair_usage.html help/html/corsair_intro.html help/html/gpl.html -+Files: bin/corsair apps/Applications/corsair.desktop pics/Corsair.png pics/newfeed.png pics/get.png pics/reload.png pics/play.png pics/details.png pics/UtilsIcon.png pics/list.png pics/volume.png pics/mute.png pics/fileopen.png pics/txt.xpm help/html/corsair.html help/html/corsair_usage.html help/html/corsair_intro.html help/html/gpl.html - Priority: optional - Section: qpe/applications - Maintainer: Joe Rumsey <corsair@rumsey.org> - Architecture: $CPU_ARCH - Arch: $DEVICE_ARCH --Version: 0.2.0 -+Version: 0.2.4 - License: GPL - Description: Corsair RSS/Podcast Aggregator -Index: corsair.cpp -=================================================================== -RCS file: /cvsroot/corsair/corsair/corsair.cpp,v -retrieving revision 1.7 -diff -u -u -r1.7 corsair.cpp ---- corsair/corsair.cpp 10 Sep 2005 20:05:51 -0000 1.7 -+++ corsair/corsair.cpp 31 Oct 2005 20:00:44 -0000 -@@ -35,13 +35,13 @@ - #include <qmenubar.h> - #include <qprogressbar.h> - #include <qmessagebox.h> -+#include <qaccel.h> - - #include <qtopia/resource.h> - #include <qtopia/config.h> - #include <qtopia/global.h> - #include <qtopia/qcopenvelope_qws.h> - -- - #include "download.h" - #include "info.h" - -@@ -105,11 +105,15 @@ - QPopupMenu *file = new QPopupMenu(m_menuPopup); - file->insertItem("&Load", this, SLOT(loadNewFile())); - file->insertItem("E&xit", this, SLOT(close())); -- - QPopupMenu *view = new QPopupMenu(m_menuPopup); - view->insertItem("&Downloads", this, SLOT(viewDownloads())); - view->insertItem("&Preferences", this, SLOT(preferences())); - -+ // bind Zaurus cancel key (escape) to close -+ QAccel *a = new QAccel( this ); -+ a->connectItem( a->insertItem(Key_Escape), -+ this, -+ SLOT(close()) ); - QPopupMenu *help = new QPopupMenu(m_menuPopup); - help->insertItem("&Help", this, SLOT(help())); - help->insertItem("&About", this, SLOT(about())); -@@ -211,8 +215,10 @@ - FeedShow *show = m_feeds.GetShow(item); - if(show && show->m_haveLocalCopy) { - play(show); -- } else { -+ } else if (show && show->m_haveEnclosure) { - grabItem(item); -+ } else { -+ view(item); - } - } - } -@@ -637,11 +643,12 @@ - void CorsairWindow::play(FeedShow *show) - { - if(show->m_haveLocalCopy) { -- QCString player = (const char *)QString("QPE/Application/" + option("audioplayer", "player")); -+ QCString player = (const char *)QString("QPE/Application/" + option("audioplayer", "kino2")); - QCopEnvelope e(player, "setDocument(QString)"); - QString sub; -- e << show->fullLocalPath(sub); -- -+ QString filename = show->fullLocalPath(sub); -+ e << filename; -+ LOG(4, "filename=%s\n", (const char *)filename); - QCopEnvelope r(player, "raise()"); - } - } -Index: download.cpp -=================================================================== -RCS file: /cvsroot/corsair/corsair/download.cpp,v -retrieving revision 1.7 -diff -u -u -r1.7 download.cpp ---- corsair/download.cpp 10 Sep 2005 20:05:51 -0000 1.7 -+++ corsair/download.cpp 31 Oct 2005 20:00:44 -0000 -@@ -27,8 +27,10 @@ - { - m_parent = parent; - m_url = url; -+ m_host = url.host(); - m_param = param; - m_complete = false; -+ m_redirectCount = 0; - - init(); - -@@ -67,10 +69,10 @@ - if(port < 0) - port = 80; - -- LOG(2, "connecting to %s:%d\n", (const char *)m_url.host(), port); -- connectToHost(m_url.host(), port); -+ LOG(2, "connecting to %s:%d\n", (const char *)m_host, port); -+ connectToHost(m_host, port); - -- emit statusUpdate("Connecting to " + m_url.host()); -+ emit statusUpdate("Connecting to " + m_host); - } - - void Download::openFile() -@@ -144,8 +146,8 @@ - m_file.writeBlock((const char *)line, line.length()); - m_totalRead += line.length(); - } else if(!m_gotResponse) { -- LOG(2, "%s", (const char *)line); -- if(line.contains("302 Found") || line.contains("301 Moved Permanently")) { -+ LOG(2, "Response=%s", (const char *)line); -+ if(line.contains("302 Found") || line.contains("301 Moved Permanently") || line.contains("302 Redirect")) { - m_redirect = true; - } else if(!line.contains("200 OK")) { - complete(Error); -@@ -153,7 +155,7 @@ - } - m_gotResponse = true; - } else { -- LOG(2, "%s", (const char *)line); -+ LOG(2, "Response Line=%s", (const char *)line); - QString lower = line.lower(); - if(lower.startsWith("transfer-encoding: ") && line.contains("chunked")) { - m_chunked = true; -@@ -166,9 +168,15 @@ - m_redirectLocation = line.right(line.length() - (QString("location: ").length())).stripWhiteSpace(); - } else if(line.length() < 1 || line[0] == '\r' || line[0] == '\n') { - if(m_redirect) { -+ if (m_redirectCount > REDIRECT_MAX || -+ m_redirectLocation.isNull()) { -+ error(RedirectError); -+ } - init(); - close(); -+ m_redirectCount++; - m_url = QUrl(m_redirectLocation); -+ m_host = m_url.host(); - go(); - } else { - m_headersComplete = true; -@@ -194,14 +202,14 @@ - - void Download::connected() - { -- emit statusUpdate("Connected to " + m_url.host()); -+ emit statusUpdate("Connected to " + m_host); - LOG(2, "connected\n"); - - QString get = m_url.encodedPathAndQuery(); - - QString req; - req = "GET " + get + " HTTP/1.1\r\n"; -- req += "Host: " + m_url.host() + "\r\n"; -+ req += "Host: " + m_host + "\r\n"; - req += "\r\n"; - - LOG(2, "Grabbing %s with '%s'\n", (const char *)get, (const char *)req); -@@ -212,16 +220,17 @@ - - void Download::hostFound() - { -- emit statusUpdate("Host " + m_url.host() + " found"); -+ emit statusUpdate("Host " + m_host + " found"); - LOG(2, "hostFound\n"); - } - - void Download::connectionClosed() - { -+ LOG(2, "connectionClosed to %s",(const char*)m_host); - readyRead(); - -- emit statusUpdate(m_url.host() + "Done"); -- LOG(2, "connectionClosed\n"); -+ statusUpdate(m_host + "done"); -+ - m_file.close(); - complete(Error); - } -Index: download.h -=================================================================== -RCS file: /cvsroot/corsair/corsair/download.h,v -retrieving revision 1.4 -diff -u -u -r1.4 download.h ---- corsair/download.h 4 Sep 2005 16:52:22 -0000 1.4 -+++ corsair/download.h 31 Oct 2005 20:00:44 -0000 -@@ -23,6 +23,8 @@ - #include <qsocket.h> - #include <qurl.h> - -+#define REDIRECT_MAX 5 // max redirects -+ - class CorsairWindow; - - class Download : public QSocket { -@@ -43,6 +45,8 @@ - bool m_redirect; - QString m_redirectLocation; - bool m_complete; -+ QString m_host; -+ int m_redirectCount; - - void *m_param; - -@@ -54,6 +58,7 @@ - NoData, - CantConnect, - NotFound, -+ RedirectError, - Error - }; - -Index: feedparser.h -=================================================================== -RCS file: /cvsroot/corsair/corsair/feedparser.h,v -retrieving revision 1.3 -diff -u -u -r1.3 feedparser.h ---- corsair/feedparser.h 10 Sep 2005 20:05:51 -0000 1.3 -+++ corsair/feedparser.h 31 Oct 2005 20:00:44 -0000 -@@ -66,6 +66,7 @@ - m_elemTitle[m_level] = ""; - m_enclosure = ""; - m_description = ""; -+ m_elemLink[m_level] = ""; - } else if(name == "enclosure") { - m_enclosure = attr.value("url"); - } -@@ -84,14 +85,14 @@ - { - LOG(3, "endElement %s\n", (const char *)name); - if(m_elementName[m_level] == "item") { -- m_feed->addShow(m_elemTitle[m_level], -+ m_feed->addShow(m_elemTitle[m_level].simplifyWhiteSpace(), - m_enclosure, - m_description, - m_elemLink[m_level]); - } else if(m_elementName[m_level] == "channel") { -- m_feed->setName(m_elemTitle[m_level]); -+ m_feed->setName(m_elemTitle[m_level].simplifyWhiteSpace()); - } else if(m_elementName[m_level] == "title") { -- m_elemTitle[m_level - 1] = m_elementData[m_level]; -+ m_elemTitle[m_level - 1] = m_elementData[m_level].simplifyWhiteSpace(); - } else if(m_elementName[m_level] == "description") { - m_description = m_elementData[m_level]; - } else if(m_elementName[m_level] == "link") { -Index: feeds.cpp -=================================================================== -RCS file: /cvsroot/corsair/corsair/feeds.cpp,v -retrieving revision 1.7 -diff -u -u -r1.7 feeds.cpp ---- corsair/feeds.cpp 10 Sep 2005 20:05:51 -0000 1.7 -+++ corsair/feeds.cpp 31 Oct 2005 20:00:44 -0000 -@@ -213,19 +213,26 @@ - m_isNew(isNew), - m_index(index), - m_haveLocalCopy(false) , -+ m_haveEnclosure(false), - m_listItem(NULL) - { - QString sub; - QFile f(fullLocalPath(sub)); -- if(enclosure.length() > 0 && f.exists()) -- m_haveLocalCopy = true; -+ QString filename = fileName(); -+ if(enclosure.length() > 0) { -+ m_haveEnclosure = true; -+ if (f.exists()) { -+ LOG(1,"Show file exists: (%s) (%s) \n",(const char *)sub, (const char *) filename); -+ m_haveLocalCopy = true; -+ } -+ } - } - - QString FeedShow::fullLocalPath(QString &sub) - { - sub = m_feed->m_list->owner()->showsDir() + "/" + m_feed->dirName() + "/"; - -- return sub + fileName(); -+ return sub + cleanfileName(); - } - - void FeedShow::setHaveLocalCopy(bool haveit) -@@ -292,8 +299,9 @@ - FeedShow *i; - for(i = m_shows.first(); i; i = m_shows.next()) { - if(link.length() > 0) { -- if(i->m_link == link) -+ if(i->m_link == link) { - return; -+ } - } else if(enclosure.length() > 0) { - if(i->m_enclosure == enclosure) { - return; -Index: feeds.h -=================================================================== -RCS file: /cvsroot/corsair/corsair/feeds.h,v -retrieving revision 1.5 -diff -u -u -r1.5 feeds.h ---- corsair/feeds.h 10 Sep 2005 20:05:51 -0000 1.5 -+++ corsair/feeds.h 31 Oct 2005 20:00:45 -0000 -@@ -74,6 +74,7 @@ - int m_index; - - bool m_haveLocalCopy; -+ bool m_haveEnclosure; - - ShowListViewItem *m_listItem; - -@@ -83,6 +84,13 @@ - return f; - } - -+ QString cleanfileName() { -+ QString f = fileName(); -+ int loc = f.findRev('?'); -+ f = f.left(loc); -+ return f; -+ } -+ - QString fullLocalPath(QString &subDir); - void setHaveLocalCopy(bool haveit); - -Index: main.cpp -=================================================================== -RCS file: /cvsroot/corsair/corsair/main.cpp,v -retrieving revision 1.3 -diff -u -u -r1.3 main.cpp ---- corsair/main.cpp 10 Sep 2005 20:05:51 -0000 1.3 -+++ corsair/main.cpp 31 Oct 2005 20:00:45 -0000 -@@ -23,7 +23,7 @@ - - #include "corsair.h" - --int g_debug = 2; -+int g_debug = 3; - - #ifndef GOOD_MACROS - void LOG(int l, const char *fmt, ...) diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita index 967371c661..f2be7e270e 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita @@ -1012,7 +1012,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index 602e69ee34..759338cb56 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 @@ -1048,7 +1048,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz index ddb8a8aeae..22a544f1b4 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz @@ -1012,7 +1012,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch index 6f77d51dee..b27fd09068 100644 --- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch @@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> drivers/ide/legacy/ide-cs.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c +Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c =================================================================== ---- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 -+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 -@@ -444,6 +444,8 @@ +--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 +@@ -402,6 +402,9 @@ PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), + PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ + PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), - - -------------------------------------------------------------------------- -With pcmcia-cs -> pcmciautils change some cards which was working with -hostap driver now are bound into orinoco driver. - -This patch made them bound into hostap like it was before. - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - -// will add some here - diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch index 6f77d51dee..b27fd09068 100644 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch @@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> drivers/ide/legacy/ide-cs.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c +Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c =================================================================== ---- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 -+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 -@@ -444,6 +444,8 @@ +--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 +@@ -402,6 +402,9 @@ PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), + PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ + PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), - - -------------------------------------------------------------------------- -With pcmcia-cs -> pcmciautils change some cards which was working with -hostap driver now are bound into orinoco driver. - -This patch made them bound into hostap like it was before. - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - -// will add some here - diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita b/packages/linux/linux-openzaurus-2.6.17/defconfig-akita index 967371c661..f2be7e270e 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-akita @@ -1012,7 +1012,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 index 602e69ee34..759338cb56 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 @@ -1048,7 +1048,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz index ddb8a8aeae..22a544f1b4 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz @@ -1012,7 +1012,7 @@ CONFIG_SND_PXA2XX_AC97=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # PCMCIA devices diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch index 6f77d51dee..b27fd09068 100644 --- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch @@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> drivers/ide/legacy/ide-cs.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c +Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c =================================================================== ---- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 -+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 -@@ -444,6 +444,8 @@ +--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 +@@ -402,6 +402,9 @@ PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), + PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ + PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), - - -------------------------------------------------------------------------- -With pcmcia-cs -> pcmciautils change some cards which was working with -hostap driver now are bound into orinoco driver. - -This patch made them bound into hostap like it was before. - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - -// will add some here - diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 930b6adcce..270d6d7060 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r39" +PR = "r41" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -87,7 +87,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://hrw-pcmcia-ids-r3.patch;patch=1 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ file://locomo-lcd-def-bightness.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb index b33625932f..b1ed296e22 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" @@ -36,7 +36,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${RPSRC}/poodle_pm-r1.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://hrw-pcmcia-ids-r3.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 197be8419d..9ae6e766c6 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r6" +PR = "r8" DEFAULT_PREFERENCE = "-1" @@ -49,7 +49,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://hrw-pcmcia-ids-r3.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/unslung-kernel/netconsole.patch b/packages/linux/unslung-kernel/netconsole.patch index c54f4d160e..9d297300e1 100644 --- a/packages/linux/unslung-kernel/netconsole.patch +++ b/packages/linux/unslung-kernel/netconsole.patch @@ -23,9 +23,9 @@ diff -Naur linux-2.4.22/drivers/net/Makefile.orig linux-2.4.22/drivers/net/Makef # HIPPI adapters # diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/netconsole.c ---- linux-2.4.22/drivers/net/netconsole.c.orig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-2.4.22/drivers/net/netconsole.c 2006-02-26 16:16:23.000000000 -0600 -@@ -0,0 +1,342 @@ +--- linux-2.4.22/drivers/net/netconsole.c.orig 2006-07-02 23:40:44.597695500 -0500 ++++ linux-2.4.22/drivers/net/netconsole.c 2006-07-10 15:58:44.000000000 -0500 +@@ -0,0 +1,353 @@ +/* linux/drivers/net/netconsole.c + * + * Copyright (C) 2001 Ingo Molnar <mingo@redhat.com> @@ -38,6 +38,7 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + * + * 2001-09-17 started by Ingo Molnar. + * 2006-02-26 very minor modifications to suit the NSLU2 w/Unslung -- Mike Westerhof. ++ * 2006-07-10 usability mods for Unslung (text only, and IP addrs) -- Mike Westerhof. + */ + +/**************************************************************** @@ -72,11 +73,12 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + +static struct net_device *netconsole_dev; +static u16 source_port, target_port; -+static u32 source_ip, target_ip; ++static u32 source_ip, target_ip, target_ipaddr; +static unsigned char daddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} ; + +#define NETCONSOLE_VERSION 0x01 -+#define HEADER_LEN 5 ++/* HEADER_LEN was "5" -- it's zero for Unslung; makes it work better with netcat */ ++#define HEADER_LEN 0 + +#define MAX_UDP_CHUNK 1460 +#define MAX_PRINT_CHUNK (MAX_UDP_CHUNK-HEADER_LEN) @@ -86,7 +88,9 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + * to make sure the message gets out even in + * extreme OOM situations. + */ -+#define MAX_NETCONSOLE_SKBS 32 ++/* Was 32, lowered to 16 for Unslung (to save memory) */ ++#define MAX_NETCONSOLE_SKBS 16 ++ + +static spinlock_t netconsole_lock = SPIN_LOCK_UNLOCKED; +static int nr_netconsole_skbs; @@ -162,13 +166,14 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + + atomic_set(&skb->users, 1); + skb_reserve(skb, total_len - msg_len - HEADER_LEN); -+ skb->data[0] = NETCONSOLE_VERSION; -+ -+ spin_lock_irqsave(&sequence_lock, flags); -+ put_unaligned(htonl(offset), (u32 *) (skb->data + 1)); -+ offset += msg_len; -+ spin_unlock_irqrestore(&sequence_lock, flags); -+ ++/* Header data removed for Unslung -- its presence makes netcat less useful ++ * skb->data[0] = NETCONSOLE_VERSION; ++ * ++ * spin_lock_irqsave(&sequence_lock, flags); ++ * put_unaligned(htonl(offset), (u32 *) (skb->data + 1)); ++ * offset += msg_len; ++ * spin_unlock_irqrestore(&sequence_lock, flags); ++ */ + memcpy(skb->data + HEADER_LEN, msg, msg_len); + skb->len += msg_len + HEADER_LEN; + @@ -258,6 +263,7 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n +MODULE_DESCRIPTION("kernel network console implementation"); +MODULE_LICENSE("GPL"); +MODULE_PARM(target_ip, "i"); ++MODULE_PARM(target_ipaddr, "s"); +MODULE_PARM(target_eth_byte0, "i"); +MODULE_PARM(target_eth_byte1, "i"); +MODULE_PARM(target_eth_byte2, "i"); @@ -280,7 +286,7 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + if (!target_port) + target_port = 6666; + if (!source_port) -+ source_port = 6666; ++ source_port = 6665; + if (!dev) + dev = "ixp0"; + @@ -311,11 +317,16 @@ diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/n + printk(KERN_INFO "netconsole: using source IP %i.%i.%i.%i\n", + IP(0), IP(1), IP(2), IP(3)); +#undef IP -+ if (!target_ip) { -+ printk(KERN_ERR "netconsole: target_ip parameter not specified, aborting.\n"); -+ return -1; ++ if (!target_ipaddr) { ++ if (!target_ip) { ++ printk(KERN_ERR "netconsole: neither target_ipaddr nor target_ip parameter not specified, aborting.\n"); ++ return -1; ++ } else { ++ target_ip = htonl(target_ip); ++ } ++ } else { ++ target_ip = in_aton(target_ipaddr); + } -+ target_ip = htonl(target_ip); +#define IP(x) ((char *)&target_ip)[x] + printk(KERN_INFO "netconsole: using target IP %i.%i.%i.%i\n", + IP(0), IP(1), IP(2), IP(3)); diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 64868d289b..6ecfd7d0f2 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r13" +PR = "r14" KERNEL_SUFFIX = "unslung" diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index de27c9236a..e57960ecdb 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r16" +PR = "r17" IMAGE_BASENAME = "unslung" @@ -19,6 +19,7 @@ IPKG_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg \ cpio \ findutils \ + kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index 3ff7d79d43..d6d789a858 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -535,3 +535,7 @@ Flash filesystem cleanup (regained space): Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command (note: upgrade added 3KB in size, 'more' added 4KB in size) + +Added network console debugging support: + - patched netconsole driver, added netconsole kernel module to image + - updated /linuxrc (& misc files) for basic support of same diff --git a/packages/nslu2-binary-only/unslung-rootfs/linuxrc b/packages/nslu2-binary-only/unslung-rootfs/linuxrc index d8a0e5d06c..77185b9443 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/linuxrc +++ b/packages/nslu2-binary-only/unslung-rootfs/linuxrc @@ -1,5 +1,25 @@ #!/bin/sh +NC_SLUGIP="192.168.1.77" +NC_TARGIP="192.168.1.100" + +if ( [ -f "/.nc" ] ) ; then + if ( [ -z "$RERUN" ] ) ; then + /bin/echo " DEBUG: Starting network console from flash ..." + . /.nc + /bin/echo "Insmod ixp400" + /sbin/insmod ixp400.o + /bin/echo "Insmod ixp425" + /sbin/insmod ixp425_eth.o + /sbin/ifconfig ixp0 $NC_SLUGIP + /bin/echo "Insmod netconsole" + /sbin/insmod netconsole.o target_ipaddr=$NC_TARGIP + /bin/echo "Redirecting output via nc and restarting /linuxrc ..." + export RERUN=1 + exec /linuxrc 2>&1 | tee /dev/console | /usr/bin/nc $NC_TARGIP 6666 + fi +fi + # **** DO NOT EVEN THINK OF EDITING OR REMOVING THIS FILE **** # **** UNLESS YOU REALLY KNOW *EXACTLY* WHAT YOU ARE DOING. **** @@ -8,62 +28,74 @@ /bin/mount -t proc proc /proc -echo "1" > /proc/sys/kernel/panic - -/bin/echo "Sleeping while waiting for disk..." -cnt=20 -while [ $cnt -gt 0 ] ; do - echo -ne "\r$cnt " - sleep 1 - [ -e /.sda1root -a -f /proc/hdd_sda ] && cnt=0 - [ -e /.sdb1root -a -f /proc/hdd_sdb ] && cnt=0 - cnt=`expr $cnt - 1` -done -echo - -sleep 5 - -mounted= - -for prefroot in sda1 sdb1 ; do - if [ -z "$mounted" -a -e /.${prefroot}root ] ; then - if /bin/mount -rt ext3 /dev/$prefroot /mnt ; then - if [ -e /mnt/.${prefroot}root -a -x /mnt/bin/init ] ; then - /bin/echo "Root filesystem will be mounted from /dev/$prefroot ..." - mounted=/mnt - else - /bin/umount /mnt - /bin/echo "Can't find valid rootfs on /dev/$prefroot ..." +/bin/echo "1" > /proc/sys/kernel/panic + +if ( ! [ -f /.nodisk ] ) ; then + + /bin/echo "Sleeping while waiting for disk..." + cnt=20 + while [ $cnt -gt 0 ] ; do + /bin/echo -ne "\r$cnt " + /bin/sleep 1 + [ -e /.sda1root -a -f /proc/hdd_sda ] && cnt=0 + [ -e /.sdb1root -a -f /proc/hdd_sdb ] && cnt=0 + cnt=`expr $cnt - 1` + done + echo + + /bin/sleep 5 + + mounted= + + for prefroot in sda1 sdb1 ; do + if [ -z "$mounted" -a -e /.${prefroot}root ] ; then + if /bin/mount -rt ext3 /dev/$prefroot /mnt ; then + if [ -e /mnt/.${prefroot}root -a -x /mnt/bin/init ] ; then + /bin/echo "Root filesystem will be mounted from /dev/$prefroot ..." + mounted=/mnt + else + /bin/umount /mnt + /bin/echo "Can't find valid rootfs on /dev/$prefroot ..." + fi fi fi + done + + if [ -z "$mounted" ] ; then + /bin/echo "Can't find valid rootfs, using ramdisk ..." + mounted= fi -done -if [ -z "$mounted" ] ; then - /bin/echo "Can't find valid rootfs, using ramdisk ..." - mounted= -fi + /bin/umount /proc -/bin/umount /proc + # Pivot to the desired rootfs and run the initial executable. -# Pivot to the desired rootfs and run the initial executable. + if [ -n "$mounted" ] ; then -if [ -n "$mounted" ] ; then + cd $mounted - cd $mounted + /bin/echo "Pivoting to external rootfs ..." + /sbin/pivot_root . initrd - /bin/echo "Pivoting to external rootfs ..." - /sbin/pivot_root . initrd + if ( [ -z "$RERUN" ] ) ; then + exec /usr/sbin/chroot . /bin/init < /dev/console 1> /dev/console 2> /dev/console + else + exec /usr/sbin/chroot . /bin/init + fi + else - exec /usr/sbin/chroot . /bin/init < /dev/console 1> /dev/console 2> /dev/console + exec /bin/init -else + fi - exec /bin/init + /bin/echo "Can't pivot to external rootfs, using ramdisk ..." +else + /bin/echo "Forced boot to internal flash ..." + /bin/echo "(One-time only, clearing forced boot flag file.)" + /bin/rm -f /.nodisk fi -/bin/echo "Can't pivot to external rootfs, using ramdisk ..." exec /bin/init # Last-resort fall-back - this should never be reached. diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch new file mode 100644 index 0000000000..c0034b27ab --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch @@ -0,0 +1,8 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1~ 2006-07-10 19:48:11.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1 2006-07-10 19:48:24.000000000 -0500 +@@ -45,3 +45,5 @@ + /usr/bin/Set_Led ready + /usr/bin/Set_Led beep1 + /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null ++/bin/sleep 5 ++/bin/date diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index ff0172d84d..c9ec1fbdde 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r13" +PR = "r14" DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" @@ -20,6 +20,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://rc.optware-stop \ file://rc-diversion.patch;patch=1 \ file://rc.1-diversion.patch;patch=1 \ + file://rc.1-timestamp.patch;patch=1 \ file://rc.crond-diversion.patch;patch=1 \ file://rc.halt-diversion.patch;patch=1 \ file://rc.local-diversion.patch;patch=1 \ diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index 440ddf6465..e8701eefa1 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,4 +1,5 @@ include ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 63ce8c0d7f..7724c756fc 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ |