[oe-commits] org.oe.dev merge of '387fe9ed0ed82ea68e96a75f8876fe0807a070cd'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Dec 8 00:52:04 UTC 2007
merge of '387fe9ed0ed82ea68e96a75f8876fe0807a070cd'
and 'd3ec22c2f56bfe13ae582b6c4495224757d4a0c7'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e4b084b8f4ff19d7fce5d62b50abc1a6cd0d6347
ViewMTN: http://monotone.openembedded.org/revision/info/e4b084b8f4ff19d7fce5d62b50abc1a6cd0d6347
Files:
1
packages/python/python-pysqlite2
packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch
packages/linux/linux-2.6.23/leds-cpu-activity.patch
packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch
packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch
packages/python/python-django_0.96.1.bb
packages/python/python-pysqlite2/fix-setup.patch
packages/python/python-pysqlite2_2.4.0.bb
classes/package_ipk.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-eglibc.inc
contrib/python/generate-manifest-2.5.py
packages/directfb/directfb_1.1.0.bb
packages/enchant/enchant_1.3.0.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-efika-2.6.20/defconfig
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-rp_2.6.23.bb
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.1.bb
packages/tasks/task-python-everything.bb
packages/xfce/xfce-mcs-manager.inc
packages/tasks/task-devimage.bb
classes/kernel.bbclass
conf/machine/aximx50.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h4000.conf
conf/machine/htcuniversal.conf
conf/machine/hx4700.conf
conf/machine/magician.conf
packages/dropbear/dropbear-early_1.0.bb
packages/images/devimage-image.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-rp_2.6.22.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r387fe9ed0ed82ea68e96a75f8876fe0807a070cd -re4b084b8f4ff19d7fce5d62b50abc1a6cd0d6347
#
#
#
# add_dir "packages/python/python-pysqlite2"
#
# add_file "packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch"
# content [5bcbc4e24f3eba05099d47aaba131a41f9b58bdc]
#
# add_file "packages/linux/linux-2.6.23/leds-cpu-activity.patch"
# content [a8c68c7e99f9d62a92c16be9a267d40ec2058d38]
#
# add_file "packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch"
# content [8cabcadbac22d7913eccbfcc0d92e4e22df5d368]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch"
# content [765e90f3b79167c7493c5a9d49c7136a47c7be49]
#
# add_file "packages/python/python-django_0.96.1.bb"
# content [4a5c22d046500c578125011846082f2958496821]
#
# add_file "packages/python/python-pysqlite2/fix-setup.patch"
# content [2dd57a23d7ac3ccea71558d925e5f243970e2449]
#
# add_file "packages/python/python-pysqlite2_2.4.0.bb"
# content [617a7751e48a571c7049118a1ddff35a47317af5]
#
# patch "classes/package_ipk.bbclass"
# from [233f2e97aea453bf7350e317d172d0844ece5397]
# to [a8bf45567c155d0584cbfbffdacb48a0add41657]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [a59b4bdff5fea83e852628a968abbeb155999248]
# to [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
#
# patch "conf/distro/include/angstrom-eglibc.inc"
# from [a9d422962bc950016e570647fc57248ccb3808d7]
# to [9ef21815795e68510a165699686baf65d3897a7d]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [f768218da4136ae607054f3c46f08ce296c06475]
# to [b7e8bd24539139e7ffcc8d7a6f869f503d1c3ff5]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
# to [b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79]
#
# patch "packages/enchant/enchant_1.3.0.bb"
# from [985996bbeae0c009a211076b1d413e9f20688e6d]
# to [aab0ad1eb55728a05f723f0e7894f2b0816aaa3a]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [e13b56cb233e5f3d8f3f318416074a901d61bca3]
# to [cf4a868ba0d67c665cbdb50b00aad66a166e803a]
#
# patch "packages/linux/linux-efika-2.6.20/defconfig"
# from [d1c866425cb59ba390220ecbaaf58b5927ab719f]
# to [a5b2da485bb83c26aeb97f52c95ef09bf8d52515]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [eb9b7bade9c0bc806d24732363e0bb37686676b0]
# to [02bf23057848f530f4bb9b387634af8ca51c55f3]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [478a93358eaa830525809f6ee8bfb8bc77153c3d]
# to [505c9cf9c63acfb81b9eb656abe42b25f2e89794]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [310d5b976333bfad4ed4517dcf5756b428282424]
# to [353b94c02b2addae02ffac3246925056d10b3b71]
#
# patch "packages/python/python_2.5.1.bb"
# from [be4656d29bd3d98990716fee77c71ef69a758a2d]
# to [4f55ad9de694427456743f3c4623090c63ef08a5]
#
# patch "packages/tasks/task-python-everything.bb"
# from [8ac45927171c9bfd7e98506a31c29c28f1184299]
# to [2e4ebcc640b47da88d113e5780f8f4da2e755a21]
#
# patch "packages/xfce/xfce-mcs-manager.inc"
# from [ab08f11a65be464e62d6217782ab1660925adc1e]
# to [e66f51f02db227628fc12cbe83df8b3c55b8c663]
#
============================================================
--- packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch 5bcbc4e24f3eba05099d47aaba131a41f9b58bdc
+++ packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch 5bcbc4e24f3eba05099d47aaba131a41f9b58bdc
@@ -0,0 +1,46 @@
+Index: linux-2.6.23/arch/powerpc/kernel/idle.c
+===================================================================
+--- linux-2.6.23.orig/arch/powerpc/kernel/idle.c 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/kernel/idle.c 2007-12-05 11:34:39.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>
+@@ -50,6 +51,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)
+@@ -59,6 +66,8 @@
+
+ set_thread_flag(TIF_POLLING_NRFLAG);
+ while (1) {
++ if (leds_idle)
++ leds_idle(1);
+ while (!need_resched() && !cpu_should_die()) {
+ ppc64_runlatch_off();
+
+@@ -92,8 +101,11 @@
+ ppc64_runlatch_on();
+ if (cpu_should_die())
+ cpu_die();
++ if (leds_idle)
++ leds_idle(0);
+ preempt_enable_no_resched();
+ schedule();
++
+ preempt_disable();
+ }
+ }
============================================================
--- packages/linux/linux-2.6.23/leds-cpu-activity.patch a8c68c7e99f9d62a92c16be9a267d40ec2058d38
+++ packages/linux/linux-2.6.23/leds-cpu-activity.patch a8c68c7e99f9d62a92c16be9a267d40ec2058d38
@@ -0,0 +1,554 @@
+Index: linux-2.6.23/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.23.orig/drivers/leds/Kconfig 2007-12-05 12:00:28.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig 2007-12-05 13:46:39.000000000 +0100
+@@ -123,6 +123,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.23/drivers/leds/ledtrig-cpu.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.23/drivers/leds/ledtrig-cpu.c 2007-12-05 12:00:28.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 const char *const cpu_trigger_names[] = {
++ "off",
++ "flash",
++ "on",
++ "invalid"
++};
++
++/* Forward declaration - this is called back when an LED property
++ * is changed.
++ */
++static void leds_cpu_trigger_state_change(void);
++
++/*
++ * These constants define the actual mark/space of the flashing
++ * in jiffies. msecs_to_jiffies rounds up and is compile time
++ * evaluable for constant arguments. Writing the ?: stuff below
++ * this way ensures the compiler doesn't think it needs to
++ * compile in the math of msecs_to_jiffies.
++ *
++ * These values have been determined by experiment to work well
++ * for the ready/status LED on a LinkSys NSLU2 (light piped) and
++ * for the user LED on a Loft (Gateway Avila variant) board where
++ * the LED was directly visible. Light Output Varies Everywhere.
++ */
++#define LEDS_CPU_ACTIVE_MARK msecs_to_jiffies(40)
++#define LEDS_CPU_IDLE_MARK msecs_to_jiffies(800)
++#define LEDS_CPU_ACTIVE_SPACE msecs_to_jiffies(60)
++#define LEDS_CPU_IDLE_SPACE msecs_to_jiffies(800)
++
++
++/*
++ * Individual LEDs ------------------------------------------------------------
++ */
++struct cpu_trigger_data {
++ cpu_trigger_led_state active; /* Behaviour when the CPU is active. */
++ cpu_trigger_led_state idle; /* Behaviour when the CPU is idle. */
++};
++
++/*
++ * LED state change - called when the state of a single LED might
++ * have changed. Returns true if the LED is blinking. The argument
++ * is the blink state - the brightness of the blinking LED.
++ */
++static int leds_cpu_trigger_led_state_change(struct led_classdev *led,
++ int is_active, enum led_brightness brightness)
++{
++ int is_blinking = 0;
++
++ struct cpu_trigger_data *data = led->trigger_data;
++
++ /* Find the new brightness for the LED, if the LED is
++ * set to flash then the brightness passed in is the
++ * required value.
++ */
++ if (likely(data != 0))
++ switch (is_active ? data->active : data->idle) {
++ case cpu_led_off: brightness = LED_OFF; break;
++ case cpu_led_flash: is_blinking = 1; break;
++ case cpu_led_on: brightness = LED_FULL; break;
++ }
++ else
++ brightness = is_active ? LED_FULL : LED_OFF;
++
++ led_set_brightness(led, brightness);
++
++ return is_blinking;
++}
++
++/*
++ * sysfs properties, the property is output at an list of the
++ * values with the current setting enclosed in []
++ */
++static ssize_t leds_cpu_trigger_show_prop(struct device *dev,
++ struct device_attribute *attr, char *buf, size_t where)
++{
++ struct led_classdev *led = dev_get_drvdata(dev);
++ cpu_trigger_led_state item = cpu_led_invalid, i;
++ char *next;
++
++ if (likely(led->trigger_data != 0))
++ item = *(const cpu_trigger_led_state*)(
++ led->trigger_data + where);
++
++ for (i=0, next=buf; i<cpu_led_invalid; ++i) {
++ const char *name = cpu_trigger_names[i];
++ size_t len = strlen(name);
++
++ if (i == item)
++ *next++ = '[';
++ memcpy(next, name, len);
++ next += len;
++ if (i == item)
++ *next++ = ']';
++ *next++ = ' ';
++ }
++
++ next[-1] = '\n';
++ *next++ = 0;
++
++ return next - buf;
++}
++
++static ssize_t leds_cpu_trigger_show_active(struct device *dev,
++ struct device_attribute *attr, char *buf)
++{
++ return leds_cpu_trigger_show_prop(dev, attr, buf,
++ offsetof(struct cpu_trigger_data, active));
++}
++
++static ssize_t leds_cpu_trigger_show_idle(struct device *dev,
++ struct device_attribute *attr, char *buf)
++{
++ return leds_cpu_trigger_show_prop(dev, attr, buf,
++ offsetof(struct cpu_trigger_data, idle));
++}
++
++/*
++ * Any matching leading substring selects a property - so "onoffonoff"
++ * sets the property to off.
++ */
++static ssize_t leds_cpu_trigger_store_prop(struct device *dev,
++ struct device_attribute *attr, const char *buf,
++ size_t size, size_t where)
++{
++ size_t rc = 0;
++ cpu_trigger_led_state value = 0/*sic*/;
++ struct led_classdev *led;
++
++ /* ignore space characters before the value. */
++ while (rc < size && isspace(buf[rc]))
++ ++rc;
++ if (rc >= size)
++ return rc;
++
++ /* look for a simple match against the trigger name, case
++ * sensitive.
++ */
++ do {
++ const char *name = cpu_trigger_names[value];
++ size_t len = strlen(name);
++ if (len <= size && memcmp(buf+rc, name, len) == 0) {
++ rc = len;
++ break;
++ }
++ if (++value >= cpu_led_invalid)
++ return -EINVAL;
++ } while (1);
++
++ led = dev_get_drvdata(dev);
++ if (likely(led->trigger_data != 0))
++ *(cpu_trigger_led_state*)(
++ led->trigger_data + where) = value;
++
++ return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_active(struct device *dev,
++ struct device_attribute *attr, const char *buf, size_t size)
++{
++ ssize_t rc = leds_cpu_trigger_store_prop(dev, attr, buf, size,
++ offsetof(struct cpu_trigger_data, active));
++ /*
++ * At least one CPU must be active (otherwise who is doing this?)
++ * Call down into the global state below to cause an update
++ * to happen now.
++ */
++ leds_cpu_trigger_state_change();
++ return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_idle(struct device *dev,
++ struct device_attribute *attr, const char *buf, size_t size)
++{
++ return leds_cpu_trigger_store_prop(dev, attr, buf, size,
++ offsetof(struct cpu_trigger_data, idle));
++}
++
++static DEVICE_ATTR(active, 0644, leds_cpu_trigger_show_active,
++ leds_cpu_trigger_store_active);
++
++static DEVICE_ATTR(idle, 0644, leds_cpu_trigger_show_idle,
++ leds_cpu_trigger_store_idle);
++
++/*
++ * Activate and deactivate are called on individual LEDs when the
++ * LED trigger property is changed.
++ */
++static void leds_cpu_trigger_activate(struct led_classdev *led)
++{
++ /*
++ * The initial setting of the trigger is simple CPU activity
++ * with the LED off for idle and on for active. Consequently
++ * there is no need to mess with the global state initially,
++ * we know the CPU is active at this moment!
++ */
++ int rc;
++ struct cpu_trigger_data *data = kmalloc(sizeof *data, GFP_KERNEL);
++ if (unlikely(data == 0))
++ return;
++
++ data->active = cpu_led_on;
++ data->idle = cpu_led_off;
++ led->trigger_data = data;
++
++ rc = device_create_file(led->dev, &dev_attr_active);
++ if (rc)
++ goto err_out;
++ rc = device_create_file(led->dev, &dev_attr_idle);
++ if (rc)
++ goto err_out_active;
++
++ led_set_brightness(led, LED_FULL);
++ return;
++
++err_out_active:
++ device_remove_file(led->dev, &dev_attr_active);
++err_out:
++ led->trigger_data = NULL;
++ kfree(data);
++}
++
++static void leds_cpu_trigger_deactivate(struct led_classdev *led)
++{
++ struct cpu_trigger_data *data = led->trigger_data;
++ if (likely(data != 0)) {
++ led_set_brightness(led, LED_OFF);
++
++ device_remove_file(led->dev, &dev_attr_idle);
++ device_remove_file(led->dev, &dev_attr_active);
++
++ led->trigger_data = 0;
++ kfree(data);
++ }
++}
++
++
++/*
++ * Global state --------------------------------------------------------------
++ *
++ * This is global because the CPU state is global and we only need one timer to
++ * do this stuff.
++ */
++typedef struct leds_cpu_trigger_data {
++ struct led_trigger trigger; /* the lock in here protects everything */
++ struct timer_list timer;
++ unsigned long last_active_time; /* record of last jiffies */
++ unsigned long last_idle_time; /* record of last jiffies */
++ int count_active; /* number of active CPUs */
++} leds_cpu_trigger_data;
++
++/*
++ * Mark state - uses the current time (jiffies) to work out
++ * whether this is a mark or space.
++ */
++static int leds_cpu_trigger_mark(struct leds_cpu_trigger_data *data,
++ unsigned long now) {
++ if (data->count_active > 0) {
++ unsigned long elapsed = now - data->last_active_time;
++ elapsed %= LEDS_CPU_ACTIVE_SPACE + LEDS_CPU_ACTIVE_MARK;
++ data->last_active_time = now - elapsed;
++ return elapsed > LEDS_CPU_ACTIVE_SPACE;
++ } else {
++ unsigned long elapsed = now - data->last_idle_time;
++ elapsed %= LEDS_CPU_IDLE_SPACE + LEDS_CPU_IDLE_MARK;
++ data->last_idle_time = now - elapsed;
++ return elapsed > LEDS_CPU_IDLE_SPACE;
++ }
++}
++
++
++/*
++ * State change - given information about the nature of the
++ * (possible) state change call up to each LED to adjust its
++ * state. Returns true if any LED is blinking. The lock
++ * must be held (a read lock is adequate).
++ */
++static int leds_cpu_trigger_scan_leds(struct leds_cpu_trigger_data *data,
++ unsigned long now)
++{
++ int blinking = 0;
++ const %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd3ec22c2f56bfe13ae582b6c4495224757d4a0c7 -re4b084b8f4ff19d7fce5d62b50abc1a6cd0d6347
#
#
#
# add_file "packages/tasks/task-devimage.bb"
# content [63338e74dabf0db1286b9ec7c451d8c5d74f36bd]
#
# patch "classes/kernel.bbclass"
# from [b007ea6e7cf851bdd43779543a515f368d695509]
# to [63f744845e75d5fb5dae11b765f31d30ad820ace]
#
# patch "conf/machine/aximx50.conf"
# from [1cb21ff34a007017cdd242f2096aa1e4ef1a3b12]
# to [f066e6fbea0223b5815c3622804f93c0b18d56ee]
#
# patch "conf/machine/h2200.conf"
# from [26ae84016d9f008f9ddece62dba5fa41dc982c31]
# to [dbbf175b117be5072305298eb83c9da4db932774]
#
# patch "conf/machine/h3600.conf"
# from [0e1eab15b3887f17c14b3a824d2c96a447d2ee3a]
# to [99592d7e77fd317519f43f5db57cf5da1814b1a0]
#
# patch "conf/machine/h4000.conf"
# from [815610e0013bc849d757cb2b6589136864d8e04a]
# to [6c7b95aedd50d9f49088b0f0d050dba11b72af1a]
#
# patch "conf/machine/htcuniversal.conf"
# from [b9678e7e01aac968b7e658323a6544aaecf39abb]
# to [ed21482af85e14b44ba36c3a1957e387fb4f0299]
#
# patch "conf/machine/hx4700.conf"
# from [8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5]
# to [1181931b2a5904b7567bc19b2442b84fec80033a]
#
# patch "conf/machine/magician.conf"
# from [11824fa922d1925fe9b00525aa262b06a13767d1]
# to [1ae98222e011e1527f45541f6e78db64c18e0824]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [cdaf892564086415c02630de43886143350b375b]
# to [5b7702b9d74427e400988330fbd7c6fcff176371]
#
# patch "packages/images/devimage-image.bb"
# from [0ad21673974579715377822a74cb6ea99dc0b14a]
# to [12d7a37e95048665de418bb60826e85fc9e1c979]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
#
# patch "packages/linux/linux-rp_2.6.17.bb"
# from [1e091bd34d98eb0a943a7ad227b3f9428a35c721]
# to [4c13420a2f472b063d4a3911cbf71dac33463e44]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [0c168c0cccea7b91c96d3883e69486337818106c]
# to [aa7370a28343ffa48a4725518e97cc7407f2d7d1]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [8a34ec5f81848cec7da4097bdcd7883611b3dcf0]
# to [acbe4f75ccc973360308a4eb4bfc4071a439ddb4]
#
# patch "packages/tasks/task-base.bb"
# from [b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c]
# to [784db9539c99a3dfc0ce43cc4b61f9cd5eba3b27]
#
============================================================
--- packages/tasks/task-devimage.bb 63338e74dabf0db1286b9ec7c451d8c5d74f36bd
+++ packages/tasks/task-devimage.bb 63338e74dabf0db1286b9ec7c451d8c5d74f36bd
@@ -0,0 +1,25 @@
+DESCRIPTION = "Image for development testing"
+PR = "r1"
+LICENSE = "MIT"
+
+inherit task
+
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+DEVIMAGE_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS = "\
+ devimage \
+ busybox dropbear udev \
+ util-linux-mount \
+ module-init-tools pcmciautils \
+ wireless-tools wpa-supplicant \
+ irda-utils acx-firmware \
+ ${DEVIMAGE_EXTRA_RDEPENDS} \
+ "
+
+RRECOMMENDS = "\
+ kernel-module-msdos \
+ kernel-module-vfat \
+ kernel-modules \
+ ${DEVIMAGE_EXTRA_RRECOMMENDS} \
+ "
============================================================
--- classes/kernel.bbclass b007ea6e7cf851bdd43779543a515f368d695509
+++ classes/kernel.bbclass 63f744845e75d5fb5dae11b765f31d30ad820ace
@@ -349,6 +349,9 @@ python populate_packages_prepend () {
# If autoloading is requested, output /etc/modutils/<name> and append
# appropriate modprobe commands to the postinst
autoload = bb.data.getVar('module_autoload_%s' % basename, d, 1)
+ if not autoload:
+ # Also, try canonical name with dashes
+ autoload = bb.data.getVar('module_autoload_%s' % basename.replace('_', '-'), d, 1)
if autoload:
name = '%s/etc/modutils/%s' % (dvar, basename)
f = open(name, 'w')
@@ -400,7 +403,7 @@ python populate_packages_prepend () {
metapkg = "kernel-modules"
bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
bb.data.setVar('FILES_' + metapkg, "", d)
- blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ]
+ blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
for l in module_deps.values():
for i in l:
pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
============================================================
--- conf/machine/aximx50.conf 1cb21ff34a007017cdd242f2096aa1e4ef1a3b12
+++ conf/machine/aximx50.conf f066e6fbea0223b5815c3622804f93c0b18d56ee
@@ -32,10 +32,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa"
#
============================================================
--- conf/machine/h2200.conf 26ae84016d9f008f9ddece62dba5fa41dc982c31
+++ conf/machine/h2200.conf dbbf175b117be5072305298eb83c9da4db932774
@@ -27,12 +27,19 @@ MACHINE_EXTRA_RDEPENDS = "h2200-bootload
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-snd-h2200-audio \
+ kernel-module-i2c-pxa \
+ "
+
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
# Modules autoload and other boot properties
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-h2000-audio = "snd-h2000-audio"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
============================================================
--- conf/machine/h3600.conf 0e1eab15b3887f17c14b3a824d2c96a447d2ee3a
+++ conf/machine/h3600.conf 99592d7e77fd317519f43f5db57cf5da1814b1a0
@@ -27,33 +27,12 @@ MACHINE_EXTRA_RDEPENDS = "ipaq-boot-para
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-micro"
EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
-
-
-# TODO: see if any of these modules have 2.6 counterparts
-# and need to be RRECOMMENDED
#
-#H3600_MODULES = "\
-#h3600-asic \
-#hwtimer \
-#nvrd \
-#sa1100-cs \
-#sa1100-ir \
-#sa1100-wdt \
-#sa1100-audio \
-#sa1100-rtc \
-#sa1100usb-core \
-#sd-mod \
-#serial-h3800 \
-#"
-
-
-
-#
# Modules autoload and other boot properties
#
SERIAL_CONSOLE = "115200 ttySA0 vt100"
============================================================
--- conf/machine/h4000.conf 815610e0013bc849d757cb2b6589136864d8e04a
+++ conf/machine/h4000.conf 6c7b95aedd50d9f49088b0f0d050dba11b72af1a
@@ -26,8 +26,9 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
- kernel-module-h4000-pcmcia \
kernel-module-i2c-pxa \
+ kernel-module-h4000-bt \
+ kernel-module-h4000-pcmcia \
kernel-module-acx \
"
@@ -36,7 +37,7 @@ module_autoload_snd-mixer-oss = "snd-mix
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h4000_audio = "snd-h4000_audio"
+module_autoload_snd-h4000-audio = "snd-h4000-audio"
module_autoload_g_ether = "g_ether"
module_conf_acx = "blacklist acx"
============================================================
--- conf/machine/htcuniversal.conf b9678e7e01aac968b7e658323a6544aaecf39abb
+++ conf/machine/htcuniversal.conf ed21482af85e14b44ba36c3a1957e387fb4f0299
@@ -28,11 +28,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
XSERVER = "xserver-kdrive-fbdev"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
- kernel-module-bsd-comp \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa \
kernel-module-snd-htcuniversal-audio \
kernel-module-htcuniversal-acx \
============================================================
--- conf/machine/hx4700.conf 8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5
+++ conf/machine/hx4700.conf 1181931b2a5904b7567bc19b2442b84fec80033a
@@ -34,10 +34,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa \
kernel-module-pxa27x-voltage \
kernel-module-pxa27x-voltage-max158xx \
============================================================
--- conf/machine/magician.conf 11824fa922d1925fe9b00525aa262b06a13767d1
+++ conf/machine/magician.conf 1ae98222e011e1527f45541f6e78db64c18e0824
@@ -41,7 +41,6 @@ MACHINE_EXTRA_RRECOMMENDS = " \
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RRECOMMENDS = " \
- kernel-module-af-key \
kernel-module-i2c-pxa \
kernel-module-pxa27x-voltage \
kernel-module-pxa27x-voltage-max158xx \
============================================================
--- packages/dropbear/dropbear-early_1.0.bb cdaf892564086415c02630de43886143350b375b
+++ packages/dropbear/dropbear-early_1.0.bb 5b7702b9d74427e400988330fbd7c6fcff176371
@@ -1,6 +1,7 @@ SECTION = "devel"
DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
SECTION = "devel"
-PR = "r1"
+PR = "r2"
+RDEPENDS = "dropbear"
SRC_URI = "file://dropbear-early"
============================================================
--- packages/images/devimage-image.bb 0ad21673974579715377822a74cb6ea99dc0b14a
+++ packages/images/devimage-image.bb 12d7a37e95048665de418bb60826e85fc9e1c979
@@ -1,14 +1,10 @@
# Image for kernel debugging and development testing
# It includes all useful "kernel userspace" utilities, but
# only shell and dropbear are loaded by default.
# Allows to login via serial and real console or SSH
-DEVIMAGE_EXTRA_RDEPENDS ?= ""
-IMAGE_INSTALL = "devimage busybox dropbear udev \
- module-init-tools pcmciautils \
- wireless-tools wpa-supplicant \
- irda-utils acx-firmware \
- ${DEVIMAGE_EXTRA_RDEPENDS}"
+DEPENDS = "task-devimage"
+IMAGE_INSTALL = "task-devimage"
export IMAGE_BASENAME = "devimage"
IMAGE_LINGUAS = ""
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb 07839c0797b5ba09b5aae7fcdbb3232965b3f8e3
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/linux/linux-rp_2.6.17.bb 1e091bd34d98eb0a943a7ad227b3f9428a35c721
+++ packages/linux/linux-rp_2.6.17.bb 4c13420a2f472b063d4a3911cbf71dac33463e44
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r37"
+PR = "r38"
DEFAULT_PREFERENCE_poodle = "99"
============================================================
--- packages/linux/linux-rp_2.6.21.bb 0c168c0cccea7b91c96d3883e69486337818106c
+++ packages/linux/linux-rp_2.6.21.bb aa7370a28343ffa48a4725518e97cc7407f2d7d1
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r11"
+PR = "r12"
DEFAULT_PREFERENCE_poodle = "-99"
DEFAULT_PREFERENCE_collie = "1"
============================================================
--- packages/linux/linux-rp_2.6.22.bb 8a34ec5f81848cec7da4097bdcd7883611b3dcf0
+++ packages/linux/linux-rp_2.6.22.bb acbe4f75ccc973360308a4eb4bfc4071a439ddb4
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r10"
+PR = "r11"
DEFAULT_PREFERENCE_poodle = "-99"
============================================================
--- packages/tasks/task-base.bb b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c
+++ packages/tasks/task-base.bb 784db9539c99a3dfc0ce43cc4b61f9cd5eba3b27
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r48"
+PR = "r50"
inherit task
@@ -160,6 +160,7 @@ RRECOMMENDS_task-base-kernel26 = "\
kernel-module-uinput"
RRECOMMENDS_task-base-kernel26 = "\
+ kernel-module-nls-utf8 \
kernel-module-input \
kernel-module-uinput \
kernel-module-rtc-dev \
More information about the Openembedded-commits
mailing list