From c681b0610fafb1e9e7f84580786fa91f607a7edf Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 1 Apr 2009 20:49:49 -0400 Subject: busybox 1.13.2: Add more upstream patches, bump PR This adds the awk, killall, printf, syslogd, top24, unzip and wget patches from http://busybox.net/downloads/fixes-1.13.2/ --- .../busybox-1.13.2/busybox-1.13.2-awk.patch | 46 ++++++++++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-killall.patch | 17 ++++++++ .../busybox-1.13.2/busybox-1.13.2-printf.patch | 21 ++++++++++ .../busybox-1.13.2/busybox-1.13.2-syslogd.patch | 30 ++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-top24.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-unzip.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-wget.patch | 41 +++++++++++++++++++ recipes/busybox/busybox_1.13.2.bb | 9 ++++- 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch new file mode 100644 index 0000000000..0a5e6806dd --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch @@ -0,0 +1,46 @@ +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c +--- busybox-1.13.2/editors/awk.c 2008-11-09 18:28:21.000000000 +0100 ++++ busybox-1.13.2-awk/editors/awk.c 2009-02-26 12:17:05.000000000 +0100 +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = + + + /* Globals. Split in two parts so that first one is addressed +- * with (mostly short) negative offsets */ ++ * with (mostly short) negative offsets. ++ * NB: it's unsafe to put members of type "double" ++ * into globals2 (gcc may fail to align them). ++ */ + struct globals { ++ double t_double; + chain beginseq, mainseq, endseq; + chain *seq; + node *break_ptr, *continue_ptr; +@@ -442,16 +446,16 @@ struct globals2 { + tsplitter exec_builtin__tspl; + + /* biggest and least used members go last */ +- double t_double; + tsplitter fsplitter, rsplitter; + }; + #define G1 (ptr_to_globals[-1]) + #define G (*(struct globals2 *)ptr_to_globals) + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */ +-/* char G1size[sizeof(G1)]; - 0x6c */ +-/* char Gsize[sizeof(G)]; - 0x1cc */ ++/*char G1size[sizeof(G1)]; - 0x74 */ ++/*char Gsize[sizeof(G)]; - 0x1c4 */ + /* Trying to keep most of members accessible with short offsets: */ +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++#define t_double (G1.t_double ) + #define beginseq (G1.beginseq ) + #define mainseq (G1.mainseq ) + #define endseq (G1.endseq ) +@@ -479,7 +483,6 @@ struct globals2 { + #define t_info (G.t_info ) + #define t_tclass (G.t_tclass ) + #define t_string (G.t_string ) +-#define t_double (G.t_double ) + #define t_lineno (G.t_lineno ) + #define t_rollback (G.t_rollback ) + #define intvar (G.intvar ) diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch new file mode 100644 index 0000000000..9524f5281a --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch @@ -0,0 +1,17 @@ +--- busybox-1.13.2/include/libbb.h Wed Dec 31 04:06:45 2008 ++++ busybox-1.13.2-killall/include/libbb.h Sat Feb 14 02:41:18 2009 +@@ -1275,7 +1275,13 @@ + PSSCAN_UTIME = 1 << 13, + PSSCAN_TTY = 1 << 14, + PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, +- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), ++ /* NB: used by find_pid_by_name(). Any applet using it ++ * needs to be mentioned here. */ ++ PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL ++ || ENABLE_PGREP || ENABLE_PKILL ++ || ENABLE_PIDOF ++ || ENABLE_SESTATUS ++ ), + USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) + PSSCAN_START_TIME = 1 << 18, + PSSCAN_CPU = 1 << 19, diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch new file mode 100644 index 0000000000..281d457065 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch @@ -0,0 +1,21 @@ +diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c +--- busybox-1.13.2/coreutils/printf.c 2008-12-31 04:06:45.000000000 +0100 ++++ busybox-1.13.2-printf/coreutils/printf.c 2009-03-03 15:13:12.000000000 +0100 +@@ -139,14 +139,14 @@ static void print_direc(char *format, un + char saved; + char *have_prec, *have_width; + ++ saved = format[fmt_length]; ++ format[fmt_length] = '\0'; ++ + have_prec = strstr(format, ".*"); + have_width = strchr(format, '*'); + if (have_width - 1 == have_prec) + have_width = NULL; + +- saved = format[fmt_length]; +- format[fmt_length] = '\0'; +- + switch (format[fmt_length - 1]) { + case 'c': + printf(format, *argument); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch new file mode 100644 index 0000000000..1c24cdcc55 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch @@ -0,0 +1,30 @@ +diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c +--- busybox-1.13.2/sysklogd/syslogd.c 2008-11-09 18:28:03.000000000 +0100 ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c 2009-03-08 02:03:24.000000000 +0100 +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char + } + #endif + if (G.logFD >= 0) { ++ /* Reopen log file every second. This allows admin ++ * to delete the file and not worry about restarting us. ++ * This costs almost nothing since it happens ++ * _at most_ once a second. ++ */ + if (!now) + now = time(NULL); + if (G.last_log_time != now) { +- G.last_log_time = now; /* reopen log file every second */ ++ G.last_log_time = now; + close(G.logFD); + goto reopen; + } + } else { + reopen: +- G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT +- | O_NOCTTY | O_APPEND | O_NONBLOCK); ++ G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT ++ | O_NOCTTY | O_APPEND | O_NONBLOCK, ++ 0666); + if (G.logFD < 0) { + /* cannot open logfile? - print to /dev/console then */ + int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch new file mode 100644 index 0000000000..25ee861593 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c +--- busybox-1.13.2/procps/top.c 2008-11-09 18:28:20.000000000 +0100 ++++ busybox-1.13.2-top24/procps/top.c 2009-03-02 22:24:31.000000000 +0100 +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE + &p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle, + &p_jif->iowait, &p_jif->irq, &p_jif->softirq, + &p_jif->steal); +- if (ret > 4) { ++ if (ret >= 4) { + p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle + + p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal; + /* procps 2.x does not count iowait as busy time */ diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch new file mode 100644 index 0000000000..6b3f713ac5 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c +--- busybox-1.13.2/archival/unzip.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2-unzip/archival/unzip.c 2009-02-26 12:17:21.000000000 +0100 +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes { + }; + + #define FIX_ENDIANNESS_CDE(cde_header) do { \ +- (cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \ ++ (cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \ + } while (0) + + enum { zip_fd = 3 }; diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch new file mode 100644 index 0000000000..862467fd68 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch @@ -0,0 +1,41 @@ +diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c +--- busybox-1.13.2/networking/wget.c 2008-11-09 18:27:59.000000000 +0100 ++++ busybox-1.13.2-wget/networking/wget.c 2009-03-02 16:07:12.000000000 +0100 +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha + KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location + }; + enum { +- WGET_OPT_CONTINUE = 0x1, +- WGET_OPT_SPIDER = 0x2, +- WGET_OPT_QUIET = 0x4, +- WGET_OPT_OUTNAME = 0x8, +- WGET_OPT_PREFIX = 0x10, +- WGET_OPT_PROXY = 0x20, +- WGET_OPT_USER_AGENT = 0x40, +- WGET_OPT_PASSIVE = 0x80, +- WGET_OPT_HEADER = 0x100, ++ WGET_OPT_CONTINUE = (1 << 0), ++ WGET_OPT_SPIDER = (1 << 1), ++ WGET_OPT_QUIET = (1 << 2), ++ WGET_OPT_OUTNAME = (1 << 3), ++ WGET_OPT_PREFIX = (1 << 4), ++ WGET_OPT_PROXY = (1 << 5), ++ WGET_OPT_USER_AGENT = (1 << 6), ++ WGET_OPT_RETRIES = (1 << 7), ++ WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8), ++ WGET_OPT_PASSIVE = (1 << 9), ++ WGET_OPT_HEADER = (1 << 10), + }; + #if ENABLE_FEATURE_WGET_LONG_OPTIONS + static const char wget_longopts[] ALIGN1 = +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha + "directory-prefix\0" Required_argument "P" + "proxy\0" Required_argument "Y" + "user-agent\0" Required_argument "U" ++ /* Ignored: */ ++ // "tries\0" Required_argument "t" ++ // "timeout\0" Required_argument "T" ++ /* Ignored (we always use PASV): */ + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + ; diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 8ecbc1e0e8..602e782d4d 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,13 +1,20 @@ require busybox.inc -PR = "r17" +PR = "r18" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \ + file://busybox-1.13.2-killall.patch;patch=1 \ file://busybox-1.13.2-mdev.patch;patch=1 \ file://busybox-1.13.2-modprobe.patch;patch=1 \ + file://busybox-1.13.2-printf.patch;patch=1 \ + file://busybox-1.13.2-syslogd.patch;patch=1 \ file://busybox-1.13.2-tar.patch;patch=1 \ + file://busybox-1.13.2-top24.patch;patch=1 \ + file://busybox-1.13.2-unzip.patch;patch=1 \ + file://busybox-1.13.2-wget.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ -- cgit v1.2.3 From a8ba77b61d7eddbe8b8b50431576967de7799970 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 1 Apr 2009 14:53:56 +0000 Subject: busybox 1.13.2: Add more upstream patches, bump PR This adds the awk, killall, printf, syslogd, top24, unzip and wget patches from http://busybox.net/downloads/fixes-1.13.2/ --- .../busybox-1.13.2/busybox-1.13.2-awk.patch | 46 ++++++++++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-killall.patch | 17 ++++++++ .../busybox-1.13.2/busybox-1.13.2-printf.patch | 21 ++++++++++ .../busybox-1.13.2/busybox-1.13.2-syslogd.patch | 30 ++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-top24.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-unzip.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-wget.patch | 41 +++++++++++++++++++ recipes/busybox/busybox_1.13.2.bb | 9 ++++- 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch new file mode 100644 index 0000000000..0a5e6806dd --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch @@ -0,0 +1,46 @@ +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c +--- busybox-1.13.2/editors/awk.c 2008-11-09 18:28:21.000000000 +0100 ++++ busybox-1.13.2-awk/editors/awk.c 2009-02-26 12:17:05.000000000 +0100 +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = + + + /* Globals. Split in two parts so that first one is addressed +- * with (mostly short) negative offsets */ ++ * with (mostly short) negative offsets. ++ * NB: it's unsafe to put members of type "double" ++ * into globals2 (gcc may fail to align them). ++ */ + struct globals { ++ double t_double; + chain beginseq, mainseq, endseq; + chain *seq; + node *break_ptr, *continue_ptr; +@@ -442,16 +446,16 @@ struct globals2 { + tsplitter exec_builtin__tspl; + + /* biggest and least used members go last */ +- double t_double; + tsplitter fsplitter, rsplitter; + }; + #define G1 (ptr_to_globals[-1]) + #define G (*(struct globals2 *)ptr_to_globals) + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */ +-/* char G1size[sizeof(G1)]; - 0x6c */ +-/* char Gsize[sizeof(G)]; - 0x1cc */ ++/*char G1size[sizeof(G1)]; - 0x74 */ ++/*char Gsize[sizeof(G)]; - 0x1c4 */ + /* Trying to keep most of members accessible with short offsets: */ +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++#define t_double (G1.t_double ) + #define beginseq (G1.beginseq ) + #define mainseq (G1.mainseq ) + #define endseq (G1.endseq ) +@@ -479,7 +483,6 @@ struct globals2 { + #define t_info (G.t_info ) + #define t_tclass (G.t_tclass ) + #define t_string (G.t_string ) +-#define t_double (G.t_double ) + #define t_lineno (G.t_lineno ) + #define t_rollback (G.t_rollback ) + #define intvar (G.intvar ) diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch new file mode 100644 index 0000000000..9524f5281a --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch @@ -0,0 +1,17 @@ +--- busybox-1.13.2/include/libbb.h Wed Dec 31 04:06:45 2008 ++++ busybox-1.13.2-killall/include/libbb.h Sat Feb 14 02:41:18 2009 +@@ -1275,7 +1275,13 @@ + PSSCAN_UTIME = 1 << 13, + PSSCAN_TTY = 1 << 14, + PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, +- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), ++ /* NB: used by find_pid_by_name(). Any applet using it ++ * needs to be mentioned here. */ ++ PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL ++ || ENABLE_PGREP || ENABLE_PKILL ++ || ENABLE_PIDOF ++ || ENABLE_SESTATUS ++ ), + USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) + PSSCAN_START_TIME = 1 << 18, + PSSCAN_CPU = 1 << 19, diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch new file mode 100644 index 0000000000..281d457065 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch @@ -0,0 +1,21 @@ +diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c +--- busybox-1.13.2/coreutils/printf.c 2008-12-31 04:06:45.000000000 +0100 ++++ busybox-1.13.2-printf/coreutils/printf.c 2009-03-03 15:13:12.000000000 +0100 +@@ -139,14 +139,14 @@ static void print_direc(char *format, un + char saved; + char *have_prec, *have_width; + ++ saved = format[fmt_length]; ++ format[fmt_length] = '\0'; ++ + have_prec = strstr(format, ".*"); + have_width = strchr(format, '*'); + if (have_width - 1 == have_prec) + have_width = NULL; + +- saved = format[fmt_length]; +- format[fmt_length] = '\0'; +- + switch (format[fmt_length - 1]) { + case 'c': + printf(format, *argument); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch new file mode 100644 index 0000000000..1c24cdcc55 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch @@ -0,0 +1,30 @@ +diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c +--- busybox-1.13.2/sysklogd/syslogd.c 2008-11-09 18:28:03.000000000 +0100 ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c 2009-03-08 02:03:24.000000000 +0100 +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char + } + #endif + if (G.logFD >= 0) { ++ /* Reopen log file every second. This allows admin ++ * to delete the file and not worry about restarting us. ++ * This costs almost nothing since it happens ++ * _at most_ once a second. ++ */ + if (!now) + now = time(NULL); + if (G.last_log_time != now) { +- G.last_log_time = now; /* reopen log file every second */ ++ G.last_log_time = now; + close(G.logFD); + goto reopen; + } + } else { + reopen: +- G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT +- | O_NOCTTY | O_APPEND | O_NONBLOCK); ++ G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT ++ | O_NOCTTY | O_APPEND | O_NONBLOCK, ++ 0666); + if (G.logFD < 0) { + /* cannot open logfile? - print to /dev/console then */ + int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch new file mode 100644 index 0000000000..25ee861593 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c +--- busybox-1.13.2/procps/top.c 2008-11-09 18:28:20.000000000 +0100 ++++ busybox-1.13.2-top24/procps/top.c 2009-03-02 22:24:31.000000000 +0100 +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE + &p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle, + &p_jif->iowait, &p_jif->irq, &p_jif->softirq, + &p_jif->steal); +- if (ret > 4) { ++ if (ret >= 4) { + p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle + + p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal; + /* procps 2.x does not count iowait as busy time */ diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch new file mode 100644 index 0000000000..6b3f713ac5 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c +--- busybox-1.13.2/archival/unzip.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2-unzip/archival/unzip.c 2009-02-26 12:17:21.000000000 +0100 +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes { + }; + + #define FIX_ENDIANNESS_CDE(cde_header) do { \ +- (cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \ ++ (cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \ + } while (0) + + enum { zip_fd = 3 }; diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch new file mode 100644 index 0000000000..862467fd68 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch @@ -0,0 +1,41 @@ +diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c +--- busybox-1.13.2/networking/wget.c 2008-11-09 18:27:59.000000000 +0100 ++++ busybox-1.13.2-wget/networking/wget.c 2009-03-02 16:07:12.000000000 +0100 +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha + KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location + }; + enum { +- WGET_OPT_CONTINUE = 0x1, +- WGET_OPT_SPIDER = 0x2, +- WGET_OPT_QUIET = 0x4, +- WGET_OPT_OUTNAME = 0x8, +- WGET_OPT_PREFIX = 0x10, +- WGET_OPT_PROXY = 0x20, +- WGET_OPT_USER_AGENT = 0x40, +- WGET_OPT_PASSIVE = 0x80, +- WGET_OPT_HEADER = 0x100, ++ WGET_OPT_CONTINUE = (1 << 0), ++ WGET_OPT_SPIDER = (1 << 1), ++ WGET_OPT_QUIET = (1 << 2), ++ WGET_OPT_OUTNAME = (1 << 3), ++ WGET_OPT_PREFIX = (1 << 4), ++ WGET_OPT_PROXY = (1 << 5), ++ WGET_OPT_USER_AGENT = (1 << 6), ++ WGET_OPT_RETRIES = (1 << 7), ++ WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8), ++ WGET_OPT_PASSIVE = (1 << 9), ++ WGET_OPT_HEADER = (1 << 10), + }; + #if ENABLE_FEATURE_WGET_LONG_OPTIONS + static const char wget_longopts[] ALIGN1 = +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha + "directory-prefix\0" Required_argument "P" + "proxy\0" Required_argument "Y" + "user-agent\0" Required_argument "U" ++ /* Ignored: */ ++ // "tries\0" Required_argument "t" ++ // "timeout\0" Required_argument "T" ++ /* Ignored (we always use PASV): */ + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + ; diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 8ecbc1e0e8..602e782d4d 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,13 +1,20 @@ require busybox.inc -PR = "r17" +PR = "r18" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \ + file://busybox-1.13.2-killall.patch;patch=1 \ file://busybox-1.13.2-mdev.patch;patch=1 \ file://busybox-1.13.2-modprobe.patch;patch=1 \ + file://busybox-1.13.2-printf.patch;patch=1 \ + file://busybox-1.13.2-syslogd.patch;patch=1 \ file://busybox-1.13.2-tar.patch;patch=1 \ + file://busybox-1.13.2-top24.patch;patch=1 \ + file://busybox-1.13.2-unzip.patch;patch=1 \ + file://busybox-1.13.2-wget.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ -- cgit v1.2.3 From 687a7700eabaa53b1187947b6f3b4f1662b9bbb6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 15:06:44 +0200 Subject: linux-omap 2.6.2[89]: make 720p mode conform to CEA 681-E instead of CEA 681-D --- recipes/linux/linux-omap-2.6.28/modedb-hd720.patch | 4 ++-- recipes/linux/linux-omap-2.6.29/modedb-hd720.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch index d778423d1b..0166de651a 100644 --- a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch +++ b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch @@ -4,8 +4,8 @@ NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, FB_VMODE_NONINTERLACED }, { -+ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */ -+ "hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5, ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5, + 0, FB_VMODE_NONINTERLACED + }, { /* 800x600 @ 56 Hz, 35.15 kHz hsync */ diff --git a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch index d778423d1b..0166de651a 100644 --- a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch +++ b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch @@ -4,8 +4,8 @@ NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, FB_VMODE_NONINTERLACED }, { -+ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */ -+ "hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5, ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5, + 0, FB_VMODE_NONINTERLACED + }, { /* 800x600 @ 56 Hz, 35.15 kHz hsync */ -- cgit v1.2.3 From 936d7a45a1667a594a91fd3a57521d4c36aaf4c6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 16:52:56 +0200 Subject: gnome-bluetooth: add 2.27.1 libunique: needed for gnome-bluetooth, add 1.0.8 --- conf/checksums.ini | 56 +++++++++++++++++++++++++++++++++ recipes/gnome/gnome-bluetooth_2.27.1.bb | 11 +++++++ recipes/gnome/libunique_1.0.8.bb | 7 +++++ 3 files changed, 74 insertions(+) create mode 100644 recipes/gnome/gnome-bluetooth_2.27.1.bb create mode 100644 recipes/gnome/libunique_1.0.8.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 0b05edff44..1e5d30f5e8 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6930,14 +6930,26 @@ sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61 md5=88785071f29ed0e0b6b61057a1079442 sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2] +md5=88785071f29ed0e0b6b61057a1079442 +sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] md5=ad9f97a4d04982ccf4fd67cb464879f3 sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] +md5=ad9f97a4d04982ccf4fd67cb464879f3 +sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] md5=a4a3eb15c96030906d8494959eeda23c sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] +md5=a4a3eb15c96030906d8494959eeda23c +sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc + [http://ftp.nluug.nl/languages/gcc/snapshots/4.2-20060513/gcc-4.2-20060513.tar.bz2] md5=ac6d19831220c4aeef4475492725486f sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e @@ -6946,30 +6958,58 @@ sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e md5=cba410e6ff70f7d7f4be7a0267707fd0 sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2] +md5=cba410e6ff70f7d7f4be7a0267707fd0 +sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] md5=7ae33781417a35a2eb03ee098a9f4490 sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] +md5=7ae33781417a35a2eb03ee098a9f4490 +sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] md5=ef2a4d9991b3644115456ea05b2b8163 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] +md5=ef2a4d9991b3644115456ea05b2b8163 +sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] md5=d79f553e7916ea21c556329eacfeaa16 sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] +md5=d79f553e7916ea21c556329eacfeaa16 +sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] +md5=4afa0290cc3a41ac8822666f1110de98 +sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] +md5=5dfac5da961ecd5f227c3175859a486d +sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] +md5=cc3c5565fdb9ab87a05ddb106ba0bd1f +sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de + [http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de @@ -7810,6 +7850,10 @@ sha256=cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7 md5=7f2a8cee97e62ebfa284363dc93b3178 sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.1.tar.bz2] +md5=4a7c977086af47fe43ea08b29ab93503 +sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2] md5=567172e685fc0783b1d6ab9843a85d6a sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b @@ -14146,6 +14190,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 +[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.8.tar.bz2] +md5=02b9e41c70ca738e1aa914f400fc1f05 +sha256=d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6 + [http://downloads.sourceforge.net/upnp/libupnp-1.3.1.tar.gz] md5=6646be5e31e58188e8f47c6ce64faa4c sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d @@ -18658,6 +18706,10 @@ sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b md5=b05e1d7f0cac9cc4e096aa21409dee55 sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 +[ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2] +md5=b05e1d7f0cac9cc4e096aa21409dee55 +sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 + [ftp://ftp-archives.postgresql.org/pub/source/v8.2.4/postgresql-8.2.4.tar.bz2] md5=af7ec100a33c41bfb8d87b5e0ec2f44a sha256=8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268 @@ -21166,6 +21218,10 @@ sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1 md5=860fe417ea5e9ca2d2b2225192b85b87 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a +[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2] +md5=860fe417ea5e9ca2d2b2225192b85b87 +sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a + [http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch] md5=fe6945121eaea5e9c570e3dad54d7569 sha256=578db455270592833156358f79205b21701aa12b64142da16df08fb36fca3322 diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb new file mode 100644 index 0000000000..a5c41d56e5 --- /dev/null +++ b/recipes/gnome/gnome-bluetooth_2.27.1.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +inherit autotools gnome pkgconfig + +DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" + +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am +} + diff --git a/recipes/gnome/libunique_1.0.8.bb b/recipes/gnome/libunique_1.0.8.bb new file mode 100644 index 0000000000..1526930177 --- /dev/null +++ b/recipes/gnome/libunique_1.0.8.bb @@ -0,0 +1,7 @@ +LICENSE = "LGPL" +SECTION = "x11/gnome" + +inherit autotools_stage gnome lib_package + +DEPENDS = "gtk+ dbus" + -- cgit v1.2.3 From 30cdb3a5af28adf023c562c1d61af231f7dce0dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 17:54:08 +0200 Subject: gnome-bluetooth: add RCONFLICTS with bluez-gnome --- recipes/gnome/gnome-bluetooth_2.27.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb index a5c41d56e5..9a435c7f9c 100644 --- a/recipes/gnome/gnome-bluetooth_2.27.1.bb +++ b/recipes/gnome/gnome-bluetooth_2.27.1.bb @@ -1,9 +1,12 @@ LICENSE = "GPL" SECTION = "x11/gnome" +PR = "r1" + inherit autotools gnome pkgconfig DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RCONFLICTS_${PN} = "bluez-gnome" do_configure_prepend() { sed -i -e s:docs::g ${S}/Makefile.am -- cgit v1.2.3 From 2fe33f3c7f0bff141187fc0c9005cc779c5f9458 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 18:51:00 +0200 Subject: linux-oma 2.6.29: reenable BT for beagleboard --- conf/machine/include/omap3.inc | 2 +- recipes/linux/linux-omap-2.6.29/beagleboard/defconfig | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8d1eb899de..7159187391 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r23" +MACHINE_KERNEL_PR = "r24" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index fcbe27c803..ef5e35c99f 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Mon Apr 6 15:31:26 2009 +# Tue Apr 7 18:11:42 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -456,12 +456,15 @@ CONFIG_BT_HIDP=y # # Bluetooth device drivers # -# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIBTSDIO=y -# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIBCM203X=y CONFIG_BT_HCIBPA10X=y -# CONFIG_BT_HCIBFUSB is not set +CONFIG_BT_HCIBFUSB=y # CONFIG_BT_HCIBRF6150 is not set # CONFIG_BT_HCIH4P is not set # CONFIG_BT_HCIVHCI is not set -- cgit v1.2.3 From 949728423681eda38e5e34b84cd3281bba71fdf7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 7 Apr 2009 21:16:38 +0000 Subject: autoconf213-native: Added old autoconf for fennec recipe. --- conf/checksums.ini | 4 ++++ recipes/autoconf/autoconf213-native_2.13.bb | 9 +++++++++ recipes/autoconf/autoconf213_2.13.bb | 5 +++++ recipes/mozilla/fennec_hg.bb | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 recipes/autoconf/autoconf213-native_2.13.bb create mode 100644 recipes/autoconf/autoconf213_2.13.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 0b05edff44..48edc83a62 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1970,6 +1970,10 @@ sha256=fce50bc26351bbbe31154d9a734cb433ec8fb404efc5febd50c149e5eaf62449 md5=dc3fc7209752207c23e7c94ab886b340 sha256=636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc +[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz] +md5=9de56d4a161a723228220b0f425dc711 +sha256=f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e + [ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.57.tar.bz2] md5=407ea53787ce13f5ca427e9a51e05bc2 sha256=e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489 diff --git a/recipes/autoconf/autoconf213-native_2.13.bb b/recipes/autoconf/autoconf213-native_2.13.bb new file mode 100644 index 0000000000..3954ef3b16 --- /dev/null +++ b/recipes/autoconf/autoconf213-native_2.13.bb @@ -0,0 +1,9 @@ +require autoconf213_${PV}.bb + +DEPENDS = "m4-native gnu-config-native" +RDEPENDS_${PN} = "m4-native gnu-config-native" + +S = "${WORKDIR}/autoconf-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" + +inherit native diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb new file mode 100644 index 0000000000..022f696f1d --- /dev/null +++ b/recipes/autoconf/autoconf213_2.13.bb @@ -0,0 +1,5 @@ +require autoconf.inc +SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz" +PR = "r1" +EXTRA_OECONF = "--program-transform-name=s/\$/2.13/" +EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"' diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index fad2203ed5..18286a0ff2 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Mozilla Mobile browser" -DEPENDS += "cairo alsa-lib " +DEPENDS += "autoconf213-native cairo alsa-lib" PV = "0.9+1.0b2pre" MOZPV = "1.0b2pre" -- cgit v1.2.3 From 65c025a2e2ddcea38cfa61ed3c1fec396963f1d7 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 7 Apr 2009 23:29:30 +0200 Subject: zaurus-2.6.inc: add ZAURUS_KERNEL_IMAGETYPE - switch kernel types without re-editing the machine.conf files - using KERNEL_IMAGETYPE ?= here obliged to edit machine.conf --- conf/machine/include/zaurus-2.6.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 61b636bebb..5e4e1ac579 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -38,7 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen" KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGETYPE ?= "zImage" +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" -- cgit v1.2.3 From 9f0f45d82f181a85ab6e26c1ad12a49738005e68 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 15:25:00 -0700 Subject: checksums.ini: Add vala-0.6.0 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index e8647141ff..ce78b83e78 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -23198,6 +23198,10 @@ sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc md5=5e6c4ce07091725d9afdac7cf00e553c sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a +[http://download.gnome.org/sources/vala/0.6/vala-0.6.0.tar.bz2] +md5=9e5888a79757eb0f47df118b39762ed6 +sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5 + [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2] md5=9407d33961186814cef0e6ecedfd6318 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 -- cgit v1.2.3 From 69c119a2b998be63816a1d483bdb656fd33f11d2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 16:20:08 -0700 Subject: canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot. --- classes/canadian-sdk.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index d73b62f485..6b4fdf878a 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}" # and otherwise just DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " -SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}" + +# On mingw systems we want to have the real sysroot default to c:/... and +# assume that the default install will be on the C drive. This can be changed +# by setting SDK_REALPATH_MINGW. SDK_REALPATH = "${SDK_PATH}" -SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}" +SDK_REALPATH_MINGW ?= "C:" # Path prefixes prefix = "${SDK_PATH}" -- cgit v1.2.3 From ec31872ec8e83079e983869504eef39fa98a4233 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 16:20:42 -0700 Subject: binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR --- recipes/binutils/binutils-canadian-sdk_2.18.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb index cf27cd06f8..e44e7b7144 100644 --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb @@ -9,9 +9,12 @@ DEPENDS="\ " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" -EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} +# to the sysroot path. +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" +EXTRA_OECONF = "--with-sysroot=${SYSROOT} \ --program-prefix=${TARGET_PREFIX}" -PR = "r3" +PR = "r4" FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug" -- cgit v1.2.3 From ae48ce485442fa2c1a7d0552bf6b4ea10fe692cf Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 16:22:07 -0700 Subject: gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR. --- recipes/gcc/gcc-canadian-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-configure-canadian-sdk.inc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index ae3245bf7f..d78ab75c81 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r1" +PR = "r2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc index c95a6c41df..738b120a45 100644 --- a/recipes/gcc/gcc-configure-canadian-sdk.inc +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc @@ -61,11 +61,12 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres" EXTRA_OECONF_DEP ?= "" EXTRA_OECONF += "" +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} +# to the sysroot path. +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" EXTRA_OECONF_PATHS = " \ - --with-local-prefix=$dollar{prefix}/local \ - --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ - --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \ + --with-sysroot=${SYSROOT} \ " do_configure () { -- cgit v1.2.3 From c528cdb0ba96927d94a4a3c8389dfbc0e825903a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 8 Apr 2009 08:54:50 +0200 Subject: e-wm: fix profile selection in first-run wizard --- recipes/e17/e-wm/fix-profiles.diff | 10 ++++++++++ recipes/e17/e-wm_svn.bb | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 recipes/e17/e-wm/fix-profiles.diff diff --git a/recipes/e17/e-wm/fix-profiles.diff b/recipes/e17/e-wm/fix-profiles.diff new file mode 100644 index 0000000000..d6de73457e --- /dev/null +++ b/recipes/e17/e-wm/fix-profiles.diff @@ -0,0 +1,10 @@ +=================================================================== +--- e/src/bin/e_config.c (revision 39880) ++++ e/src/bin/e_config.c (revision 39889) +@@ -1134,5 +1134,5 @@ + } + dir = e_prefix_data_get(); +- len = snprintf(buf, sizeof(buf), "%s/data/config", dir); ++ len = snprintf(buf, sizeof(buf), "%s/data/config/", dir); + if (len >= (int)sizeof(buf)) + return NULL; diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index c9694fce80..e61bce88d3 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.050+svnr${SRCREV}" -PR = "r4" +PR = "r5" inherit e update-alternatives @@ -69,6 +69,7 @@ SRC_URI = "\ file://enlightenment_start.oe \ file://applications.menu \ file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \ + file://fix-profiles.diff;patch=1;maxrev=39889 \ " SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1 " -- cgit v1.2.3 From 8b680af5bcd7a1f34b3c5c266cd19257553bfb48 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 8 Apr 2009 08:56:25 +0200 Subject: diskio: new e17 module --- recipes/e17/diskio_svn.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/e17/diskio_svn.bb diff --git a/recipes/e17/diskio_svn.bb b/recipes/e17/diskio_svn.bb new file mode 100644 index 0000000000..3c0a8c7e71 --- /dev/null +++ b/recipes/e17/diskio_svn.bb @@ -0,0 +1,8 @@ +LICENSE = "MIT" +PV = "0.0.1+svnr${SRCREV}" + +require e-module.inc + + + + -- cgit v1.2.3 From a6169a4840b78f1fd26b4f0ccd3fb6e4ce3efb73 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 8 Apr 2009 09:00:03 +0200 Subject: e-wm-config-angstrom: refresh configs, add systray --- recipes/angstrom/e-wm-config-angstrom.bb | 9 +- recipes/angstrom/e-wm-config-angstrom/e.src | 146 ++++++++++++--------- .../e-wm-config-angstrom/module.cpufreq.src | 4 +- .../e-wm-config-angstrom/module.places.src | 6 + 4 files changed, 103 insertions(+), 62 deletions(-) diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb index a2c6f93657..4b47e05069 100644 --- a/recipes/angstrom/e-wm-config-angstrom.bb +++ b/recipes/angstrom/e-wm-config-angstrom.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Enlightenment DR17 theme for Angstrom" LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" RDEPENDS = "e-wm" -RRECOMMENDS_${PN} = "places" +RRECOMMENDS_${PN} = "places systray" -PR = "r4" +PR = "r5" SRC_URI = " \ file://e.src \ @@ -18,6 +18,11 @@ do_configure() { cp ${WORKDIR}/*.src ${WORKDIR}/*.desktop ${WORKDIR}/*.png ${S}/ } +# [09:16:17] * koen mumbles something about binary config file +# [09:16:19] eet -d e.cfg config e.src +# [09:16:29] will get u a test dump of it (as e.src) +# [09:17:09] eet -e e.cfg config e.src 1 +# [09:17:12] will re-encode do_compile() { for i in *.src ; do diff --git a/recipes/angstrom/e-wm-config-angstrom/e.src b/recipes/angstrom/e-wm-config-angstrom/e.src index 33514247d2..859323dc23 100644 --- a/recipes/angstrom/e-wm-config-angstrom/e.src +++ b/recipes/angstrom/e-wm-config-angstrom/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65836; + value "config_version" int: 65839; value "show_splash" int: 0; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -10,6 +10,7 @@ group "E_Config" struct { value "border_shade_transition" int: 3; value "border_shade_speed" double: 3000.0000000000000000000000000; value "framerate" double: 25.0000000000000000000000000; + value "priority" int: 0; value "image_cache" int: 4096; value "font_cache" int: 512; value "edje_cache" int: 32; @@ -19,8 +20,6 @@ group "E_Config" struct { value "use_virtual_roots" int: 0; value "show_desktop_icons" int: 1; value "edge_flip_dragging" int: 1; - value "edge_flip_moving" int: 1; - value "edge_flip_timeout" double: 0.2500000000000000000000000; value "evas_engine_default" int: 1; value "evas_engine_container" int: 0; value "evas_engine_init" int: 0; @@ -43,15 +42,15 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "start"; + value "name" string: "syscon"; value "enabled" uchar: 1; - value "delayed" uchar: 0; + value "delayed" uchar: 1; value "priority" int: 0; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "ibar"; + value "name" string: "msgbus_lang"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -59,7 +58,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "ibox"; + value "name" string: "connman"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -67,7 +66,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "clock"; + value "name" string: "places"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -75,7 +74,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "cpufreq"; + value "name" string: "mixer"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -83,15 +82,15 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "pager"; + value "name" string: "conf_window_remembers"; value "enabled" uchar: 1; - value "delayed" uchar: 0; + value "delayed" uchar: 1; value "priority" int: 0; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "exebuf"; + value "name" string: "conf_scale"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -99,7 +98,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "winlist"; + value "name" string: "conf_interaction"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -107,7 +106,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf"; + value "name" string: "fileman"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -115,7 +114,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_applications"; + value "name" string: "conf_engine"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -123,7 +122,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_borders"; + value "name" string: "conf_winlist"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -131,7 +130,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_clientlist"; + value "name" string: "conf_window_manipulation"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -139,7 +138,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_colors"; + value "name" string: "conf_window_focus"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -147,7 +146,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_desk"; + value "name" string: "conf_window_display"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -155,7 +154,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_desklock"; + value "name" string: "conf_wallpaper"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -163,7 +162,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_desks"; + value "name" string: "conf_transitions"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -171,7 +170,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_dialogs"; + value "name" string: "conf_theme"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -179,7 +178,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_display"; + value "name" string: "conf_startup"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -187,7 +186,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_dpms"; + value "name" string: "conf_shelves"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -195,7 +194,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_exebuf"; + value "name" string: "conf_screensaver"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -203,7 +202,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_fonts"; + value "name" string: "conf_profiles"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -211,7 +210,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_icon_theme"; + value "name" string: "conf_performance"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -219,7 +218,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_imc"; + value "name" string: "conf_paths"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -227,7 +226,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_intl"; + value "name" string: "conf_mouse_cursor"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -235,7 +234,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_keybindings"; + value "name" string: "conf_mousebindings"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -243,7 +242,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_menus"; + value "name" string: "conf_mouse"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -259,7 +258,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_mouse"; + value "name" string: "conf_menus"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -267,7 +266,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_mousebindings"; + value "name" string: "conf_keybindings"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -275,7 +274,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_mouse_cursor"; + value "name" string: "conf_intl"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -283,7 +282,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_paths"; + value "name" string: "conf_imc"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -291,7 +290,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_performance"; + value "name" string: "conf_icon_theme"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -299,7 +298,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_profiles"; + value "name" string: "conf_fonts"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -307,7 +306,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_screensaver"; + value "name" string: "conf_exebuf"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -315,7 +314,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_shelves"; + value "name" string: "conf_dpms"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -323,7 +322,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_startup"; + value "name" string: "conf_display"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -331,7 +330,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_theme"; + value "name" string: "conf_dialogs"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -339,7 +338,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_transitions"; + value "name" string: "conf_desks"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -347,7 +346,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_wallpaper"; + value "name" string: "conf_desklock"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -355,7 +354,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_window_display"; + value "name" string: "conf_desk"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -363,7 +362,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_window_focus"; + value "name" string: "conf_colors"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -371,7 +370,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_window_manipulation"; + value "name" string: "conf_clientlist"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -379,7 +378,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_winlist"; + value "name" string: "conf_borders"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -387,7 +386,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_engine"; + value "name" string: "conf_applications"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -395,7 +394,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "fileman"; + value "name" string: "conf"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -403,7 +402,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_interaction"; + value "name" string: "winlist"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -411,7 +410,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_scale"; + value "name" string: "exebuf"; value "enabled" uchar: 1; value "delayed" uchar: 1; value "priority" int: 0; @@ -419,15 +418,15 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "conf_window_remembers"; + value "name" string: "pager"; value "enabled" uchar: 1; - value "delayed" uchar: 1; + value "delayed" uchar: 0; value "priority" int: 0; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "mixer"; + value "name" string: "cpufreq"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -435,7 +434,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "places"; + value "name" string: "clock"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -443,7 +442,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "connman"; + value "name" string: "ibox"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -451,7 +450,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "msgbus_lang"; + value "name" string: "ibar"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -459,9 +458,17 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "syscon"; + value "name" string: "start"; value "enabled" uchar: 1; - value "delayed" uchar: 1; + value "delayed" uchar: 0; + value "priority" int: 0; + } + } + group "modules" list { + group "E_Config_Module" struct { + value "name" string: "systray"; + value "enabled" uchar: 1; + value "delayed" uchar: 0; value "priority" int: 0; } } @@ -1655,6 +1662,25 @@ group "E_Config" struct { value "resizable" uchar: 0; } } + group "clients" list { + group "E_Config_Gadcon_Client" struct { + value "name" string: "systray"; + value "id" string: "systr