Hello community, here is the log from the commit of package powerpc-utils checked in at Wed Aug 15 20:35:54 CEST 2007. -------- --- arch/ppc/powerpc-utils/powerpc-utils.changes 2007-08-13 16:23:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/powerpc-utils/powerpc-utils.changes 2007-08-14 12:07:09.406946000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 14 11:29:51 CEST 2007 - sassmann@suse.de + +- changed petitboot editor keyboard layout to QWERTY +- removed debug output from petitboot +- improved event handling in petitboot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.K13280/_old 2007-08-15 20:35:38.000000000 +0200 +++ /var/tmp/diff_new_pack.K13280/_new 2007-08-15 20:35:38.000000000 +0200 @@ -17,7 +17,7 @@ Obsoletes: ppc64-utils Provides: ppc64-utils Version: 1.0.0 -Release: 200704280161 +Release: 200704280163 License: IBM Public License URL: http://powerpc-utils.ozlabs.org/ Group: System/Management @@ -196,6 +196,10 @@ %config %attr (755,root,root) /etc/init.d/ibmvscsis.sh %changelog +* Tue Aug 14 2007 - sassmann@suse.de +- changed petitboot editor keyboard layout to QWERTY +- removed debug output from petitboot +- improved event handling in petitboot * Mon Aug 13 2007 - sassmann@suse.de - added rudimentary editor for petitboot - resized petitboot loading jpg to gain some space ++++++ petitboot-0.0.1.tar.bz2 ++++++ Files old/petitboot-0.0.1/artwork/loading.jpg and new/petitboot-0.0.1/artwork/loading.jpg differ ++++++ petitboot.cmdline-editor.patch ++++++ --- /var/tmp/diff_new_pack.K13280/_old 2007-08-15 20:35:43.000000000 +0200 +++ /var/tmp/diff_new_pack.K13280/_new 2007-08-15 20:35:43.000000000 +0200 @@ -20,18 +20,19 @@ #define PBOOT_LEFT_PANE_SIZE 160 #define PBOOT_LEFT_PANE_COLOR 0x80000000 -@@ -86,6 +88,10 @@ static int select_rpane_on_startup; +@@ -86,6 +88,11 @@ static int select_rpane_on_startup; #define PBOOT_STATUS_TEXT_SIZE (16 * TWIN_FIXED_ONE) #define PBOOT_STATUS_TEXT_COLOR 0xff000000 +#define EDIT_KERNEL 1 +#define EDIT_INITRD 2 +#define EDIT_BOOTARGS 3 ++#define EDIT_BUF_SIZE 1024 + typedef struct _pboot_option pboot_option_t; typedef struct _pboot_device pboot_device_t; -@@ -519,6 +525,212 @@ static void pboot_choose_option(void) +@@ -519,6 +526,213 @@ static void pboot_choose_option(void) pboot_exec_option(opt->data); } @@ -51,7 +52,7 @@ +0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ +}; + -+static char pboot_edit_buf[1024]; ++static char pboot_edit_buf[EDIT_BUF_SIZE]; +static int edit_in_progress; + +int choose_edit_option (int option_attr) @@ -71,17 +72,17 @@ + switch (option_attr) { + case EDIT_KERNEL: + pboot_message(option->boot_image_file); -+ strncpy(pboot_edit_buf, option->boot_image_file, ++ strncpy(pboot_edit_buf, option->boot_image_file, + strlen(option->boot_image_file)); + break; + case EDIT_INITRD: + pboot_message(option->initrd_file); -+ strncpy(pboot_edit_buf, option->initrd_file, ++ strncpy(pboot_edit_buf, option->initrd_file, + strlen(option->initrd_file)); + break; + case EDIT_BOOTARGS: + pboot_message(option->boot_args); -+ strncpy(pboot_edit_buf, option->boot_args, ++ strncpy(pboot_edit_buf, option->boot_args, + strlen(option->boot_args)); + break; + default: @@ -95,12 +96,12 @@ +{ + unsigned int text_len; + text_len = strlen(pboot_edit_buf); -+ if (text_len > 1022) ++ if (text_len > 1022) + return -1; + + pboot_edit_buf[text_len] = key; + pboot_edit_buf[text_len+1] = '\0'; -+ pboot_message(pboot_edit_buf); ++ pboot_message(pboot_edit_buf); + return 0; +} + @@ -146,8 +147,9 @@ + case TwinEventKeyDown: + switch(event->u.key.key) { + case KEY_ENTER: -+ save_edit_option(pboot_edit_buf); ++ save_edit_option(pboot_edit_buf); + edit_in_progress = 0; ++ memset(pboot_edit_buf,0,EDIT_BUF_SIZE); + pboot_rpane->window->event = pboot_rpane_event; + pboot_message("keys: c=changeres e=edit del=GameOS ESC=quit"); + return TWIN_TRUE; @@ -244,7 +246,7 @@ static twin_bool_t pboot_rpane_event (twin_window_t *window, twin_event_t *event) { -@@ -550,8 +762,19 @@ static twin_bool_t pboot_rpane_event (tw +@@ -550,10 +764,25 @@ static twin_bool_t pboot_rpane_event (tw pboot_set_rfocus(pboot_rpane->focus_curindex + 1); return TWIN_TRUE; case KEY_LEFT: @@ -263,8 +265,14 @@ + return TWIN_TRUE; case KEY_ENTER: pboot_choose_option(); ++ case KEY_BACKSPACE: ++ system("ps3-boot-game-os"); ++ pboot_message("boot GameOS failed!"); ++ break; default: -@@ -564,24 +787,6 @@ static twin_bool_t pboot_rpane_event (tw + break; + } +@@ -564,24 +793,6 @@ static twin_bool_t pboot_rpane_event (tw return TWIN_FALSE; } @@ -289,7 +297,7 @@ int pboot_add_option(int devindex, const char *title, const char *subtitle, twin_pixmap_t *badge, const char *default_prio, void *data) -@@ -816,8 +1021,14 @@ static twin_bool_t pboot_lpane_event (tw +@@ -816,8 +1025,18 @@ static twin_bool_t pboot_lpane_event (tw pboot_set_lfocus(pboot_lpane->focus_curindex + 1); return TWIN_TRUE; case KEY_RIGHT: @@ -298,13 +306,17 @@ return TWIN_TRUE; + case KEY_C: + option_timer_starttime = -1; -+ pboot_rpane->window->event = pboot_changeres_event; ++ pboot_lpane->window->event = pboot_changeres_event; + pboot_message("res: 0=auto 1=720p 2=1080i 3=1080p"); + return TWIN_TRUE; ++ case KEY_BACKSPACE: ++ system("ps3-boot-game-os"); ++ pboot_message("boot GameOS failed!"); ++ break; default: break; } -@@ -828,15 +1039,6 @@ static twin_bool_t pboot_lpane_event (tw +@@ -828,15 +1047,6 @@ static twin_bool_t pboot_lpane_event (tw return TWIN_FALSE; } @@ -320,7 +332,7 @@ twin_bool_t pboot_event_filter(twin_screen_t *screen, twin_event_t *event) -@@ -855,6 +1057,7 @@ twin_bool_t pboot_event_filter(twin_scre +@@ -855,6 +1065,7 @@ twin_bool_t pboot_event_filter(twin_scre case TwinEventKeyDown: switch(event->u.key.key) { /* Gross hack for video modes, need something better ! */ @@ -328,7 +340,7 @@ case KEY_0: pboot_vmode_change = 0; /* auto */ pboot_changeres(); -@@ -871,12 +1074,12 @@ twin_bool_t pboot_event_filter(twin_scre +@@ -871,12 +1082,12 @@ twin_bool_t pboot_event_filter(twin_scre pboot_vmode_change = 5; /* 1080p */ pboot_changeres(); return TWIN_TRUE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org