From f13717821ef8d073b1f067e1bb3e0c14fc14cb03 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 1 Jul 2007 01:45:48 +0000 Subject: SlugOS: bump kernel up to svn 888 to pick up kexec patches, add kexec-tools to the base rootfs. --- packages/linux/ixp4xx-kernel_2.6.21.5.bb | 2 +- packages/tasks/task-slugos.bb | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel_2.6.21.5.bb b/packages/linux/ixp4xx-kernel_2.6.21.5.bb index 8ff440b28b..b5dc8c5161 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.5.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.5.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "879" +IXP4XX_KERNEL_SVN_REV = "888" # # The directory containing the patches to be applied is # specified below diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 3596e9ea1e..138c23a4f4 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r10" +PR = "r11" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -100,6 +100,16 @@ SLUGOS_STANDARD_RRECOMMENDS += "\ madwifi-ng-modules madwifi-ng-tools \ " +## Other wireless tools that should be considered +## should space be available in the rootfs +# wireless-tools wpa-supplicant \ +# zd1211-firmware kernel-module-zd1211rw \ + +# Add kexec tools for rebooting alternate kernels +SLUGOS_STANDARD_RRECOMMENDS += "\ +kexec-tools \ +" + # Add modules required for Network Console support # NOTE: This module is desirable for systems lacking a physical # console, but is usually only enabled if specific needs or issues -- cgit v1.2.3 From f651ce10164975fd1d8e58cdf21620a209fa9be6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Jul 2007 02:01:03 +0000 Subject: packages/orinoco/spectrum-fw.bb: Building depends on unzip, make sure it is built --- packages/orinoco/spectrum-fw.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb index 015f61593a..f2e11eea74 100644 --- a/packages/orinoco/spectrum-fw.bb +++ b/packages/orinoco/spectrum-fw.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" +DEPENDS += " unzip-native " LICENSE = "unknown" PR = "r1" -- cgit v1.2.3 From 2faf3777e268d3355492f48fdb1991248b04583d Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 1 Jul 2007 03:35:42 +0000 Subject: SlugOS kernel: bump svn version to bring in fix for broken kexec patch --- packages/linux/ixp4xx-kernel_2.6.21.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel_2.6.21.5.bb b/packages/linux/ixp4xx-kernel_2.6.21.5.bb index b5dc8c5161..9c8fdc463c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.5.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.5.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "888" +IXP4XX_KERNEL_SVN_REV = "889" # # The directory containing the patches to be applied is # specified below -- cgit v1.2.3 From 1c3faf6ff6cb80399fce531b8f76f2775217e516 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Jul 2007 17:43:59 +0000 Subject: webkit: update webkit.pri and webkit.pro --- packages/webkit/webkit/WebKit.pri | 6 +++--- packages/webkit/webkit/WebKit.pro | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 168e5558b6..00a72dc3d5 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -5,11 +5,11 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release !gdk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 -qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt +qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit gdk-port:CONFIG += link_pkgconfig gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__ -gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) +gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC @@ -22,7 +22,7 @@ qt-port:INCLUDEPATH += \ $$PWD/WebKitQt/Api gdk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/gdk \ - $$BASE_DIR/WebCore/platform/network/gdk \ + $$BASE_DIR/WebCore/platform/network/curl \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gdk \ $$BASE_DIR/WebCore/page/gdk diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro index eae6a46180..335d11e6e7 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/webkit/WebKit.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered !gdk-port:CONFIG += qt-port -SUBDIRS = \ +qt-port:SUBDIRS += WebKitQt/Plugins +SUBDIRS += \ WebCore \ JavaScriptCore/kjs/testkjs.pro -- cgit v1.2.3 From 0230022c0b61f2f0c32909e54fa832effab537c1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Jul 2007 18:17:07 +0000 Subject: webkit: alter do_install --- packages/webkit/webkit_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index 433afb52d2..dd2e8ce6ea 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -41,7 +41,7 @@ do_install() { install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir} cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} - cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ + cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true } -- cgit v1.2.3