Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2308 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r2309 - in trunk/src/host/qemu-neo1973: gnokiigsm hw
([EMAIL PROTECTED])
3. r2310 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
4. r2311 - in trunk/oe/packages/upstart: . files
([EMAIL PROTECTED])
5. r2312 - trunk/oe/packages/mpg123 ([EMAIL PROTECTED])
6. r2313 - trunk/oe/packages/libmrss ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-06-20 16:27:40 +0200 (Wed, 20 Jun 2007)
New Revision: 2308
Modified:
trunk/src/target/kernel/patches/gta01-jbt6k74.patch
Log:
* actually transition to the new state, if state change was successful
* fix parsing of state name if presented from userspace via sysfs
Modified: trunk/src/target/kernel/patches/gta01-jbt6k74.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-jbt6k74.patch 2007-06-20 07:57:02 UTC
(rev 2307)
+++ trunk/src/target/kernel/patches/gta01-jbt6k74.patch 2007-06-20 14:27:40 UTC
(rev 2308)
@@ -1,10 +1,10 @@
This driver adds support for LCM initialization of the JBT6K74 LCM
as found on the FIC GTA01 hardware
-Index: linux-2.6.21-moko/drivers/spi/Kconfig
+Index: linux-2.6.21.3-moko/drivers/spi/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/spi/Kconfig
-+++ linux-2.6.21-moko/drivers/spi/Kconfig
+--- linux-2.6.21.3-moko.orig/drivers/spi/Kconfig
++++ linux-2.6.21.3-moko/drivers/spi/Kconfig
@@ -160,5 +160,9 @@
# (slave support would go here)
@@ -15,21 +15,21 @@
+
endmenu # "SPI support"
-Index: linux-2.6.21-moko/drivers/spi/Makefile
+Index: linux-2.6.21.3-moko/drivers/spi/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/spi/Makefile
-+++ linux-2.6.21-moko/drivers/spi/Makefile
+--- linux-2.6.21.3-moko.orig/drivers/spi/Makefile
++++ linux-2.6.21.3-moko/drivers/spi/Makefile
@@ -30,4 +30,5 @@
# ... add above this line ...
# SPI slave drivers (protocol for that link)
+obj-$(CONFIG_SPI_SLAVE_JBT6K74) += jbt6k74.o
# ... add above this line ...
-Index: linux-2.6.21-moko/drivers/spi/jbt6k74.c
+Index: linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/spi/jbt6k74.c
-@@ -0,0 +1,540 @@
++++ linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
+@@ -0,0 +1,543 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -360,6 +360,8 @@
+ }
+ break;
+ }
++ if (rc == 0)
++ jbt->state = new_state;
+
+ return rc;
+}
@@ -393,7 +395,8 @@
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
-+ if (!strcmp(buf, jbt_state_names[i])) {
++ if (!strncmp(buf, jbt_state_names[i],
++ strlen(jbt_state_names[i]))) {
+ jbt6k74_enter_state(jbt, i);
+ return count;
+ }
@@ -570,10 +573,10 @@
+
+module_init(jbt_init);
+module_exit(jbt_exit);
-Index: linux-2.6.21-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.21-moko/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.21.3-moko.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
@@ -106,6 +106,7 @@
config MACH_QT2410
bool "QT2410"
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-06-20 20:19:13 +0200 (Wed, 20 Jun 2007)
New Revision: 2309
Modified:
trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
trunk/src/host/qemu-neo1973/hw/modem.c
trunk/src/host/qemu-neo1973/hw/neo1973.c
Log:
Add a GSM modem power up delay so that the modem doesn't start before gsmd
(gsmd should probably be started before the power gpio asserted to avoid timing
issue).
Clean up parts of the AT parser.
Disable the AT greeting, make gsmd happy.
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-06-20 14:27:40 UTC
(rev 2308)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-06-20 18:19:13 UTC
(rev 2309)
@@ -343,19 +343,21 @@
char *string_val[];
};
-bool gn_atem_parse_option(char *buf, struct gn_atem_op *op, char *val)
+bool gn_atem_parse_option(char **buf, struct gn_atem_op *op, char *val)
{
char buffer[MAX_LINE_LENGTH], **strval;
int len;
- if (buf[0] == 0 || (buf[0] == '?' && buf[1] == 0)) {
+ if ((*buf)[0] == 0 || ((*buf)[0] == '?' && (*buf)[1] == 0)) {
+ *buf += strlen(*buf);
gsprintf(buffer, MAX_LINE_LENGTH, "%s: %s\r\n", op->op, val);
gn_atem_string_out(buffer);
return (false);
}
- if (*buf++ != '=')
+ if (*(*buf) ++ != '=')
return (true);
- if (!strcasecmp(buf, "?")) {
+ if (!strcasecmp(*buf, "?")) {
+ (*buf) ++;
len = gsprintf(buffer, MAX_LINE_LENGTH, "%s: ", op->op);
switch (op->type) {
case gn_var_string:
@@ -392,17 +394,22 @@
switch (op->type) {
case gn_var_string:
for (strval = op->string_val; *strval; strval++)
- if (!strcasecmp(buf, *strval)) {
+ if (!strcasecmp(*buf, *strval)) {
gsprintf(val, MAX_LINE_LENGTH,
"\"%s\"", *strval);
+ *buf += strlen(*buf);
return (false);
}
break;
case gn_var_bool:
- if (!strcasecmp(buf, "0") || !strcasecmp(buf, "1")) {
- strncpy(val, buf, MAX_LINE_LENGTH);
+ switch (gn_atem_num_get(buf)) {
+ case 0:
+ strcpy(val, "0");
return (false);
+ case 1:
+ strcpy(val, "1");
+ return (false);
}
break;
@@ -577,7 +584,6 @@
},
};
-
/* Parser for standard AT commands. cmd_buffer must be null terminated. */
void gn_atem_at_parse(char *cmd_buffer)
{
@@ -585,7 +591,8 @@
int regno, val;
char str[256];
- if (!cmd_buffer[0]) return;
+ if (!cmd_buffer[0])
+ return;
if (strncasecmp (cmd_buffer, "AT", 2) != 0) {
gn_atem_modem_result(MR_ERROR);
@@ -786,7 +793,7 @@
}
break;
- /* Handle AT* commands (Nokia proprietary I think) */
+ /* Handle AT* commands (Nokia proprietary I think) */
case '*':
buf++;
if (!strcasecmp(buf, "NOKIATEST")) {
@@ -807,7 +814,8 @@
/* AT+WS46 is wireless network selection */
if (strncasecmp(buf, "WS46", 3) == 0) {
- if (!gn_atem_parse_option(buf + 4,
+ buf += 4;
+ if (!gn_atem_parse_option(&buf,
&gn_atem_op_ws46, data.ws46))
break;
}
@@ -851,7 +859,8 @@
case '%':
buf++;
if (strncasecmp(buf, "BAND", 3) == 0) {
- if (!gn_atem_parse_option(buf + 4,
+ buf += 4;
+ if (!gn_atem_parse_option(&buf,
&gn_atem_op_band, data.band))
break;
}
@@ -1281,101 +1290,103 @@
/* AT+CSCS is character set selection */
if (strncasecmp(*buf, "SCS", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cscs, data.cscs);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cscs, data.cscs);
}
/* AT+CIMI is international mobile subscriber identity */
if (strcasecmp(*buf, "IMI") == 0) {
+ buf[0] += 3;
gn_atem_string_out("QEMU_IMSI\r\n");
return (false);
}
/* AT+CMUX is multiplexing mode */
if (strncasecmp(*buf, "MUX", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cmux, data.cmux);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cmux, data.cmux);
}
/* AT+CSTA is address type selection */
if (strncasecmp(*buf, "STA", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_csta, data.csta);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_csta, data.csta);
}
/* AT+CMOD is call mode */
if (strncasecmp(*buf, "MOD", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cmod, data.cmod);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cmod, data.cmod);
}
/* AT+CBST is bearer service type */
if (strncasecmp(*buf, "BST", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cbst, data.cbst);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cbst, data.cbst);
}
/* AT+CRLP is radio link protocol */
if (strncasecmp(*buf, "RLP", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_crlp, data.crlp);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_crlp, data.crlp);
}
+ /* AT+CRC is cellular result codes */
+ if (strncasecmp(*buf, "RC", 2) == 0) {
+ buf[0] += 2;
+ return gn_atem_parse_option(buf, &gn_atem_op_crc, data.crc);
+ }
+
/* AT+CR is reporting control */
if (strncasecmp(*buf, "R", 1) == 0) {
- return gn_atem_parse_option(buf[0] + 1,
- &gn_atem_op_cr, data.cr);
+ buf[0] += 1;
+ return gn_atem_parse_option(buf, &gn_atem_op_cr, data.cr);
}
/* AT+CEER is extended error report */
if (strncasecmp(*buf, "EER", 3) == 0) {
+ buf[0] += 3;
gn_atem_string_out("+CEER: 0,0,5,16,normal call clearing\r\n");
return (false);
}
- /* AT+CRC is cellular result codes */
- if (strncasecmp(*buf, "RC", 2) == 0) {
- return gn_atem_parse_option(buf[0] + 2,
- &gn_atem_op_crc, data.crc);
- }
-
/* AT+CSNS is single numbering scheme */
if (strncasecmp(*buf, "SNS", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_csns, data.csns);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_csns, data.csns);
}
/* AT+CREG is network registration */
if (strncasecmp(*buf, "REG", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_creg, data.creg);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_creg, data.creg);
}
/* AT+COPS is PLMN selection */
if (strncasecmp(*buf, "OPS", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cops, data.cops);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cops, data.cops);
}
/* AT+CPAS is phone activity status */
if (strncasecmp(*buf, "PAS", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cpas, data.cpas);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cpas, data.cpas);
}
/* AT+CFUN is phone functionality */
if (strncasecmp(*buf, "FUN", 3) == 0) {
- return gn_atem_parse_option(buf[0] + 3,
- &gn_atem_op_cfun, data.cfun);
+ buf[0] += 3;
+ return gn_atem_parse_option(buf, &gn_atem_op_cfun, data.cfun);
}
if (strncasecmp(*buf, "BC", 2) == 0) {
- return gn_atem_parse_option(buf[0] + 2,
- &gn_atem_op_cbc, data.cbc);
+ buf[0] += 2;
+ return gn_atem_parse_option(buf, &gn_atem_op_cbc, data.cbc);
}
- if (strncasecmp(*buf, "CSSN", 2) == 0) {
- return gn_atem_parse_option(buf[0] + 2,
- &gn_atem_op_cssn, data.cssn);
+ if (strncasecmp(*buf, "CSSN", 4) == 0) {
+ buf[0] += 4;
+ return gn_atem_parse_option(buf, &gn_atem_op_cssn, data.cssn);
}
return (true);
@@ -1516,13 +1527,12 @@
command mode - data pump is used when connected. */
void gn_atem_string_out(char *buffer)
{
- int count = 0;
char out_char;
- while (count < strlen(buffer)) {
+ while (*buffer) {
/* Translate CR/LF/BS as appropriate */
- switch (buffer[count]) {
+ switch (*buffer) {
case '\r':
out_char = ModemRegisters[REG_CR];
break;
@@ -1533,11 +1543,11 @@
out_char = ModemRegisters[REG_BS];
break;
default:
- out_char = buffer[count];
+ out_char = *buffer;
break;
}
sm->info->write(sm->info->opaque, "%c", out_char);
- count++;
+ buffer ++;
}
}
Modified: trunk/src/host/qemu-neo1973/hw/modem.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/modem.c 2007-06-20 14:27:40 UTC (rev
2308)
+++ trunk/src/host/qemu-neo1973/hw/modem.c 2007-06-20 18:19:13 UTC (rev
2309)
@@ -167,8 +167,10 @@
case CHR_IOCTL_MODEM_HANDSHAKE:
if (!s->enable)
return -ENOTSUP;
+#if 0
if (*(int *) arg)
modem_resp(s, "AT-Command Interpreter Ready\r\nOK\r\n");
+#endif
break;
default:
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-06-20 14:27:40 UTC (rev
2308)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-06-20 18:19:13 UTC (rev
2309)
@@ -70,6 +70,7 @@
i2c_slave *wm;
i2c_slave *lcm;
CharDriverState *modem;
+ QEMUTimer *modem_timer;
qemu_irq *kbd_pic;
const char *kernel;
};
@@ -102,10 +103,29 @@
neo_printf("Modem reset.\n");
}
+static void neo_modem_switch_tick(void *opaque)
+{
+ struct neo_board_s *s = (struct neo_board_s *) opaque;
+ modem_enable(s->modem, 1);
+}
+
static void neo_modem_switch(void *opaque, int line, int level)
{
struct neo_board_s *s = (struct neo_board_s *) opaque;
- modem_enable(s->modem, level);
+
+ /* The GSM modem seems to take a little while to power up and
+ * start talking to the serial. This turns out to be critical because
+ * before gsmd runs and disables Local Echo for the UART, everything
+ * that the modem outputs is looped back and confuses the parser.
+ */
+ if (level)
+ qemu_mod_timer(s->modem_timer, qemu_get_clock(vm_clock) +
+ (ticks_per_sec >> 4));
+ else {
+ qemu_del_timer(s->modem_timer);
+ modem_enable(s->modem, 0);
+ }
+
neo_printf("Modem powered %s.\n", level ? "up" : "down");
}
@@ -359,10 +379,9 @@
static void neo_gsm_setup(struct neo_board_s *s)
{
s->modem = modem_init();
+ s->modem_timer = qemu_new_timer(vm_clock, neo_modem_switch_tick, s);
-#if 0
s3c_uart_attach(s->cpu->uart[0], s->modem);
-#endif
}
static void neo_reset(void *opaque)
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-06-20 20:27:57 +0200 (Wed, 20 Jun 2007)
New Revision: 2310
Modified:
trunk/src/host/qemu-neo1973/sdl.c
trunk/src/host/qemu-neo1973/vl.c
Log:
On shutdown start the emulation if it's paused.
Modified: trunk/src/host/qemu-neo1973/sdl.c
===================================================================
--- trunk/src/host/qemu-neo1973/sdl.c 2007-06-20 18:19:13 UTC (rev 2309)
+++ trunk/src/host/qemu-neo1973/sdl.c 2007-06-20 18:27:57 UTC (rev 2310)
@@ -451,7 +451,7 @@
break;
case SDL_QUIT:
if (!no_quit) {
- qemu_system_shutdown_request();
+ qemu_system_shutdown_request();
}
break;
case SDL_MOUSEMOTION:
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-06-20 18:19:13 UTC (rev 2309)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-06-20 18:27:57 UTC (rev 2310)
@@ -6523,6 +6523,8 @@
shutdown_requested = 1;
if (cpu_single_env)
cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
+ /* In case the emulation is stopped */
+ vm_start();
}
void qemu_system_powerdown_request(void)
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-20 23:35:03 +0200 (Wed, 20 Jun 2007)
New Revision: 2311
Added:
trunk/oe/packages/upstart/files/autoconf_version.patch
trunk/oe/packages/upstart/oe-sync
trunk/oe/packages/upstart/upstart.inc
trunk/oe/packages/upstart/upstart_0.3.8.bb
Removed:
trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
trunk/oe/packages/upstart/upstart_0.3.5.bb
Log:
* Update upstart to 0.3.8. Introduces no problems as we don't use it atm and
brings us in sync with OE.dev
Added: trunk/oe/packages/upstart/files/autoconf_version.patch
===================================================================
--- trunk/oe/packages/upstart/files/autoconf_version.patch 2007-06-20
18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/files/autoconf_version.patch 2007-06-20
21:35:03 UTC (rev 2311)
@@ -0,0 +1,12 @@
+Index: upstart-0.3.8/configure.ac
+===================================================================
+--- upstart-0.3.8.orig/configure.ac 2007-05-09 22:02:14.000000000 +0200
++++ upstart-0.3.8/configure.ac 2007-05-09 22:02:24.000000000 +0200
+@@ -1,6 +1,6 @@
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.60)
++AC_PREREQ(2.59)
+ AC_INIT([upstart], [0.3.8], [EMAIL PROTECTED])
+ AC_COPYRIGHT([[Copyright © 2007 Canonical Ltd.]])
+ AC_CONFIG_SRCDIR([init/main.c])
Deleted: trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
===================================================================
--- trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
2007-06-20 21:35:03 UTC (rev 2311)
@@ -1,62 +0,0 @@
-Index: upstart-0.3.5/init/event.h
-===================================================================
---- upstart-0.3.5.orig/init/event.h 2007-02-09 18:28:56.000000000 +0000
-+++ upstart-0.3.5/init/event.h 2007-03-09 01:43:14.000000000 +0000
-@@ -123,6 +123,13 @@
- **/
- #define KBDREQUEST_EVENT "kbdrequest"
-
-+/**
-+ * POWEROKFAIL_EVENT:
-+ *
-+ * Name of the event that we generate when the system power failes
-+ **/
-+#define POWEROKFAIL_EVENT "pwrokfail"
-+
-
- /**
- * JOB_STARTING_EVENT:
-Index: upstart-0.3.5/init/main.c
-===================================================================
---- upstart-0.3.5.orig/init/main.c 2007-02-09 21:14:55.000000000 +0000
-+++ upstart-0.3.5/init/main.c 2007-03-09 01:44:34.000000000 +0000
-@@ -64,6 +64,7 @@
- static void reset_console (void);
- static void crash_handler (int signum);
- static void cad_handler (void *data, NihSignal *signal);
-+static void pof_handler (void *data, NihSignal *signal);
- static void kbd_handler (void *data, NihSignal *signal);
- static void stop_handler (void *data, NihSignal *signal);
- static void term_handler (const char *prog, NihSignal *signal);
-@@ -227,6 +228,8 @@
- reboot (RB_DISABLE_CAD);
- NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
-
-+ NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pof_handler, NULL));
-+
- /* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
- * generate a kbdrequest event.
- */
-@@ -396,6 +399,22 @@
- }
-
- /**
-+ * pof_handler:
-+ * @data: unused,
-+ * @signal: signal that called this handler.
-+ *
-+ * Handle having recieved the SIGPWR signal, sent to us when the kernel
-+ * detects a power failure. We just generate a
-+ * pwrokfail event.
-+ **/
-+static void
-+pof_handler (void *data,
-+ NihSignal *signal)
-+{
-+ event_emit (POWEROKFAIL_EVENT, NULL, NULL);
-+}
-+
-+/**
- * kbd_handler:
- * @data: unused,
- * @signal: signal that called this handler.
Added: trunk/oe/packages/upstart/oe-sync
===================================================================
Added: trunk/oe/packages/upstart/upstart.inc
===================================================================
--- trunk/oe/packages/upstart/upstart.inc 2007-06-20 18:27:57 UTC (rev
2310)
+++ trunk/oe/packages/upstart/upstart.inc 2007-06-20 21:35:03 UTC (rev
2311)
@@ -0,0 +1,26 @@
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = ""
+DESCRIPTION = "Event driven system init"
+LICENSE = "GPL"
+
+inherit autotools pkgconfig
+
+# --enable-compat builds halt, reboot, shutdown tools
+EXTRA_OECONF += "--enable-compat"
+
+do_stage () {
+ autotools_stage_all
+}
+
+# libupstart can be used for upstart event generation from other programs.
+# However it is not used by upstart itself, so package it seperately.
+PACKAGES =+ "libupstart libupstart-dev"
+FILES_libupstart += "${libdir}/libupstart.so.*"
+FILES_libupstart-dev += "${libdir}/libupstart.* ${includedir}/upstart/"
+
+# upstart-sysvcompat provides Sys V Init compatible tools: halt, reboot,
+# shutdown, telinit. These might be needed by other scripts.
+PACKAGES =+ "upstart-sysvcompat upstart-sysvtools-doc"
+FILES_upstart-sysvcompat += "${sbindir}/reboot ${sbindir}/halt
${sbindir}/shutdown ${sbindir}/telinit"
+FILES_upstart-sysvcompat-doc += "${mandir}/*/reboot.* ${mandir}/*/halt.*
${mandir}/*/shutdown.* ${mandir}/*/telinit.*"
Deleted: trunk/oe/packages/upstart/upstart_0.3.5.bb
===================================================================
--- trunk/oe/packages/upstart/upstart_0.3.5.bb 2007-06-20 18:27:57 UTC (rev
2310)
+++ trunk/oe/packages/upstart/upstart_0.3.5.bb 2007-06-20 21:35:03 UTC (rev
2311)
@@ -1,51 +0,0 @@
-DESCRIPTION = "Upstart: An event-based replacement for the /sbin/init daemon"
-HOMEPAGE = "http://upstart.ubuntu.com/";
-SECTION = "base"
-LICENSE = "GPL"
-PR = "r2"
-
-FILESDIR = "[EMAIL PROTECTED](bb.data.getVar('FILE',d,1))}/files"
-
-SRC_URI = "http://upstart.ubuntu.com/download/upstart-0.3.5.tar.bz2 \
- file://upstart-0.3.5-pwrokfail.patch;patch=1 \
- "
-inherit autotools update-alternatives
-
-ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "${base_sbindir}/init"
-ALTERNATIVE_PATH = "${base_sbindir}/init.upstart"
-ALTERNATIVE_PRIORITY = 60
-
-EXTRA_OECONF = "--enable-compat=sysv --sbindir=${base_sbindir}
--libdir=${base_libdir}"
-#EXTRA_OECONF = "--enable-compat=sysv"
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
- mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN}
- # initctl
- mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
- # runlevel
- mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
- # telinit
- mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
- # poweroff
- # logd
-}
-
-pkg_postinst_${PN} () {
- update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
- update-alternatives --install ${base_sbindir}/reboot reboot
reboot.${PN} 200
- update-alternatives --install ${base_sbindir}/shutdown shutdown
shutdown.${PN} 200
-}
-
-pkg_prerm_${PN} () {
- update-alternatives --remove halt halt.${PN}
- update-alternatives --remove reboot reboot.${PN}
- update-alternatives --remove shutdown shutdown.${PN}
-}
-
Added: trunk/oe/packages/upstart/upstart_0.3.8.bb
===================================================================
--- trunk/oe/packages/upstart/upstart_0.3.8.bb 2007-06-20 18:27:57 UTC (rev
2310)
+++ trunk/oe/packages/upstart/upstart_0.3.8.bb 2007-06-20 21:35:03 UTC (rev
2311)
@@ -0,0 +1,7 @@
+require upstart.inc
+
+SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
+file://autoconf_version.patch;patch=1"
+
+PR = "r1"
+
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-20 23:57:33 +0200 (Wed, 20 Jun 2007)
New Revision: 2312
Added:
trunk/oe/packages/mpg123/oe-sync
Modified:
trunk/oe/packages/mpg123/mpg123_0.66.bb
Log:
* Catch up with OE.dev. Just some meta informations added
Modified: trunk/oe/packages/mpg123/mpg123_0.66.bb
===================================================================
--- trunk/oe/packages/mpg123/mpg123_0.66.bb 2007-06-20 21:35:03 UTC (rev
2311)
+++ trunk/oe/packages/mpg123/mpg123_0.66.bb 2007-06-20 21:57:33 UTC (rev
2312)
@@ -1,5 +1,11 @@
+DESCRIPTION = "mpg123 is a fast and free console based real time MPEG Audio
Player \
+for Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
+LICENSE = "LGPL"
+DESCRIPTION = "multimedia"
+HOMEPAGE = "http://www.mpg123.de";
+RCONFLICTS = "mpg321"
+RREPLACES = "mpg321"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2"
inherit autotools
-
-
Added: trunk/oe/packages/mpg123/oe-sync
===================================================================
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-21 00:11:51 +0200 (Thu, 21 Jun 2007)
New Revision: 2313
Added:
trunk/oe/packages/libmrss/oe-sync
Log:
* libmrrs is already in sync with OE.dev
Added: trunk/oe/packages/libmrss/oe-sync
===================================================================
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
