Hello community, here is the log from the commit of package powerpc-utils checked in at Fri Aug 24 01:56:45 CEST 2007. -------- --- arch/ppc/powerpc-utils/powerpc-utils.changes 2007-08-21 15:28:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/powerpc-utils/powerpc-utils.changes 2007-08-23 15:38:33.120598000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 23 14:41:53 CEST 2007 - sassmann@suse.de + +- fixed bug in libtwin which reversed key_up/key_down handling + (libtwin.key-up-down.patch) +- petitboot-editor now handles ctrl and shift keys + (petitboot-editor-enhancement.patch) + +------------------------------------------------------------------- +Wed Aug 22 16:07:38 CEST 2007 - sassmann@suse.de + +- changed ps3fb size from 18 to 9MB to save RAM in ps3config + +------------------------------------------------------------------- New: ---- libtwin.key-up-down.patch petitboot.cleanup.patch petitboot.editor-enhancement.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.kz3839/_old 2007-08-24 01:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.kz3839/_new 2007-08-24 01:56:22.000000000 +0200 @@ -17,7 +17,7 @@ Obsoletes: ppc64-utils Provides: ppc64-utils Version: 1.0.0 -Release: 200704280168 +Release: 200704280170 License: IBM Public License URL: http://powerpc-utils.ozlabs.org/ Group: System/Management @@ -43,6 +43,7 @@ Patch4: powerpc-utils.bootlist.easy-network-dev.patch Patch5: powerpc-utils.nvram.short-write.patch Patch6: powerpc-utils.ofpathname.flat-device-tree.patch +Patch10: libtwin.key-up-down.patch Patch20: petitboot.root-dev-ram.patch Patch21: petitboot.kboot-parser.patch Patch22: petitboot.yaboot-parser.patch @@ -54,6 +55,8 @@ Patch30: petitboot.cmdline-editor.patch Patch31: petitboot.focus-disappear-on-switch-fix.patch Patch32: ps3av-debug.patch +Patch33: petitboot.cleanup.patch +Patch34: petitboot.editor-enhancement.patch %define build_kernel 1 %description @@ -81,6 +84,7 @@ %patch6 -p1 cd powerpc-utils-papr-%{papr_version} cd .. +%patch10 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 @@ -92,6 +96,8 @@ %patch30 -p1 %patch31 -p1 #%patch32 -p1 +%patch33 -p1 +%patch34 -p1 %build # workaround for using gcc41 to build @@ -112,7 +118,7 @@ cd libtwin-0.0.2 autoreconf -fi LDFLAGS="-s" \ -CFLAGS="-Wall -Os" \ +CFLAGS="-Wall -O -g" \ ./configure \ --prefix=%{_prefix} make %{?jobs:-j%jobs} @@ -122,7 +128,7 @@ # make petitboot cd petitboot-0.0.1 make all \ - CFLAGS="-Wall -I`pwd`/../install-libtwin%{_prefix}/include -I. -Os" \ + CFLAGS="-Wall -I`pwd`/../install-libtwin%{_prefix}/include -I. -O -g" \ LDFLAGS=" -L`pwd`/../install-libtwin%{_libdir} -ltwin -lpng12 -ljpeg -lz" make install \ DESTDIR=`pwd`/../install-petitboot @@ -200,6 +206,13 @@ %config %attr (755,root,root) /etc/init.d/ibmvscsis.sh %changelog +* Thu Aug 23 2007 - sassmann@suse.de +- fixed bug in libtwin which reversed key_up/key_down handling + (libtwin.key-up-down.patch) +- petitboot-editor now handles ctrl and shift keys + (petitboot-editor-enhancement.patch) +* Wed Aug 22 2007 - sassmann@suse.de +- changed ps3fb size from 18 to 9MB to save RAM in ps3config * Mon Aug 20 2007 - sassmann@suse.de - added missing '-' key to petitboot editor - enable /proc/config.gz (CONFIG_IKCONFIG_PROC=y) ++++++ libtwin.key-up-down.patch ++++++ Index: powerpc-utils-1.0.0/libtwin-0.0.2/libtwin/twin_fbdev.c =================================================================== --- powerpc-utils-1.0.0.orig/libtwin-0.0.2/libtwin/twin_fbdev.c +++ powerpc-utils-1.0.0/libtwin-0.0.2/libtwin/twin_fbdev.c @@ -305,7 +305,7 @@ static twin_bool_t twin_fbdev_read_event kill(0, SIGINT); break; default: - evt.kind = down ? TwinEventKeyDown : TwinEventKeyUp; + evt.kind = down ? TwinEventKeyUp : TwinEventKeyDown; evt.u.key.key = e; twin_screen_dispatch(tf->screen, &evt); break; ++++++ petitboot.cleanup.patch ++++++ Index: powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.c =================================================================== --- powerpc-utils-1.0.0.orig/petitboot-0.0.1/petitboot.c +++ powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.c @@ -30,10 +30,6 @@ static twin_x11_t *pboot_x11; static twin_fbdev_t *pboot_fbdev; #endif -static twin_screen_t *pboot_screen; -static twin_timeout_t *default_timeout; -static int select_rpane_on_startup; - #define PBOOT_INITIAL_MESSAGE \ "keys: c=changeres e=edit del=GameOS ESC=quit" @@ -93,6 +89,17 @@ static int select_rpane_on_startup; #define EDIT_BOOTARGS 3 #define EDIT_BUF_SIZE 1024 +#define TIMER_TIMEOUT 20000. + +static twin_screen_t *pboot_screen; +static twin_timeout_t *default_timeout; +static int select_rpane_on_startup; +static int pboot_vmode_change = -1; +static int pboot_rfocus_timeout_running = 0; +static twin_time_t option_timer_starttime = 0; +static char pboot_edit_buf[EDIT_BUF_SIZE]; +static int edit_in_progress; + typedef struct _pboot_option pboot_option_t; typedef struct _pboot_device pboot_device_t; @@ -152,10 +159,7 @@ static pboot_lpane_t *pboot_lpane; static pboot_rpane_t *pboot_rpane; static pboot_spane_t *pboot_spane; -static int pboot_vmode_change = -1; -static void pboot_set_lfocus(int index); -static void pboot_set_device_select(int sel, int force); /* XXX move to twin */ static inline twin_bool_t twin_rect_intersect(twin_rect_t r1, @@ -301,11 +305,7 @@ static void pboot_rpane_draw(twin_window twin_path_destroy(path); } -#define TIMER_TIMEOUT 20000. -static void pboot_choose_option(void); -static void pboot_make_background(const char *background); -static twin_time_t option_timer_starttime = 0; static twin_time_t pboot_rfocus_option_timer (twin_time_t now, void *closure) { int option_timer_size; @@ -352,7 +352,6 @@ static twin_time_t pboot_rfocus_option_t return 10; } -static int pboot_rfocus_timeout_running = 0; static twin_time_t pboot_rfocus_timeout (twin_time_t now, void *closure) { int dir = 1, dist, pos; @@ -513,7 +512,7 @@ static void pboot_rpane_mousetrack(twin_ pboot_rpane->mouse_target = candidate; } -static void pboot_choose_option(void) +void pboot_choose_option(void) { pboot_device_t *dev = pboot_devices[pboot_dev_sel]; pboot_option_t *opt = &dev->options[pboot_rpane->focus_curindex]; @@ -547,8 +546,6 @@ static unsigned char keycodes[128] = { 0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ }; -static char pboot_edit_buf[EDIT_BUF_SIZE]; -static int edit_in_progress; int choose_edit_option (int option_attr) { @@ -626,9 +623,6 @@ int save_edit_option(char *new_opt) return 0; } -static twin_bool_t pboot_rpane_event (twin_window_t *window, - twin_event_t *event); - static twin_bool_t pboot_edit_event (twin_window_t *window, twin_event_t *event) { @@ -738,7 +732,7 @@ static twin_bool_t pboot_changeres_event return TWIN_FALSE; } -static twin_bool_t pboot_rpane_event (twin_window_t *window, +twin_bool_t pboot_rpane_event (twin_window_t *window, twin_event_t *event) { // reset right focus after timeout interrupt @@ -846,8 +840,7 @@ int pboot_add_option(int devindex, const return index; } - -static void pboot_set_device_select(int sel, int force) +void pboot_set_device_select(int sel, int force) { if (!force && sel == pboot_dev_sel) @@ -917,9 +910,6 @@ static void pboot_create_rpane(void) twin_window_queue_paint(pboot_rpane->window); } - -static twin_bool_t pboot_lpane_event (twin_window_t *window, - twin_event_t *event); static twin_time_t pboot_lfocus_timeout (twin_time_t now, void *closure) { int dir = 1, dist, pos; @@ -952,7 +942,7 @@ static twin_time_t pboot_lfocus_timeout return accel[(pos * 10) / dist]; } -static void pboot_set_lfocus(int index) +void pboot_set_lfocus(int index) { if (index >= pboot_dev_count || index < 0) { /* re-enable input devices */ @@ -1017,7 +1007,7 @@ static twin_bool_t pboot_dummy_event (tw return TWIN_TRUE; } -static twin_bool_t pboot_lpane_event (twin_window_t *window, +twin_bool_t pboot_lpane_event (twin_window_t *window, twin_event_t *event) { /* filter out all mouse events */ @@ -1068,7 +1058,6 @@ static twin_bool_t pboot_lpane_event (tw return TWIN_FALSE; } - twin_bool_t pboot_event_filter(twin_screen_t *screen, twin_event_t *event) { @@ -1083,33 +1072,6 @@ twin_bool_t pboot_event_filter(twin_scre pboot_cursor_hx, pboot_cursor_hy); break; - case TwinEventKeyDown: - switch(event->u.key.key) { - /* Gross hack for video modes, need something better ! */ -#if 0 - case KEY_0: - pboot_vmode_change = 0; /* auto */ - pboot_changeres(); - return TWIN_TRUE; - case KEY_1: - pboot_vmode_change = 3; /* 720p */ - pboot_changeres(); - return TWIN_TRUE; - case KEY_2: - pboot_vmode_change = 4; /* 1080i */ - pboot_changeres(); - return TWIN_TRUE; - case KEY_3: - pboot_vmode_change = 5; /* 1080p */ - pboot_changeres(); - return TWIN_TRUE; - /* Another gross hack for booting back to gameos */ - case KEY_BACKSPACE: - case KEY_DELETE: - system("ps3-boot-game-os"); - pboot_quit(); -#endif - } case TwinEventKeyUp: twin_screen_set_cursor(pboot_screen, NULL, 0, 0); break; @@ -1281,7 +1243,7 @@ int pboot_add_device(const char *dev_id, if (pboot_dev_count >= PBOOT_MAX_DEV) return -1; - // increment device counter + /* increment device counter */ index = pboot_dev_count++; dev = malloc(sizeof(*dev)); @@ -1345,7 +1307,7 @@ int pboot_remove_device(const char *dev_ return TWIN_TRUE; } -static void pboot_make_background(const char *background) +void pboot_make_background(const char *background) { twin_pixmap_t *filepic, *scaledpic; char background_path[512]; Index: powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.h =================================================================== --- powerpc-utils-1.0.0.orig/petitboot-0.0.1/petitboot.h +++ powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.h @@ -16,3 +16,12 @@ int pboot_remove_device(const char *dev_ int pboot_start_device_discovery(int udev_trigger); void pboot_exec_option(void *data); void pboot_message(const char *message); +void pboot_set_lfocus(int index); +void pboot_set_device_select(int sel, int force); +void pboot_choose_option(void); +void pboot_make_background(const char *background); +twin_bool_t pboot_rpane_event (twin_window_t *window, + twin_event_t *event); +twin_bool_t pboot_lpane_event (twin_window_t *window, + twin_event_t *event); + Index: powerpc-utils-1.0.0/petitboot-0.0.1/devices/yaboot-parser.c =================================================================== --- powerpc-utils-1.0.0.orig/petitboot-0.0.1/devices/yaboot-parser.c +++ powerpc-utils-1.0.0/petitboot-0.0.1/devices/yaboot-parser.c @@ -138,7 +138,6 @@ static int yaboot_parse(const char *devi { char *filepath; char *conf_file; - char *tmpstr; ssize_t conf_len; int fd; struct stat st; Index: powerpc-utils-1.0.0/petitboot-0.0.1/devices/kboot-parser.c =================================================================== --- powerpc-utils-1.0.0.orig/petitboot-0.0.1/devices/kboot-parser.c +++ powerpc-utils-1.0.0/petitboot-0.0.1/devices/kboot-parser.c @@ -20,7 +20,7 @@ static const char *mountpoint; /* /dev/sda5:/vmlinux */ -static char *blah(const char *option) +static char *create_mountp(const char *option) { struct stat sb; char mount_path[PATH_MAX]; @@ -140,13 +140,13 @@ static int parse_option(struct boot_opti /* if there's no space, it's only a kernel image with no params */ if (!pos) { - opt->boot_image_file = blah(config); + opt->boot_image_file = create_mountp(config); opt->description = strdup(config); return 1; } *pos = 0; - opt->boot_image_file = blah(config); + opt->boot_image_file = create_mountp(config); //opt->default_prio = strdup(config); cmdline = malloc(buf_size); @@ -173,7 +173,7 @@ static int parse_option(struct boot_opti } if (initrd) - opt->initrd_file = blah(initrd); + opt->initrd_file = create_mountp(initrd); if (root) { asprintf(&tmp, "root=%s %s", root, cmdline); ++++++ petitboot.editor-enhancement.patch ++++++ Index: powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.c =================================================================== --- powerpc-utils-1.0.0.orig/petitboot-0.0.1/petitboot.c +++ powerpc-utils-1.0.0/petitboot-0.0.1/petitboot.c @@ -530,22 +530,54 @@ void pboot_choose_option(void) pboot_exec_option(opt->data); } -static unsigned char keycodes[128] = { -0, 0, '1', '2', '3', '4', '5', '6', '7', '8', /* 0 - 9 */ -'9', '0', '-', '=', 0, 0, 'q', 'w', 'e', 'r', /* 10 - 19 */ -'t', 'y', 'u', 'i', 'o', 'p', 0, 0, 0, 0, /* 20 - 29 */ -'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ':', /* 30 - 39 */ -'\"', 0, 0, 0, 'z', 'x', 'c', 'v', 'b', 'n', /* 40 - 49 */ -'m', ',', '.', '/', 0, 0, 0, ' ', 0, 0, /* 50 - 59 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 69 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 70 - 79 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 89 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 100 - 109 */ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ +static unsigned char keycodes_std[128] = { +0, 0, '1', '2', '3', '4', '5', '6', '7', '8', /* 0 - 9 */ +'9', '0', '-', '=', 0, 0, 'q', 'w', 'e', 'r', /* 10 - 19 */ +'t', 'y', 'u', 'i', 'o', 'p', '[', ']', 0, 0, /* 20 - 29 */ +'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', /* 30 - 39 */ +'\'', '`', 0, '\\', 'z', 'x', 'c', 'v', 'b', 'n', /* 40 - 49 */ +'m', ',', '.', '/', 0, 0, 0, ' ', 0, 0, /* 50 - 59 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 69 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 70 - 79 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 89 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 100 - 109 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ +0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ }; +static unsigned char keycodes_shift[128] = { +0, 0, '!','@', '#', '$', '%', '^', '&', '*', /* 0 - 9 */ +'(', ')', '_', '+', 0, 0, 'Q', 'W', 'E', 'R', /* 10 - 19 */ +'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', 0, 0, /* 20 - 29 */ +'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', /* 30 - 39 */ +'\"', '~', 0, '|', 'Z', 'X', 'C', 'V', 'B', 'N', /* 40 - 49 */ +'M', '<', '>', '?', 0, 0, 0, ' ', 0, 0, /* 50 - 59 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 69 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 70 - 79 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 89 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 100 - 109 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ +0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ +}; + +static unsigned char keycodes_ctrl[128] = { +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 10 - 19 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 30 - 39 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40 - 49 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 50 - 59 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 69 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 70 - 79 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 89 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 100 - 109 */ +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ +0, 0, 0, 0, 0, 0, 0, 0 /* 120 - 127 */ +}; +static unsigned char* keycodes = keycodes_std; int choose_edit_option (int option_attr) { @@ -648,8 +680,22 @@ static twin_bool_t pboot_edit_event (twi pboot_message(pboot_edit_buf); } return TWIN_TRUE; + case KEY_LEFTSHIFT: + keycodes = keycodes_shift; + return TWIN_TRUE; + case KEY_LEFTCTRL: + keycodes = keycodes_ctrl; + return TWIN_TRUE; default: edit_option(keycodes[event->u.key.key]); + return TWIN_TRUE; + } + case TwinEventKeyUp: + switch(event->u.key.key) { + case KEY_LEFTSHIFT: + keycodes = keycodes_std; + return TWIN_TRUE; + default: break; } default: ++++++ ps3config-2.6.22 ++++++ --- arch/ppc/powerpc-utils/ps3config-2.6.22 2007-08-21 15:28:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/powerpc-utils/ps3config-2.6.22 2007-08-23 15:38:33.155565000 +0200 @@ -599,7 +599,7 @@ # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_IBM_GXT4500 is not set CONFIG_FB_PS3=y -CONFIG_FB_PS3_DEFAULT_SIZE_M=18 +CONFIG_FB_PS3_DEFAULT_SIZE_M=9 # CONFIG_FB_VIRTUAL is not set # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org