[oe-commits] org.oe.dev merge of '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'
jeremy_laine commit
openembedded-commits at lists.openembedded.org
Fri Feb 29 19:26:00 UTC 2008
merge of '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'
and '295199ba5efc8ddca9453992b8304f356f385efd'
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 8a0dcbcac095e79d0a1e60946032241f82649911
ViewMTN: http://monotone.openembedded.org/revision/info/8a0dcbcac095e79d0a1e60946032241f82649911
Files:
1
packages/libmatchbox/libmatchbox_1.2.bb
packages/libmatchbox/libmatchbox_1.3.bb
packages/libmatchbox/libmatchbox_1.4.bb
packages/libmatchbox/libmatchbox_1.5.bb
packages/libmatchbox/libmatchbox_1.6.bb
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/curl/files
packages/dtnrg/files
packages/gtk-webcore/osb-nrcit
packages/curl/files/pkgconfig_fix.patch
packages/dtnrg/files/configure_fix.patch
packages/gtk-webcore/files/path_fixes.patch
packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
packages/libmatchbox/files/configure_fixes.patch
packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch
packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch
packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch
packages/matchbox-wm/matchbox-wm/configure_fix.patch
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
packages/curl/curl_7.16.4.bb
packages/gnutls/gnutls-1.6.3/configure_madness.patch
packages/gnutls/gnutls_1.6.3.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
packages/libmatchbox/libmatchbox_1.9.bb
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-rt_2.6.24.bb
packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/pango/pango_1.18.3.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
packages/madwifi/madwifi-ng_r.inc
Diffs:
#
# mt diff -r1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66 -r8a0dcbcac095e79d0a1e60946032241f82649911
#
#
#
# delete "packages/libmatchbox/libmatchbox_1.2.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.3.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.4.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.5.bb"
#
# delete "packages/libmatchbox/libmatchbox_1.6.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
#
# delete "packages/matchbox-wm/matchbox-wm_0.9.bb"
#
# add_dir "packages/curl/files"
#
# add_dir "packages/dtnrg/files"
#
# add_dir "packages/gtk-webcore/osb-nrcit"
#
# add_file "packages/curl/files/pkgconfig_fix.patch"
# content [d105999ef214e4616999e1d0accd284640974dc7]
#
# add_file "packages/dtnrg/files/configure_fix.patch"
# content [a89048eadd0ea582a6513bcb61d08df848026021]
#
# add_file "packages/gtk-webcore/files/path_fixes.patch"
# content [716a0950c604514677a0eae118da7da04d070344]
#
# add_file "packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch"
# content [0edb164c34530db60d690707bef73b3594b510aa]
#
# add_file "packages/libmatchbox/files/configure_fixes.patch"
# content [4de1e878c64796aab614df79cf5ee0753caa5fec]
#
# add_file "packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch"
# content [fd7e70b17a09e17b40a8f4ae230b0e9a2b13f83f]
#
# add_file "packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch"
# content [38deec6ca144203d2bec5f6271900e91c6c2dbaa]
#
# add_file "packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch"
# content [d199870bd1e6ba594504a9c421480b264394799b]
#
# add_file "packages/matchbox-wm/matchbox-wm/configure_fix.patch"
# content [bae834deeca2d5f8f79cc2ac7ad96dac873df15a]
#
# add_file "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# content [a74df0506a1afcf11eea21107f6caa8e7b5bc8da]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch"
# content [c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2]
#
# patch "packages/curl/curl_7.16.4.bb"
# from [e059af19afea35121903c9bfbda21700cbf38c07]
# to [75efc99de6c7cc702a277bad7d10afc175e42621]
#
# patch "packages/gnutls/gnutls-1.6.3/configure_madness.patch"
# from [2998e7642de3c93def273f07b105f57b61a9f9c9]
# to [87f410ef8fb3b49faf09767ddad9b5adfeb02b69]
#
# patch "packages/gnutls/gnutls_1.6.3.bb"
# from [00f6ee42f807520ea4255904e757ed8cd210a4da]
# to [d9680357a147ffbb532b44d35e0ba188e067e902]
#
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
# from [d70113c981456053b3eb81fb001830ff3a66089b]
# to [f392ca94c652f0b2e0199720b3ca1891caa1e84d]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [a81dab6970cf3f620379e415339da87027c19963]
# to [a2d1b24a35197d99ed9f2238f7e7694386f7ba8e]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [ab839622392a9399df985a1c3d43b212da7e0e56]
# to [6b4a5f5331023113b0b94f5a20f172c0144f3b20]
#
# patch "packages/libmatchbox/libmatchbox_1.9.bb"
# from [365c3dda341f2c4325bd84ab2891014107edcd0a]
# to [a9b28c50f482c7cd7c7ca85bc68e492f6fad9611]
#
# patch "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig"
# from [c20dde87e637984705b242283cff68d2e21b1512]
# to [563f526c657d4db018fbb58a6373134adb43a7b1]
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [f3cbc9b9bcdc504fa80a491cd5743b5ed799891f]
# to [29d97acddf75b09d01099358d07240db5d4e2353]
#
# patch "packages/matchbox-desktop/matchbox-desktop_0.9.1.bb"
# from [bf560c49408f0a25330af4a37ec9f44da53a7cdc]
# to [a4667d6f77aa846c3dce0a8ed91e57d6acd68929]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [98095f550f8c77883c44c40c96ff2b2161a07c87]
# to [12502c8a947c859da87bc31d714b44edeec78784]
#
# patch "packages/pango/pango_1.18.3.bb"
# from [24af597bfe27e33d9b2bb47c39d625d95e8eecc2]
# to [cb8809c85a8afc05d221451e591e5b5421dedb24]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [e924574025f2310b2e6051f3aeef14fd3082d730]
# to [809878de21fa1d0beaae670608e46b5918205067]
#
============================================================
--- packages/curl/files/pkgconfig_fix.patch d105999ef214e4616999e1d0accd284640974dc7
+++ packages/curl/files/pkgconfig_fix.patch d105999ef214e4616999e1d0accd284640974dc7
@@ -0,0 +1,14 @@
+Index: curl-7.16.4/libcurl.pc.in
+===================================================================
+--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in 2008-02-29 12:19:32.000000000 +0000
+@@ -33,6 +33,7 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
++Requires.private: gnutls
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
============================================================
--- packages/dtnrg/files/configure_fix.patch a89048eadd0ea582a6513bcb61d08df848026021
+++ packages/dtnrg/files/configure_fix.patch a89048eadd0ea582a6513bcb61d08df848026021
@@ -0,0 +1,22 @@
+head no longer supports "-1" syntax
+
+Index: dtn-2.5.0/oasys/aclocal/gcc.ac
+===================================================================
+--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac 2008-02-27 22:38:22.000000000 +0000
++++ dtn-2.5.0/oasys/aclocal/gcc.ac 2008-02-27 22:39:05.000000000 +0000
+@@ -83,13 +83,13 @@
+ dnl Figure out the version and set version-specific options
+ dnl
+ AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
+- oasys_cv_prog_gccver=`$CC --version | head -1`
++ oasys_cv_prog_gccver=`$CC --version | head -n 1`
+ oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
+ oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
+ ])
+
+ AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
+- oasys_cv_prog_gxxver=`$CXX --version | head -1`
++ oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
+ oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
+ oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
+ ])
============================================================
--- packages/gtk-webcore/files/path_fixes.patch 716a0950c604514677a0eae118da7da04d070344
+++ packages/gtk-webcore/files/path_fixes.patch 716a0950c604514677a0eae118da7da04d070344
@@ -0,0 +1,15 @@
+Index: NRCore/configure.in
+===================================================================
+--- NRCore.orig/configure.in 2008-02-29 11:01:14.000000000 +0000
++++ NRCore/configure.in 2008-02-29 12:45:18.000000000 +0000
+@@ -67,8 +67,8 @@
+ AC_MSG_RESULT([found. Using prefix $jscore_prefix])
+ JSCORE_ENABLE=yes
+ AC_SUBST(JSCORE_ENABLE)
+- JSCORE_LIBS="-L$jscore_prefix/lib -ljscore"
+- JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/"
++ JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore"
++ JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/"
+ jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore"
+ else
+ AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX])
============================================================
--- packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch 0edb164c34530db60d690707bef73b3594b510aa
+++ packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch 0edb164c34530db60d690707bef73b3594b510aa
@@ -0,0 +1,13 @@
+Index: NRCit/gtk-webcore-nrcit.pc.in
+===================================================================
+--- NRCit.orig/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:41.000000000 +0000
++++ NRCit/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:51.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: gtk-webcore-nrcit
+ Description: Gtk+-WebCore HTML rendering engine, browser interface
+ Version: @VERSION@
+-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0
+-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@
++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl
++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0
+ Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore
============================================================
--- packages/libmatchbox/files/configure_fixes.patch 4de1e878c64796aab614df79cf5ee0753caa5fec
+++ packages/libmatchbox/files/configure_fixes.patch 4de1e878c64796aab614df79cf5ee0753caa5fec
@@ -0,0 +1,79 @@
+---
+ configure.ac | 15 +++++++--------
+ libmb.pc.in | 2 +-
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+Index: libmatchbox-1.9/configure.ac
+===================================================================
+--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
++++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000
+@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
+ xft_pkg=xft
+ SUPPORTS_XFT=1
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
++ XFT_REQUIRED="xft"
+ fi
+ # XXX : xau is missing from x11.pc - workaround is too add here
+ PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg)
+@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
+ SUPPORTS_XFT=1
+ AC_MSG_RESULT(yes)
++ XFT_REQUIRED="xft"
+ else
+
+ AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
+ AC_DEFINE(USE_XFT, [1], [Use Xft])
+ SUPPORTS_XFT=1
+ AC_MSG_RESULT(yes)
++ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
+ fi
+ fi
+ fi
+
+ XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
+-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
+-
+-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
++XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
+
+ fi
+
+-# do this here for freetype include
+-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
+-
+-
+ dnl ------ Check for Pango ---------------------------------------------------
+
+ if test x$enable_pango != xno; then
+@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
+ AC_DEFINE(USE_PNG, [1], [Use Png])
+ SUPPORTS_PNG=1
+ PNG_LIBS="-lpng -lz"
+- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
+ else
+ AC_MSG_WARN([*** Cannot find PNG, disabling support])
+ enable_png=no
+@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
+ AC_SUBST(XLIBS_REQUIRED)
+ AC_SUBST(PANGO_REQUIRED)
+ AC_SUBST(PNG_REQUIRED)
++AC_SUBST(XFT_REQUIRED)
+
+ dnl ------ Below used for mbconfig.h ----------------------------------------
+
+Index: libmatchbox-1.9/libmb.pc.in
+===================================================================
+--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000
++++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000
+@@ -7,6 +7,6 @@ Name: libmb
+ Description: Utility Library used by Matchbox utilities.
+ Version: @VERSION@
+
+-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
+ Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
+ Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
============================================================
--- packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch fd7e70b17a09e17b40a8f4ae230b0e9a2b13f83f
+++ packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch fd7e70b17a09e17b40a8f4ae230b0e9a2b13f83f
@@ -0,0 +1,44 @@
+Index: linux-2.6.24.3/arch/powerpc/kernel/idle.c
+===================================================================
+--- linux-2.6.24.3.orig/arch/powerpc/kernel/idle.c 2008-02-29 14:49:40.000000000 +0100
++++ linux-2.6.24.3/arch/powerpc/kernel/idle.c 2008-02-29 16:29:23.000000000 +0100
+@@ -19,6 +19,7 @@
+ * 2 of the License, or (at your option) any later version.
+ */
+
++#include <linux/leds.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/smp.h>
+@@ -51,6 +52,12 @@
+ __setup("powersave=off", powersave_off);
+
+ /*
++ * CPU activity indicator.
++ */
++void (*leds_idle)(int is_idle);
++EXPORT_SYMBOL(leds_idle);
++
++/*
+ * The body of the idle task.
+ */
+ void cpu_idle(void)
+@@ -64,7 +71,8 @@
+ while (!need_resched() && !need_resched_delayed() &&
+ !cpu_should_die()) {
+ ppc64_runlatch_off();
+-
++ if (leds_idle)
++ leds_idle(1);
+ if (ppc_md.power_save) {
+ clear_thread_flag(TIF_POLLING_NRFLAG);
+ /*
+@@ -99,6 +107,8 @@
+ if (cpu_should_die())
+ cpu_die();
+ __preempt_enable_no_resched();
++ if (leds_idle)
++ leds_idle(0);
+ schedule();
+ preempt_disable();
+ }
============================================================
--- packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch 38deec6ca144203d2bec5f6271900e91c6c2dbaa
+++ packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch 38deec6ca144203d2bec5f6271900e91c6c2dbaa
@@ -0,0 +1,554 @@
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-29 13:56:08.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 13:56:11.000000000 +0100
+@@ -130,6 +130,15 @@
+ This allows LEDs to be controlled by a programmable timer
+ via sysfs. If unsure, say Y.
+
++config LEDS_TRIGGER_CPU_ACTIVITY
++ tristate "LED CPU Activity Trigger"
++ depends on LEDS_TRIGGERS
++ help
++ This allows LEDs to be set to show cpu activity via sysfs.
++ The LED will blink when the cpu is active and stay steady
++ (on or off according to the trigger selected) when idle.
++ Platform support is needed for this to work. If unsure, say Y.
++
+ config LEDS_TRIGGER_IDE_DISK
+ bool "LED IDE Disk Trigger"
+ depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
+Index: linux-2.6.24.3/drivers/leds/ledtrig-cpu.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/ledtrig-cpu.c 2008-02-29 13:56:11.000000000 +0100
+@@ -0,0 +1,502 @@
++/*
++ * LEDs CPU activity trigger
++ *
++ * Author: John Bowler <jbowler at acm.org>
++ *
++ * Copyright (c) 2006 John Bowler
++ *
++ * Permission is hereby granted, free of charge, to any
++ * person obtaining a copy of this software and associated
++ * documentation files (the "Software"), to deal in the
++ * Software without restriction, including without
++ * limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of
++ * the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the
++ * following conditions:
++ *
++ * The above copyright notice and this permission notice
++ * shall be included in all copies or substantial portions
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
++ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
++ * SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include <linux/ctype.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/spinlock.h>
++#include <linux/timer.h>
++#include <linux/device.h>
++
++#include <linux/leds.h>
++#include "leds.h"
++
++//#include <linux/list.h>
++//#include <linux/sysdev.h>
++
++
++/*
++ * To simplify this the LED state is given for each case of
++ * CPU state - idle or active. The LED can be:
++ *
++ * off
++ * flash - slow for idle, fast (flicker) for active
++ * on
++ *
++ * This gives two useless states - off/off and on/on
++ */
++typedef enum cpu_trigger_led_state {
++ cpu_led_off,
++ cpu_led_flash,
++ cpu_led_on,
++ cpu_led_invalid
++} cpu_trigger_led_state;
++
++static c%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r295199ba5efc8ddca9453992b8304f356f385efd -r8a0dcbcac095e79d0a1e60946032241f82649911
#
#
#
# patch "packages/madwifi/madwifi-ng_r.inc"
# from [94e56e839e15990576355deb1799b0c3dbb2615e]
# to [7aa1e42dc113764feb73fa14b6553a8b16aac0c1]
#
============================================================
--- packages/madwifi/madwifi-ng_r.inc 94e56e839e15990576355deb1799b0c3dbb2615e
+++ packages/madwifi/madwifi-ng_r.inc 7aa1e42dc113764feb73fa14b6553a8b16aac0c1
@@ -55,6 +55,6 @@ fi
fi
}
-PACKAGES = "${PN}-dbg ${PN}-modules ${PN}-tools"
+PACKAGES += "${PN}-modules ${PN}-tools"
FILES_${PN}-modules = "/lib/modules/"
FILES_${PN}-tools = "/usr/"
More information about the Openembedded-commits
mailing list