September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit iprutils
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package iprutils checked in at Mon Sep 29 17:43:25 CEST 2008. -------- --- iprutils/iprutils.changes 2008-08-29 12:55:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/iprutils/iprutils.changes 2008-09-29 15:19:44.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 15:12:30 CEST 2008 - olh(a)suse.de + +- update iprutils to version 2.2.11 (bnc#417522 - FATE#304156 - LTC47076) + Add support for the active-active functionality. + +------------------------------------------------------------------- Old: ---- iprutils-2.2.10-src.tar.bz2 iprutils.iprlib.patch iprutils.uninitialized.patch New: ---- iprutils-2.2.11-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.h32319/_old 2008-09-29 17:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.h32319/_new 2008-09-29 17:41:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iprutils (Version 2.2.10) +# spec file for package iprutils (Version 2.2.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: iprutils BuildRequires: ncurses-devel pciutils-devel sysfsutils Summary: Utilities for the IBM Power Linux RAID Adapters -Version: 2.2.10 -Release: 3 +Version: 2.2.11 +Release: 1 License: Other uncritical OpenSource License Url: http://sourceforge.net/projects/iprdd/ Group: Hardware/Other @@ -33,8 +33,6 @@ Patch0: iprconfig.usr-sbin.patch Patch1: iprutils.install-man.patch Patch2: iprutils.runlevel.patch -Patch3: iprutils.uninitialized.patch -Patch4: iprutils.iprlib.patch %description Provides a suite of utilities to manage and configure SCSI devices @@ -44,15 +42,13 @@ Authors: -------- - Brian King @ IBM + Wayne Boyer <wayneb(a)linux.vnet.ibm.com> %prep %setup -q -n iprutils %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses \$(IPR_DEFINES)" @@ -92,6 +88,9 @@ %attr(755,root,root) /etc/init.d/* %changelog +* Mon Sep 29 2008 olh(a)suse.de +- update iprutils to version 2.2.11 (bnc#417522 - FATE#304156 - LTC47076) + Add support for the active-active functionality. * Fri Aug 29 2008 olh(a)suse.de - fix an uninitialized but unused variable - move defines in iprlib.h out of bigendian section ++++++ iprutils-2.2.10-src.tar.bz2 -> iprutils-2.2.11-src.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/iprconfig.8 new/iprutils/iprconfig.8 --- old/iprutils/iprconfig.8 2008-07-21 05:24:39.000000000 +0200 +++ new/iprutils/iprconfig.8 2008-09-26 22:33:06.000000000 +0200 @@ -1,4 +1,4 @@ -.\" (C) Copyright 2000, 2004 +.\" (C) Copyright 2000, 2008 .\" International Business Machines Corporation and others. .\" All Rights Reserved. This program and the accompanying .\" materials are made available under the terms of the @@ -60,17 +60,32 @@ or are formatted for JBOD function and are in the Format Required state will be available for this function. .PP -.B Create a hot spare -is used to designate a device as a dedicated hot spare. -.PP -.B Delete a hot spare -is used to unconfigure a previously configured hot spare. +.B Work with hot spares +is used to create a hot spare which designates a device as a dedicated hot +spare. It is also used to delete a hot spare which unconfigures a previously +configured hot spare. +.\".B Create a hot spare +.\"is used to designate a device as a dedicated hot spare. +.\".PP +.\".B Delete a hot spare +.\"is used to unconfigure a previously configured hot spare. +.PP +.B Work with asymmetric access +is used to select which path of a disk array will be the primary path in a dual +controller environment. Asymmetric Access must be enabled on the adapter first. +Not all adapters support asymmetric access and adapters that do provide support +may require updated microcode. .PP .B Force RAID Consistency Check is used to force a consistency check on a RAID array. All ipr adapters continually perform background consistency checking when idle. This option can be used to force a consistency check to be performed. .PP +.B Migrate disk array protection +is used to change the RAID protection level for an array to another supported +level. In some cases, this will require adding more disks to the array. In +other cases, disks will be freed. +.PP .B 3. Work with disk unit recovery is used to perform the following disk unit recovery actions: .PP @@ -123,9 +138,10 @@ is used to change configurable disk attributes, such as queue depth. .PP .B 7. Work with adapter configuration -is used to change configurable adapter attributes, such as dual adapter settings. -Refer to the following command line options: primary, secondary, query-ha-mode, -and set-ha-mode for more information regarding these settings. +is used to change configurable adapter attributes, such as dual adapter +settings. Refer to the following command line options: primary, secondary, +query-ha-mode, set-ha-mode, set-ioa-asymmetric-access and +set-array-asymmetric-access for more information regarding these settings. .PP .B 8. Download microcode is used to download microcode to ipr adapters and attached SCSI disks. @@ -391,6 +407,23 @@ required, the maximum number of devices allowed and the multiple of the number of devices required for a migration that requires more devices. .TP +.B query-ioas-asymmetric-access +.br +Show the IOAs that support asymmetric access. +.TP +.B query-arrays-asymmetric-access +.br +Show the disk arrays that are candidates for setting their asymmetric access +mode to Optimized or Non-Optimized. +.TP +.B query-ioa-asymmetric-access-mode [IOA] +.br +Show the current asymmetric access mode for the given IOA. +.TP +.B query-array-asymmetric-access-mode [array] +.br +Show the current asymmetric access mode for the given disk array. +.TP .B raid-create [-r raid_level] [-s stripe_size_in_kb] [devices...] Create a RAID array. RAID level can be any supported RAID level for the given adapter, such as 0, 10, 5, 6. Currently supported stripe sizes in kb @@ -641,6 +674,16 @@ command for more information regarding these settings. Example: .br .B iprconfig -c set-ha-mode sg5 Normal +.TP +.B set-array-asymmetric-access-mode [array] [Optimized | Non-Optimized] +Used to set the asymmetric access mode of the disk array. Example: +.br +.B iprconfig -c set-array-asymmetric-access-mode sda Optimized +.TP +.B set-ioa-asymmetric-access-mode [IOA] [Enabled | Disabled] +Used to set the asymmetric access mode of the IOA. Example: +.br +.B iprconfig -c set-ioa-asymmetric-access-mode sg5 Enabled .RE .TP .B \-\-version diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/iprconfig.c new/iprutils/iprconfig.c --- old/iprutils/iprconfig.c 2008-08-13 00:53:22.000000000 +0200 +++ new/iprutils/iprconfig.c 2008-09-26 22:33:09.000000000 +0200 @@ -2014,6 +2014,14 @@ } } + if (dev->ioa->asymmetric_access) { + body = add_line_to_body(body,"", NULL); + if (dev->ioa->asymmetric_access_enabled) + body = add_line_to_body(body,_("Current Asymmetric Access State"), _("Enabled")); + else + body = add_line_to_body(body,_("Current Asymmetric Access State"), _("Disabled")); + } + return body; } @@ -2417,6 +2425,38 @@ #define IPR_RMV_HOT_SPARE 1 /** +* hot_spare_screen - Display choices for working with hot spares. +* @i_con: i_container struct +* +* Returns: +* 0 if success / non-zero on failure +**/ +int hot_spare_screen(i_container *i_con) +{ + int rc; + struct screen_output *s_out; + int loop; + + free_raid_cmds(); + + for (loop = 0; loop < n_hot_spare_screen.num_opts; loop++) { + n_hot_spare_screen.body = + ipr_list_opts(n_hot_spare_screen.body, + n_hot_spare_screen.options[loop].key, + n_hot_spare_screen.options[loop].list_str); + } + + n_hot_spare_screen.body = ipr_end_list(n_hot_spare_screen.body); + + s_out = screen_driver(&n_hot_spare_screen,0,NULL); + free(n_hot_spare_screen.body); + n_hot_spare_screen.body = NULL; + rc = s_out->rc; + free(s_out); + return rc; +} + +/** * raid_screen - * @i_con: i_container struct * @@ -4356,7 +4396,6 @@ struct screen_output *s_out; int toggle = 1; int header_lines; - i_container *i_con; body_init_status(buffer, n_confirm_raid_migrate.header, &header_lines); @@ -4374,7 +4413,7 @@ do { n_confirm_raid_migrate.body = buffer[toggle&1]; - s_out = screen_driver(&n_confirm_raid_migrate, header_lines, i_con); + s_out = screen_driver(&n_confirm_raid_migrate, header_lines, NULL); rc = s_out->rc; free(s_out); toggle++; @@ -5008,6 +5047,45 @@ } /** + * asym_access - GUI routine for setting array asymmetric access. + * @i_con: i_container struct + * + * Returns: + * 0 if success / non-zero on failure + **/ +int asym_access(i_container *i_con) +{ + int rc; + int found = 0; + char *buffer[2]; + struct screen_output *s_out; + int header_lines; + + processing(); + + /* make sure the i_con list is empty */ + i_con = free_i_con(i_con); + + rc = RC_SUCCESS; + + body_init_status(buffer, n_asym_access.header, &header_lines); + + if (!found) { + n_asym_access_fail.body = body_init(n_asym_access_fail.header, NULL); + s_out = screen_driver(&n_asym_access_fail, 0, i_con); + + free(n_asym_access_fail.body); + n_asym_access_fail.body = NULL; + + rc = s_out->rc | CANCEL_FLAG; + free(s_out); + } else + rc = 1; //process_asym_access(buffer, header_lines); + + return rc; +} + +/** * raid_include - * @i_con: i_container struct * @@ -9806,6 +9884,7 @@ int option; int preferred_primary; int gscsi_only_ha; + int active_active; }; /** @@ -9833,16 +9912,19 @@ same line as the field in which the menu is opened for*/ start_row += 2; /* for title */ /* FIXME */ - if (ioa_config_attr->option == 1 || ioa_config_attr->option == 2) { - num_menu_items = 2; + if (ioa_config_attr->option == 1 || ioa_config_attr->option == 2 + || ioa_config_attr->option == 3) { + num_menu_items = 3; menu_item = malloc(sizeof(ITEM **) * (num_menu_items + 1)); userptr = malloc(sizeof(int) * num_menu_items); menu_index = 0; if (ioa_config_attr->option == 1) menu_item[menu_index] = new_item("None",""); - else + else if (ioa_config_attr->option == 2) menu_item[menu_index] = new_item("RAID",""); + else + menu_item[menu_index] = new_item("Disabled",""); userptr[menu_index] = 0; set_item_userptr(menu_item[menu_index], @@ -9852,8 +9934,10 @@ if (ioa_config_attr->option == 1) menu_item[menu_index] = new_item("Primary",""); - else + else if (ioa_config_attr->option == 2) menu_item[menu_index] = new_item("JBOD",""); + else + menu_item[menu_index] = new_item("Enabled",""); userptr[menu_index] = 1; set_item_userptr(menu_item[menu_index], @@ -9865,8 +9949,10 @@ if (rc == RC_SUCCESS) { if (ioa_config_attr->option == 1) ioa_config_attr->preferred_primary = *retptr; - else + else if (ioa_config_attr->option == 2) ioa_config_attr->gscsi_only_ha = *retptr; + else + ioa_config_attr->active_active = *retptr; } i = 0; @@ -9928,7 +10014,7 @@ i_con_head_saved = i_con_head; /* FIXME */ i_con_head = i_con = NULL; - body = body_init(n_change_disk_config.header, &header_lines); + body = body_init(n_change_ioa_config.header, &header_lines); sprintf(buffer, "Adapter: %s/%d %s %s\n", dev->ioa->pci_address, dev->ioa->host_num, dev->scsi_dev_data->vendor_id, dev->scsi_dev_data->product_id); @@ -9956,6 +10042,16 @@ sprintf(pref_str, "Normal"); i_con = add_i_con(i_con, pref_str, &ioa_config_attr[index++]); } + if (dev->ioa->asymmetric_access) { + body = add_line_to_body(body,_("Active/Active Mode"), "%13"); + ioa_config_attr[index].option = 3; + ioa_config_attr[index].active_active = ioa_attr.active_active; + if (ioa_attr.active_active) + sprintf(pref_str, "Enabled"); + else + sprintf(pref_str, "Disabled"); + i_con = add_i_con(i_con, pref_str, &ioa_config_attr[index++]); + } n_change_ioa_config.body = body; while (1) { @@ -9983,6 +10079,12 @@ else sprintf(temp_i_con->field_data, "Normal"); ioa_attr.gscsi_only_ha = config_attr->gscsi_only_ha; + } else if (config_attr->option == 3) { + if (config_attr->active_active) + sprintf(temp_i_con->field_data, "Enabled"); + else + sprintf(temp_i_con->field_data, "Disabled"); + ioa_attr.active_active = config_attr->active_active; } found++; break; @@ -11112,6 +11214,10 @@ sprintf(buf, "Degraded"); else if (res_state.degraded_oper || res_state.service_req) sprintf(buf, "Degraded"); + else if ((dev->ioa->asymmetric_access && + dev->array_rcd->current_asym_access_state == IPR_ACTIVE_OPTIMIZED) + || (!dev->ioa->is_secondary && !dev->ioa->asymmetric_access)) + sprintf(buf, "Optimized"); else sprintf(buf, "Active"); } else if (format_req) @@ -14276,6 +14382,128 @@ } /** + * query_ioas_asym_access - Show the ioas that support asymmetric access. + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int query_ioas_asym_access(char **args, int num_args) +{ + int hdr = 0; + struct ipr_ioa *ioa; + + for_each_ioa(ioa) { + if (!ioa->asymmetric_access); + continue; + if (!hdr) { + hdr = 1; + printf("%s\n%s\n", status_hdr[3], status_sep[3]); + } + printf_device(&ioa->ioa, 1); + } + return 0; +} + +/** + * query_arrays_asym_access - Show the arrays that support asymmetric access. + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int query_arrays_asym_access(char **args, int num_args) +{ + int hdr = 0; + struct ipr_ioa *ioa; + struct ipr_dev *vset; + + for_each_ioa(ioa) { + if (!ioa->asymmetric_access || !ioa->asymmetric_access_enabled) + continue; + for_each_vset(ioa, vset) { + if (!vset->array_rcd->asym_access_cand) + continue; + if (!hdr) { + hdr = 1; + printf("%s\n%s\n", status_hdr[3], status_sep[3]); + } + printf_device(vset, 1); + } + } + return 0; +} + +/** + * query_ioa_asym_access_mode - Show the current asymmetric access state for + * the given IOA. + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int query_ioa_asym_access_mode(char **args, int num_args) +{ + struct ipr_dev *dev; + + dev = find_dev(args[0]); + if (!dev) { + fprintf(stderr, "Cannot find %s\n", args[0]); + return -EINVAL; + } + if (dev != &dev->ioa->ioa) { + fprintf(stderr, "%s is not an IOA.\n", args[0]); + return -EINVAL; + } + + if (dev->ioa->asymmetric_access_enabled) + printf("Enabled\n"); + else if (dev->ioa->asymmetric_access) + printf("Disabled\n"); + else + printf("Unsupported\n"); + + return 0; +} + +/** + * query_array_asym_access_mode - Show the current asymmetric access state for + * the given array. + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int query_array_asym_access_mode(char **args, int num_args) +{ + struct ipr_dev *vset; + + vset = find_dev(args[0]); + if (!vset) { + fprintf(stderr, "Cannot find %s\n", args[0]); + return -EINVAL; + } + + if (!ipr_is_volume_set(vset)) { + fprintf(stderr, "%s is not an array.\n", vset->gen_name); + return -EINVAL; + } + + if (!vset->array_rcd->asym_access_cand) + printf("Unsupported\n"); + else if (vset->array_rcd->current_asym_access_state == IPR_ACTIVE_OPTIMIZED) + printf("Optimized\n"); + else + printf("Not Optimized\n"); + + return 0; +} + +/** * query_format_for_jbod - * @args: argument vector * @num_args: number of arguments @@ -14765,6 +14993,133 @@ return 0; } +/** + * check_and_set_active_active - Do some sanity checks and then set the + * active/active state to the requested mode. + * @dev_name: specified IOA + * @mode: mode to set - enable or disable + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int check_and_set_active_active(char *dev_name, int mode) +{ + struct ipr_dev *dev; + + dev = find_dev(dev_name); + if (!dev) { + fprintf(stderr, "Cannot find %s\n", dev_name); + return -EINVAL; + } + if (dev != &dev->ioa->ioa) { + fprintf(stderr, "%s is not an IOA.\n", dev_name); + return -EINVAL; + } + + /* Check that asymmetric access is supported by the adapter. */ + if (!dev->ioa->asymmetric_access) { + ioa_err(dev->ioa, "IOA does not support asymmetric access.\n"); + return -EINVAL; + } + + /* Check the state of asymmetric access. */ + if (dev->ioa->asymmetric_access_enabled == mode) { + ioa_dbg(dev->ioa, "Asymmetric access is already %s.\n", + mode == 0 ? "disabled" : "enabled"); + return 0; + } + + return set_active_active_mode(dev->ioa, mode); +} + +/** + * set_ioa_asymmetric_access - Change the asymmetric access mode for an IOA. + * Enabling occurs by sending a change multi adapter + * assignment command from ipr_set_ioa_attr(). + * Disabling occurs by sending a mode select + * page 24 in ipr_set_active_active_mode(). + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int set_ioa_asymmetric_access(char **args, int num_args) +{ + if (!strncasecmp(args[1], "Enable", 4)) + return check_and_set_active_active(args[0], 1); + else if (!strncasecmp(args[1], "Disable", 4)) + return check_and_set_active_active(args[0], 0); + return -EINVAL; +} + +/** + * set_array_asymmetric_access - Set the desired asymmetric access state of the + * array to "Optimized" or "Non-Optimized". + * + * @args: argument vector + * @num_args: number of arguments + * + * Returns: + * 0 if success / non-zero on failure + **/ +static int set_array_asymmetric_access(char **args, int num_args) +{ + int state; + struct ipr_dev *vset = NULL; + struct ipr_ioa *ioa = NULL; + + vset = find_dev(args[0]); + if (!vset) { + fprintf(stderr, "Cannot find %s\n", args[0]); + return -EINVAL; + } + + if (!ipr_is_volume_set(vset)) { + scsi_err(vset, "Given device is not an array."); + return -EINVAL; + } + + /* Check that asymmetric access is supported by the adapter. */ + if (!vset->ioa->asymmetric_access) { + ioa_err(vset->ioa, "Asymmetric access is not supported."); + return -EINVAL; + } + + /* Check that asymmetric access is enabled on the adapter. */ + if (!vset->ioa->asymmetric_access_enabled) { + ioa_err(vset->ioa, "Asymmetric access is not enabled."); + return -EINVAL; + } + + /* Optimized or Non-optimized? */ + if (!strncasecmp(args[1], "Optimized", 3)) + state = IPR_ACTIVE_OPTIMIZED; + else if (!strncasecmp(args[1], "Non-Optimized", 3)) + state = IPR_ACTIVE_NON_OPTIMIZED; + else { + scsi_err(vset, "Unrecognized state given for asymmetric access."); + return -EINVAL; + } + + if (vset->array_rcd->saved_asym_access_state == state) { + scsi_dbg(vset, "Array is already set to requested state."); + return 0; + } + + if (vset->array_rcd->asym_access_cand) + vset->array_rcd->issue_cmd = 1; + else { + scsi_err(vset, "%s is not a candidate for " + "asymmetric access.", vset->gen_name); + return -EINVAL; + } + + vset->array_rcd->saved_asym_access_state = state; + + return ipr_set_array_asym_access(vset, ioa->qac_data); +} + static const struct { char *cmd; int min_args; @@ -14799,6 +15154,10 @@ { "query-raid-levels-raid-migrate", 1, 0, 1, query_raid_levels_raid_migrate, "sda" }, { "query-stripe-sizes-raid-migrate", 2, 0, 2, query_stripe_sizes_raid_migrate, "sg5 10" }, { "query-devices-min-max-raid-migrate", 2, 0, 2, query_devices_min_max_raid_migrate, "sg5 10" }, + { "query-ioas-asymmetric-access", 0, 0, 0, query_ioas_asym_access, "" }, + { "query-arrays-asymmetric-access", 0, 0, 0, query_arrays_asym_access, "" }, + { "query-ioa-asymmetric-access-mode", 1, 0, 1, query_ioa_asym_access_mode, "sg5" }, + { "query-array-asymmetric-access-mode", 1, 0, 1, query_array_asym_access_mode, "sda" }, { "query-recovery-format", 0, 0, 0, query_recovery_format, "" }, { "query-raid-rebuild", 0, 0, 0, query_raid_rebuild, "" }, { "query-format-for-raid", 0, 0, 0, query_format_for_raid, "" }, @@ -14827,6 +15186,8 @@ { "set-all-secondary", 0, 0, 0, set_all_secondary, "" }, { "query-ha-mode", 1, 0, 1, get_ha_mode, "sg5" }, { "set-ha-mode", 2, 0, 2, __set_ha_mode, "sg5 [Normal | JBOD]" }, + { "set-ioa-asymmetric-access", 2, 0, 2, set_ioa_asymmetric_access, "sg5 [Enabled | Disabled]" }, + { "set-array-asymmetric-access", 2, 0, 2, set_array_asymmetric_access, "sda [Optimized | Non-Optimized]" }, { "raid-create", 1, 1, 0, raid_create, "-r 5 -s 64 sda sdb sg6 sg7" }, { "raid-delete", 1, 0, 1, raid_delete, "sdb" }, { "raid-include", 2, 0, 17, raid_include_cmd, "sda sg6 sg7" }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/iprconfig.h new/iprutils/iprconfig.h --- old/iprutils/iprconfig.h 2008-08-12 01:40:06.000000000 +0200 +++ new/iprutils/iprconfig.h 2008-09-26 22:33:13.000000000 +0200 @@ -100,6 +100,7 @@ int reclaim_result(i_container * i_con); int af_include(i_container * i_con); int af_remove(i_container * i_con); +int hot_spare_screen(i_container *i_con); int add_hot_spare(i_container * i_con); int remove_hot_spare(i_container * i_con); int hot_spare(i_container * i_con, int action); @@ -109,6 +110,7 @@ int hot_spare_complete(int action); int raid_migrate(i_container * i_con); +int asym_access(i_container *i_con); int raid_rebuild(i_container * i_con); int confirm_raid_rebuild(i_container * i_con); @@ -262,12 +264,52 @@ {raid_include, "4", __("Add a device to a disk array")}, {af_include, "5", __("Format device for RAID function")}, {af_remove, "6", __("Format device for JBOD function (512)")}, - {add_hot_spare, "7", __("Create a hot spare")}, - {remove_hot_spare, "8", __("Delete a hot spare")}, + {hot_spare_screen, "7", __("Work with hot spares")}, + {asym_access, "8", __("Work with asymmetric access")}, {raid_resync, "9", __("Force RAID Consistency Check")}, {raid_migrate, "0", __("Migrate disk array protection")}, }; +struct screen_opts hot_spare_opt[] = { + {add_hot_spare, "1", __("Create a hot spare")}, + {remove_hot_spare, "2", __("Delete a hot spare")}, +}; + + +s_node n_asym_access = { + .rc_flags = (EXIT_FLAG | CANCEL_FLAG | REFRESH_FLAG), + .f_flags = (EXIT_FLAG | CANCEL_FLAG | TOGGLE_FLAG | FWD_FLAG ), + .num_opts = NUM_OPTS(null_opt), + .options = &null_opt[0], + .title = __("Array Asymmetric Access"), + .header = { + __("Select the disk array path.\n\n"), + __("Type choice, press Enter.\n"), + __(" 1=change asymmetric access for a disk array\n\n"), + "" } +}; + +s_node n_asym_access_fail = { + .f_flags = (ENTER_FLAG | EXIT_FLAG | CANCEL_FLAG), + .title = __("Setting Array Asymmetric Access Failed"), + .header = { + __("There are no arrays eligible for the selected operation " + "due to one or more of the following reasons:\n\n"), + __("o There are no disk arrays in the system.\n"), + __("o An IOA is in a condition that makes the disks attached to " + "it read/write protected. Examine the kernel messages log " + "for any errors that are logged for the IO subsystem " + "and follow the appropriate procedure for the reference " + "code to correct the problem, if necessary.\n"), + __("o Not all disks attached to an advanced function IOA have " + "reported to the system. Retry the operation.\n"), + __("o None of the disk arrays in the system are capable of " + "changing asymmetric access attributes.\n"), + __("o An IOA needs updated microcode in order to support " + "active/active configurations.\n"), + "" } +}; + s_node n_raid_migrate_complete = { .title = __("Migrate Disk Array Status"), .body = __("You selected to migrate a disk array") @@ -311,7 +353,7 @@ "for any errors that are logged for the IO subsystem " "and follow the appropriate procedure for the reference " "code to correct the problem, if necessary.\n"), - __("o Not all disks attached to an advanced function IOA have" + __("o Not all disks attached to an advanced function IOA have " "reported to the system. Retry the operation.\n"), __("o There are not enough unused AF disks for the migration.\n"), "" } @@ -329,6 +371,14 @@ "" } }; +s_node n_hot_spare_screen = { + .rc_flags = (EXIT_FLAG | CANCEL_FLAG | REFRESH_FLAG), + .f_flags = (EXIT_FLAG | CANCEL_FLAG), + .num_opts = NUM_OPTS(hot_spare_opt), + .options = &hot_spare_opt[0], + .title = __("Work with Hot Spares") +}; + s_node n_raid_screen = { .rc_flags = (EXIT_FLAG | CANCEL_FLAG | REFRESH_FLAG), .f_flags = (EXIT_FLAG | CANCEL_FLAG), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/iprlib.c new/iprutils/iprlib.c --- old/iprutils/iprlib.c 2008-08-14 02:29:20.000000000 +0200 +++ new/iprutils/iprlib.c 2008-09-26 22:54:17.000000000 +0200 @@ -10,7 +10,7 @@ */ /* - * $Header: /cvsroot/iprdd/iprutils/iprlib.c,v 1.117 2008/04/09 19:34:51 tsenglin Exp $ + * $Header: /cvsroot/iprdd/iprutils/iprlib.c,v 1.120 2008/09/26 20:54:17 wboyer Exp $ */ #ifndef iprlib_h @@ -3625,7 +3625,48 @@ } /** - * get_write_buffer_dev - + * ipr_set_array_asym_access - + * @dev: ipr_dev struct + * @qac: ipr_array_query_data struct + * + * Returns: + * 0 if success / non-zero on failure + **/ +int ipr_set_array_asym_access(struct ipr_dev *dev, struct ipr_array_query_data *qac) +{ + char *name = dev->gen_name; + struct sense_data_t sense_data; + u8 cdb[IPR_CCB_CDB_LEN]; + int fd, rc; + + if (strlen(name) == 0) + return -ENOENT; + + fd = open(name, O_RDWR); + if (fd <= 1) { + if (!strcmp(tool_name, "iprconfig") || ipr_debug) + syslog(LOG_ERR, "Could not open %s. %m\n", name); + return errno; + } + + memset(cdb, 0, IPR_CCB_CDB_LEN); + + cdb[0] = IPR_SET_ARRAY_ASYMMETRIC_ACCESS; + cdb[7] = (sizeof(*qac) >> 8) & 0xff; + cdb[8] = sizeof(*qac) & 0xff; + + rc = sg_ioctl(fd, cdb, qac, sizeof(*qac), SG_DXFER_TO_DEV, + &sense_data, IPR_ARRAY_CMD_TIMEOUT); + + if (rc != 0 && sense_data.sense_key != ILLEGAL_REQUEST) + ioa_cmd_err(dev->ioa, &sense_data, "Set Array Asymmetric Access", rc); + + close(fd); + return rc; +} + +/** + * get_write_buffer_dev - FIXME - probably need to remove this routine. * @dev: ipr dev struct * * Returns: @@ -4460,14 +4501,16 @@ } /** - * ipr_set_preferred_primary - set the preferred primary state + * ipr_change_multi_adapter_assignment - set the preferred primary state and/or + * the asymmetric access state * @ioa: ipr ioa struct * @preferred_primary: set preferred primary flag * * Returns: * 0 if success / non-zero on failure **/ -int ipr_set_preferred_primary(struct ipr_ioa *ioa, int preferred_primary) +int ipr_change_multi_adapter_assignment(struct ipr_ioa *ioa, int preferred_primary, + int asym_access) { int fd, rc; u8 cdb[IPR_CCB_CDB_LEN]; @@ -4488,6 +4531,8 @@ cdb[0] = IPR_MAINTENANCE_OUT; cdb[1] = IPR_CHANGE_MULTI_ADAPTER_ASSIGNMENT; + if (asym_access) + cdb[2] = IPR_PRESERVE_ASYMMETRIC_STATE; if (preferred_primary) cdb[3] = IPR_IOA_STATE_PRIMARY; else @@ -4519,7 +4564,7 @@ char temp[100]; sprintf(temp, "%d", preferred_primary); - if (ipr_set_preferred_primary(ioa, preferred_primary)) + if (ipr_change_multi_adapter_assignment(ioa, preferred_primary, IPR_PRESERVE_ASYMMETRIC_STATE)) return -EIO; return 0; @@ -4550,6 +4595,70 @@ } /** + * ipr_set_active_active_mode - + * @ioa: ipr ioa struct + * @mode: enable or disable + * + * Returns: + * 0 if success / non-zero on failure + **/ +int ipr_set_active_active_mode(struct ipr_ioa *ioa) +{ + int len, rc; + struct ipr_mode_pages mode_pages; + struct ipr_mode_page24 *page24; + + memset(&mode_pages, 0, sizeof(mode_pages)); + rc = ipr_mode_sense(&ioa->ioa, 0x24, &mode_pages); + if (!rc) { + page24 = (struct ipr_mode_page24 *) (((u8 *)&mode_pages) + + mode_pages.hdr.block_desc_len + + sizeof(mode_pages.hdr)); + len = mode_pages.hdr.length +1; + mode_pages.hdr.length = 0; + page24->dual_adapter_af = ENABLE_DUAL_IOA_ACTIVE_ACTIVE; + return ipr_mode_select(&ioa->ioa, &mode_pages, len); + } + + return rc; +} + +/** + * set_active_active_mode - + * @ioa: ipr ioa struct + * @mode: enable or disable + * + * Returns: + * 0 if success / non-zero on failure + **/ +int set_active_active_mode(struct ipr_ioa *ioa, int mode) +{ + struct ipr_ioa_attr attr; + int rc; + + /* Get the current ioa attributes. */ + rc = ipr_get_ioa_attr(ioa, &attr); + + if (rc) + return rc; + + /* Get the saved ioa attributes from the config file. */ + rc = ipr_modify_ioa_attr(ioa, &attr); + + if (rc) + return rc; + + if (attr.active_active == mode) { + /* We should never get here. */ + ioa_dbg(ioa, "Requested and current asymmetric access mode are the same.\n"); + return 0; + } + + attr.active_active = mode; + return ipr_set_ioa_attr(ioa, &attr, 1); +} + +/** * get_scsi_dev_data - get scsi device data * @scsi_dev_ref: scsi_dev_data struct * @@ -4920,7 +5029,7 @@ } /** - * get_ioa_cap - get the capability information for the ioa + * get_ioa_cap - get the capability information for the ioa (inquiry page D0) * @ioa: ipr ioa struct * * Returns: @@ -4939,35 +5048,48 @@ rc = ipr_inquiry(&ioa->ioa, 0, &page0_inq, sizeof(page0_inq)); - if (!rc) { - for (j = 0; j < page0_inq.page_length; j++) { - if (page0_inq.supported_page_codes[j] != 0xD0) - continue; - rc = ipr_inquiry(&ioa->ioa, 0xD0, &ioa_cap, sizeof(ioa_cap)); + if (rc) { + ioa->ioa_dead = 1; + return; + } + + for (j = 0; j < page0_inq.page_length; j++) { + if (page0_inq.supported_page_codes[j] != 0xD0) + continue; + rc = ipr_inquiry(&ioa->ioa, 0xD0, &ioa_cap, sizeof(ioa_cap)); + if (rc) + break; + + ioa->af_block_size = get_af_block_size(&ioa_cap); + if (ioa_cap.is_aux_cache) + ioa->is_aux_cache = 1; + if (ioa_cap.can_attach_to_aux_cache && ioa_cap.is_dual_wide) + ioa->protect_last_bus = 1; + if (ioa_cap.gscsi_only_ha) + ioa->gscsi_only_ha = 1; + + if (ioa_cap.dual_ioa_raid || ioa_cap.dual_ioa_asymmetric_access) { + memset(&mode_pages, 0, sizeof(mode_pages)); + rc = ipr_mode_sense(&ioa->ioa, 0x24, &mode_pages); if (rc) break; - if (ioa_cap.dual_ioa_raid) { - memset(&mode_pages, 0, sizeof(mode_pages)); - rc = ipr_mode_sense(&ioa->ioa, 0x24, &mode_pages); - if (!rc) { - page24 = (struct ipr_mode_page24 *) (((u8 *)&mode_pages) + - mode_pages.hdr.block_desc_len + - sizeof(mode_pages.hdr)); - if (page24->enable_dual_ioa_af) - ioa->dual_raid_support = 1; + page24 = (struct ipr_mode_page24 *) (((u8 *)&mode_pages) + + mode_pages.hdr.block_desc_len + + sizeof(mode_pages.hdr)); + + if (ioa_cap.dual_ioa_raid && page24->dual_adapter_af == ENABLE_DUAL_IOA_AF) + ioa->dual_raid_support = 1; + + if (ioa_cap.dual_ioa_asymmetric_access) { + ioa->asymmetric_access = 1; + if (page24->dual_adapter_af == ENABLE_DUAL_IOA_ACTIVE_ACTIVE) { + ioa->dual_raid_support = 1; + ioa->asymmetric_access_enabled = 1; } } - ioa->af_block_size = get_af_block_size(&ioa_cap); - if (ioa_cap.is_aux_cache) - ioa->is_aux_cache = 1; - if (ioa_cap.can_attach_to_aux_cache && ioa_cap.is_dual_wide) - ioa->protect_last_bus = 1; - if (ioa_cap.gscsi_only_ha) - ioa->gscsi_only_ha = 1; } - } else - ioa->ioa_dead = 1; + } } /** @@ -5401,7 +5523,7 @@ } /** - * ipr_save_attr - Start array protection for an array + * ipr_save_attr - * @ioa: ipr ioa struct * @category: * @field: @@ -5475,7 +5597,6 @@ syslog(LOG_ERR, "Could not save %s.\n", fname); fclose(fd); fclose(temp_fd); - } /** @@ -5888,6 +6009,7 @@ attr->preferred_primary = 0; attr->gscsi_only_ha = ioa->in_gscsi_only_ha; + attr->active_active = ioa->asymmetric_access_enabled; if (!ioa->dual_raid_support) return 0; @@ -5944,6 +6066,11 @@ rc = ipr_get_saved_ioa_attr(ioa, IPR_GSCSI_HA_ONLY, temp); if (rc == RC_SUCCESS) sscanf(temp, "%d", &attr->gscsi_only_ha); + + rc = ipr_get_saved_ioa_attr(ioa, IPR_DUAL_ADAPTER_ACTIVE_ACTIVE, temp); + if (rc == RC_SUCCESS) + sscanf(temp, "%d", &attr->active_active); + return 0; } @@ -6017,11 +6144,12 @@ if (ipr_get_ioa_attr(ioa, &old_attr)) return -EIO; - if (attr->preferred_primary != old_attr.preferred_primary) { - sprintf(temp, "%d", attr->preferred_primary); - if (ipr_set_preferred_primary(ioa, attr->preferred_primary)) + /* FIXME - preferred_primary and active_active may change at the same + * time. This code may need to change. + */ + if (attr->preferred_primary != old_attr.preferred_primary) + if (ipr_change_multi_adapter_assignment(ioa, attr->preferred_primary, IPR_PRESERVE_ASYMMETRIC_STATE)) return -EIO; - } if (attr->gscsi_only_ha != old_attr.gscsi_only_ha) { sprintf(temp, "%d", attr->gscsi_only_ha); @@ -6033,8 +6161,24 @@ ipr_reset_adapter(ioa); } - get_dual_ioa_state(ioa); - get_subsys_config(ioa); + if (attr->active_active != old_attr.active_active && ioa->asymmetric_access) { + sprintf(temp, "%d", attr->active_active); + + /* If setting active/active, use mode page 24. + * If clearing, use Change Multi Adapter Assignment. */ + if (attr->active_active) { + if (ipr_set_active_active_mode(ioa)) + return -EIO; + } else if (ipr_change_multi_adapter_assignment(ioa, + attr->preferred_primary, + attr->active_active)) + return -EIO; + if (save) + ipr_save_ioa_attr(ioa, IPR_DUAL_ADAPTER_ACTIVE_ACTIVE, temp, 1); + } + + get_dual_ioa_state(ioa); /* for preferred_primary */ + get_subsys_config(ioa); /* for gscsi_only_ha */ return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/iprlib.h new/iprutils/iprlib.h --- old/iprutils/iprlib.h 2008-07-21 05:55:54.000000000 +0200 +++ new/iprutils/iprlib.h 2008-09-26 22:54:17.000000000 +0200 @@ -12,7 +12,7 @@ */ /* - * $Header: /cvsroot/iprdd/iprutils/iprlib.h,v 1.100 2008/04/09 19:34:17 tsenglin Exp $ + * $Header: /cvsroot/iprdd/iprutils/iprlib.h,v 1.103 2008/09/26 20:54:17 wboyer Exp $ */ #include <stdarg.h> @@ -161,6 +161,7 @@ #define IPR_REMOVE_ARRAY_DEVICE 0xF5 #define IPR_REBUILD_DEVICE_DATA 0xF6 #define IPR_RECLAIM_CACHE_STORE 0xF8 +#define IPR_SET_ARRAY_ASYMMETRIC_ACCESS 0xFA #define IPR_RECLAIM_ACTION 0x68 #define IPR_RECLAIM_PERFORM 0x00 #define IPR_RECLAIM_RESET_BATTERY_ERROR 0x08 @@ -180,6 +181,12 @@ #define IPR_TYPE_ADAPTER 0x1f #define IPR_TYPE_EMPTY_SLOT 0xff +#define IPR_ACTIVE_OPTIMIZED 0x0 +#define IPR_ACTIVE_NON_OPTIMIZED 0x1 +#define IPR_ACTIVE_STANDYBY 0x2 +#define IPR_CLEAR_ASYMMETRIC_STATE 0x0 +#define IPR_PRESERVE_ASYMMETRIC_STATE 0x1 + #define IPR_IS_DASD_DEVICE(std_inq_data) \ ((((std_inq_data).peri_dev_type) == TYPE_DISK) && !((std_inq_data).removeable_medium)) @@ -214,8 +221,7 @@ extern struct sysfs_dev *head_zdev; extern struct sysfs_dev *tail_zdev; -struct sysfs_dev -{ +struct sysfs_dev { char sysfs_device_name[16]; struct sysfs_dev *next, *prev; }; @@ -637,19 +643,19 @@ struct ipr_array_cap_entry { u8 prot_level; #define IPR_DEFAULT_RAID_LVL "5" + #if defined (__BIG_ENDIAN_BITFIELD) u8 include_allowed:1; u8 reserved:5; u8 format_overlay_type:2; - -#define IPR_FORMAT_ADD_DEVICES 1 -#define IPR_FORMAT_REMOVE_DEVICES 2 - #elif defined (__LITTLE_ENDIAN_BITFIELD) u8 format_overlay_type:2; u8 reserved:5; u8 include_allowed:1; #endif +#define IPR_FORMAT_ADD_DEVICES 1 +#define IPR_FORMAT_REMOVE_DEVICES 2 + u16 reserved2; u8 reserved3; u8 max_num_array_devices; @@ -680,7 +686,14 @@ u8 issue_cmd:1; #endif - u8 reserved2; + //u8 reserved2; +#if defined (__BIG_ENDIAN_BITFIELD) + u8 saved_asym_access_state:4; + u8 current_asym_access_state:4; +#elif defined (__LITTLE_ENDIAN_BITFIELD) + u8 current_asym_access_state:4; + u8 saved_asym_access_state:4; +#endif #if defined (__BIG_ENDIAN_BITFIELD) u8 established:1; @@ -694,7 +707,8 @@ u8 stop_cand:1; u8 resync_cand:1; u8 migrate_cand:1; - u8 reserved4:4; + u8 asym_access_cand:1; + u8 reserved4:3; #elif defined (__LITTLE_ENDIAN_BITFIELD) u8 reserved3:3; u8 no_config_entry:1; @@ -703,7 +717,8 @@ u8 exposed:1; u8 established:1; - u8 reserved4:4; + u8 reserved4:3; + u8 asym_access_cand:1; u8 migrate_cand:1; u8 resync_cand:1; u8 stop_cand:1; @@ -973,6 +988,7 @@ #define IPR_CATEGORY_IOA "Adapter" #define IPR_GSCSI_HA_ONLY "JBOD_ONLY_HA" +#define IPR_DUAL_ADAPTER_ACTIVE_ACTIVE "DUAL_ADAPTER_ACTIVE_ACTIVE" #define IPR_CATEGORY_BUS "Bus" #define IPR_QAS_CAPABILITY "QAS_CAPABILITY" @@ -1023,7 +1039,7 @@ struct ipr_path_entry { u8 state; #define IPR_PATH_FUNCTIONAL 0 -#define IPR_PATH_NOT_FUNCTIONAL 1 +#define IPR_PATH_NOT_FUNCTIONAL 1 u8 local_bus_num; u8 remote_bus_num; u8 reserved; @@ -1040,10 +1056,11 @@ u32 length; u8 link_state; #define IPR_IOA_LINK_STATE_NOT_OPER 0 -#define IPR_IOA_LINK_STATE_OPER 1 +#define IPR_IOA_LINK_STATE_OPER 1 u8 cur_state; +#define IPR_IOA_STATE_NO_CHANGE 0 #define IPR_IOA_STATE_PRIMARY 2 -#define IPR_IOA_STATE_SECONDARY 3 +#define IPR_IOA_STATE_SECONDARY 3 #define IPR_IOA_STATE_NO_PREFERENCE 4 u8 fmt; u8 multi_adapter_type; @@ -1107,6 +1124,7 @@ struct ipr_ioa_attr { int preferred_primary; int gscsi_only_ha; + int active_active; }; #define IPR_DEV_MAX_PATHS 2 @@ -1152,7 +1170,6 @@ u32 num_raid_cmds; u32 msl; u16 num_devices; - u8 rw_protected:1; /* FIXME */ u8 ioa_dead:1; u8 nr_ioa_microcode:1; u8 scsi_id_changeable:1; @@ -1163,6 +1180,8 @@ u8 protect_last_bus:1; u8 gscsi_only_ha:1; u8 in_gscsi_only_ha:1; + u8 asymmetric_access:1; + u8 asymmetric_access_enabled:1; enum ipr_tcq_mode tcq_mode; u16 pci_vendor; u16 pci_device; @@ -1311,12 +1330,16 @@ struct ipr_mode_page24 { struct ipr_mode_page_hdr hdr; #if defined (__BIG_ENDIAN_BITFIELD) - u8 enable_dual_ioa_af:1; + u8 dual_adapter_af:2; u8 reserved:7; #elif defined (__LITTLE_ENDIAN_BITFIELD) u8 reserved:7; - u8 enable_dual_ioa_af:1; + u8 dual_adapter_af:2; #endif + +#define DISABLE_DUAL_IOA_AF 0x00 +#define ENABLE_DUAL_IOA_AF 0x02 +#define ENABLE_DUAL_IOA_ACTIVE_ACTIVE 0x03 }; struct ipr_config_term_hdr { @@ -1488,7 +1511,8 @@ #if defined (__BIG_ENDIAN_BITFIELD) u8 dual_ioa_raid:1; u8 dual_ioa_wcache:1; - u8 reserved:6; + u8 dual_ioa_asymmetric_access:1; + u8 reserved:5; u8 can_attach_to_aux_cache:1; u8 is_aux_cache:1; @@ -1498,7 +1522,8 @@ u8 reserved4[2]; #elif defined (__LITTLE_ENDIAN_BITFIELD) - u8 reserved:6; + u8 reserved:5; + u8 dual_ioa_asymmetric_access:1; u8 dual_ioa_wcache:1; u8 dual_ioa_raid:1; @@ -1989,7 +2014,7 @@ int sg_ioctl(int, u8 *, void *, u32, u32, struct sense_data_t *, u32); int sg_ioctl_noretry(int, u8 *, void *, u32, u32, struct sense_data_t *, u32); -int ipr_set_preferred_primary(struct ipr_ioa *, int); +int ipr_change_multi_adapter_assignment(struct ipr_ioa *, int, int); int set_ha_mode(struct ipr_ioa *, int); int set_preferred_primary(struct ipr_ioa *, int); void check_current_config(bool); @@ -2017,6 +2042,7 @@ int ipr_start_array_protection(struct ipr_ioa *, int, int); int ipr_migrate_array_protection(struct ipr_ioa *, struct ipr_array_query_data *, int, int, int); +int ipr_set_array_asym_access(struct ipr_dev *, struct ipr_array_query_data *); int ipr_add_hot_spare(struct ipr_ioa *); int ipr_rebuild_device_data(struct ipr_ioa *); int ipr_resync_array(struct ipr_ioa *); @@ -2051,7 +2077,10 @@ int ipr_get_dev_attr(struct ipr_dev *, struct ipr_disk_attr *); int ipr_modify_dev_attr(struct ipr_dev *, struct ipr_disk_attr *); int ipr_set_ioa_attr(struct ipr_ioa *, struct ipr_ioa_attr *, int); +int ipr_modify_ioa_attr(struct ipr_ioa *, struct ipr_ioa_attr *); int ipr_set_dev_attr(struct ipr_dev *, struct ipr_disk_attr *, int); +int set_active_active_mode(struct ipr_ioa *, int); + int ipr_query_dasd_timeouts(struct ipr_dev *, struct ipr_query_dasd_timeouts *); int get_ioa_firmware_image_list(struct ipr_ioa *, struct ipr_fw_images **); int get_dasd_firmware_image_list(struct ipr_dev *, struct ipr_fw_images **); @@ -2286,4 +2315,5 @@ } \ } \ } while (0) -#endif + +#endif /* iprlib_h */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/spec/iprutils.spec new/iprutils/spec/iprutils.spec --- old/iprutils/spec/iprutils.spec 2008-08-14 01:37:37.000000000 +0200 +++ new/iprutils/spec/iprutils.spec 2008-09-26 22:33:43.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.10 +Version: 2.2.11 Release: 1 License: CPL Group: System Environment/Base @@ -81,9 +81,19 @@ %{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Fri Sep 26 2008 Wayne Boyer <wayneb(a)linux.vnet.ibm.com> 2.2.11 +- Release 2.2.11 +- Add support for the active-active functionality. +* Wed Aug 20 2008 Wayne Boyer <wayneb(a)linux.vnet.ibm.com> +- Fixed a compilation failure on small endian systems. * Wed Aug 13 2008 Wayne Boyer <wayneb(a)linux.vnet.ibm.com> 2.2.10 - Release 2.2.10 - Add support for the array migration functionality. +* Wed May 14 2008 Tseng-Hui Lin <tsenglin(a)us.ibm.com> +- Under heavy traffic, download microcode to a disk through /dev/sgX + may get -ENOMEM SG_IO ioctl. Change to use /dev/sdX. Fall back + to /dev/sgX if: (1) /dev/sdX does not exist or (2) max_sectors_kb + is not set large enough for microcode download. * Thu Apr 09 2008 Tseng-Hui Lin <tsenglin(a)us.ibm.com> 2.2.9 - Release 2.2.9 - Do not save preferred primary attribute to fix an infinite failover diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/iprutils/version.mk new/iprutils/version.mk --- old/iprutils/version.mk 2008-08-14 01:29:22.000000000 +0200 +++ new/iprutils/version.mk 2008-09-26 22:33:30.000000000 +0200 @@ -6,9 +6,9 @@ IPR_MAJOR_RELEASE=2 IPR_MINOR_RELEASE=2 -IPR_FIX_LEVEL=10 +IPR_FIX_LEVEL=11 IPR_RELEASE=1 -IPR_FIX_DATE=(August 13, 2008) +IPR_FIX_DATE=(September 26, 2008) IPR_VERSION_STR=$(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) $(IPR_FIX_DATE) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package installation-images checked in at Mon Sep 29 17:43:18 CEST 2008. -------- --- installation-images/installation-images.changes 2008-09-26 14:31:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-09-29 17:06:06.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Sep 29 17:06:01 CEST 2008 - snwint(a)suse.de + +- added uname (bnc #429917) +- look for driver updates on usb media (bnc #363650) +- yast2-theme-openSUSE -> *-SLED + +------------------------------------------------------------------- +Fri Sep 26 18:21:51 CEST 2008 - snwint(a)suse.de + +- provide PS3 bootloader only on openSuSE +- remove /.buildenv usage, BUILD_DISTRIBUTION_NAME comes now from the rpm spec file +- added iwl5000-ucode +- really added ofed-kmp + +------------------------------------------------------------------- Old: ---- installation-images-11.17.tar.bz2 New: ---- installation-images-11.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.i23089/_old 2008-09-29 17:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.i23089/_new 2008-09-29 17:40:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.17) +# spec file for package installation-images (Version 11.19) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,10 +28,10 @@ BuildRequires: build-key gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare perl-XML-NamespaceSupport perl-XML-Parser perl-XML-Simple yast2-iscsi-client yast2-ncurses BuildRequires: Mesa tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp yast2-devtools -BuildRequires: alsa alsa-utils bind-libs bind-utils espeak lsscsi openldap2-client portaudio portmap python rpcbind sdparm smp_utils uuid-runtime yast2-multipath +BuildRequires: alsa alsa-utils bind-libs bind-utils chkrootkit espeak lsscsi openldap2-client portaudio portmap python rpcbind sdparm smp_utils uuid-runtime xorg-x11-xauth yast2-multipath # kmps %ifarch %ix86 x86_64 -BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode ralink-firmware wireless-tools wpa_supplicant +BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode iwl5000-ucode ralink-firmware wireless-tools wpa_supplicant BuildRequires: at76_usb-kmp-default wlan-ng-kmp-default %if %{build_xen} BuildRequires: at76_usb-kmp-xen wlan-ng-kmp-xen @@ -75,9 +75,9 @@ %ifnarch s390 s390x BuildRequires: ofed-kmp-default %endif -#%if %has_sles -#BuildRequires: yast2-theme-SLED -#%endif +%if %has_sles +BuildRequires: yast2-theme-SLED +%endif BuildRequires: desktop-data-openSUSE yast2-theme-openSUSE %ifnarch s390 # BuildRequires: blocxx-debuginfo boost-debuginfo bzip2-debuginfo curl-debuginfo dbus-1-debuginfo dbus-1-glib-debuginfo e2fsprogs-debuginfo expat-debuginfo fontconfig-debuginfo freetype2-debuginfo gcc43-debuginfo glib2-debuginfo glibc-debuginfo hal-debuginfo hwinfo-debuginfo icu-debuginfo jpeg-debuginfo kdelibs3-debuginfo libidn-debuginfo libpng12-0-debuginfo libqt4-debuginfo libxcrypt-debuginfo libxml2-debuginfo libzypp-debuginfo openssl-debuginfo pcre-debuginfo perl-debuginfo perl-gettext-debuginfo qt3-debuginfo rpm-debuginfo sysfsutils-debuginfo wireless-tools-debuginfo xorg-x11-libICE-debuginfo xorg-x11-libSM-debuginfo xorg-x11-libX11-debuginfo xorg-x11-libXau-debuginfo xorg-x11-libXdmcp-debuginfo xorg-x11-libXext-debuginfo xorg-x11-libXfixes-debuginfo xorg-x11-libXmu-debuginfo xorg-x11-libXrender-debuginfo xorg-x11-libfontenc-debuginfo xorg-x11-libs-debuginfo xorg-x11-libxcb-debuginfo xorg-x11-server-debuginfo yast2-core-debuginfo yast2-hardware-detection-debuginfo yast2-perl-bindings-debuginfo yast2-pkg-bindings-debuginfo yast2-qt-debuginfo yast2-xml-debuginfo zlib-debuginfo @@ -89,9 +89,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.17 -Release: 2 -Source: installation-images-11.17.tar.bz2 +Version: 11.19 +Release: 1 +Source: installation-images-11.19.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -107,7 +107,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 460 +Release: 461 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -171,6 +171,15 @@ /usr/sbin/mkinstallinitrd %changelog +* Mon Sep 29 2008 snwint(a)suse.de +- added uname (bnc #429917) +- look for driver updates on usb media (bnc #363650) +- yast2-theme-openSUSE -> *-SLED +* Fri Sep 26 2008 snwint(a)suse.de +- provide PS3 bootloader only on openSuSE +- remove /.buildenv usage, BUILD_DISTRIBUTION_NAME comes now from the rpm spec file +- added iwl5000-ucode +- really added ofed-kmp * Fri Sep 26 2008 jjolly(a)suse.de - Added ofed to BuildRequires in order to get the latest cxgb3 * Tue Sep 23 2008 snwint(a)suse.de ++++++ installation-images-11.17.tar.bz2 -> installation-images-11.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/bin/mk_ppc_installation-images_bootbinaries.sh new/installation-images-11.19/bin/mk_ppc_installation-images_bootbinaries.sh --- old/installation-images-11.17/bin/mk_ppc_installation-images_bootbinaries.sh 2008-08-20 15:16:46.000000000 +0200 +++ new/installation-images-11.19/bin/mk_ppc_installation-images_bootbinaries.sh 2008-09-26 12:16:38.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: mk_ppc_installation-images_bootbinaries.sh 2538 2008-08-20 14:23:50Z snwint $ +# $Id: mk_ppc_installation-images_bootbinaries.sh 2584 2008-09-26 07:47:28Z olh $ # usage: $0 [-32] [-64] <bdir> <targetdirectory> set -ex @@ -26,11 +26,10 @@ # bdir=$1 targetdir=$2 -if [ -z "$bdir" -o -z "$targetdir" -o ! -f /.buildenv ] ; then +if [ -z "$bdir" -o -z "$targetdir" ] ; then echo usage: $0 builddir targetdir exit 1 fi -. /.buildenv CD1=$targetdir/CD1 CD2=$targetdir/FTP # @@ -39,12 +38,13 @@ mkdir -pv $CD2/suseboot # to trigger the HFS part, avoid 8.3 filenames and allow OF booting mkdir -pv $CD1/suseboot -mkdir -pv $CD1/PS3/otheros -# -cp -pfv /usr/share/ps3/otheros.bld $CD1/PS3/otheros cp -pfv /lib/lilo/pmac/yaboot $CD1/suseboot/yaboot cp -pfv /lib/lilo/chrp/yaboot.chrp $CD1/suseboot/yaboot.ibm if test "$do_32" = "true" ; then +# provide PS3 bootloader only on openSuSE +mkdir -pv $CD1/PS3/otheros +cp -pfv /usr/share/ps3/otheros.bld $CD1/PS3/otheros +# cp -pfv $bdir/images/initrd $CD1/suseboot/initrd32 gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux32.gz fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/Changelog new/installation-images-11.19/Changelog --- old/installation-images-11.17/Changelog 2008-09-23 16:37:41.000000000 +0200 +++ new/installation-images-11.19/Changelog 2008-09-29 16:59:14.000000000 +0200 @@ -1,3 +1,14 @@ +29/9/2008: v11.19 + - added uname (bnc #429917) + - look for driver updates on usb media (bnc #363650) + - yast2-theme-openSUSE -> *-SLED + +26/9/2008: v11.18 + - provide PS3 bootloader only on openSuSE + - remove /.buildenv usage, BUILD_DISTRIBUTION_NAME comes now from the rpm spec file + - added iwl5000-ucode + - added ofed-kmp + 23/9/2008: v11.17 - ia64: link image -> efi, remove initdisk.gz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/initrd/biostest.file_list new/installation-images-11.19/data/initrd/biostest.file_list --- old/installation-images-11.17/data/initrd/biostest.file_list 2008-07-30 11:52:53.000000000 +0200 +++ new/installation-images-11.19/data/initrd/biostest.file_list 2008-09-29 16:08:20.000000000 +0200 @@ -73,8 +73,8 @@ /usr/lib*/libopensc.so* /usr/lib*/libscconf.so* -libltdl-3: - /usr/lib*/libltdl.so* +libltdl7: + /usr/lib* pcsc-lite: /usr/lib*/libpcsclite.so* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/initrd/initrd.file_list new/installation-images-11.19/data/initrd/initrd.file_list --- old/installation-images-11.17/data/initrd/initrd.file_list 2008-09-19 12:36:33.000000000 +0200 +++ new/installation-images-11.19/data/initrd/initrd.file_list 2008-09-29 16:38:35.000000000 +0200 @@ -330,8 +330,11 @@ /usr/lib*/libhal.so.* /var/cache/hald -libusb: - /usr/lib*/libusb-0.1.so.* +libusb-1_0-0: + /usr/lib* + +libusb-0_1-4: + /usr/lib* libuuid1: /lib*/libuuid.so.* @@ -363,6 +366,9 @@ iwl4965-ucode: /lib/firmware/iwlwifi-* + iwl5000-ucode: + /lib/firmware/iwlwifi-* + atmel-firmware: /lib/firmware @@ -432,6 +438,7 @@ /bin/ln /bin/true /bin/false + /bin/uname pcmciautils: /etc/udev/rules.d/60-pcmcia.rules @@ -783,3 +790,6 @@ e echo "InitrdID: <instsys_build_id>" >>linuxrc.config endif +# look for driver updates on usb media (bnc #363650) +e echo "dud: disk:/?device=*usb*" >>linuxrc.config + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/rescue/rescue.file_list new/installation-images-11.19/data/rescue/rescue.file_list --- old/installation-images-11.17/data/rescue/rescue.file_list 2008-09-19 13:04:32.000000000 +0200 +++ new/installation-images-11.19/data/rescue/rescue.file_list 2008-09-29 16:13:02.000000000 +0200 @@ -361,8 +361,11 @@ /usr/sbin/lsusb /usr/share/usb.ids -libusb: - /usr/lib*/libusb-0.1.so.* +libusb-1_0-0: + /usr/lib* + +libusb-0_1-4: + /usr/lib* portmap: postin /etc @@ -688,8 +691,8 @@ /usr/lib*/libopensc.so.* /usr/lib*/libscconf.so.* -libltdl-3: - /usr/lib*/libltdl.so* +libltdl7: + /usr/lib* endif @@ -809,6 +812,9 @@ cifs-mount: /sbin/mount.cifs +chkrootkit: + /sbin + if arch eq 'i386' || arch eq 'x86_64' sbl: /etc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/root/gdb.file_list new/installation-images-11.19/data/root/gdb.file_list --- old/installation-images-11.17/data/root/gdb.file_list 2008-08-19 12:34:11.000000000 +0200 +++ new/installation-images-11.19/data/root/gdb.file_list 2008-09-29 16:33:37.000000000 +0200 @@ -1,8 +1,8 @@ gdb: /usr/bin/gdb -python: - /usr/lib*/libpython*.so.* +libpython2_6-1_0: + /usr/lib* x gdb.init .init x gdb.done .done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/root/machbunt.file_list new/installation-images-11.19/data/root/machbunt.file_list --- old/installation-images-11.17/data/root/machbunt.file_list 2008-09-22 19:02:10.000000000 +0200 +++ new/installation-images-11.19/data/root/machbunt.file_list 2008-09-29 16:18:33.000000000 +0200 @@ -177,7 +177,6 @@ /usr/bin/mkfontdir /usr/bin/mkfontscale /usr/bin/setxkbmap - /usr/bin/xauth /usr/bin/xdpyinfo /usr/bin/xhost /usr/bin/xkbcomp @@ -185,6 +184,9 @@ /usr/bin/xrefresh /usr/bin/xset + xorg-x11-xauth: + /usr/bin/xauth + xorg-x11-fonts-core: # 'fixed' font /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/root/root.file_list new/installation-images-11.19/data/root/root.file_list --- old/installation-images-11.17/data/root/root.file_list 2008-09-23 13:37:16.000000000 +0200 +++ new/installation-images-11.19/data/root/root.file_list 2008-09-29 16:23:04.000000000 +0200 @@ -625,8 +625,8 @@ /usr/lib*/libopensc.so.* /usr/lib*/libscconf.so.* -libltdl-3: - /usr/lib*/libltdl.so* +libltdl7: + /usr/lib* endif @@ -787,8 +787,11 @@ /usr/sbin/lsusb /usr/share/usb.ids -libusb: - /usr/lib*/libusb-0.1.so.* +libusb-1_0-0: + /usr/lib* + +libusb-0_1-4: + /usr/lib* checkmedia: /usr/bin/checkmedia diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/root/SLED.file_list new/installation-images-11.19/data/root/SLED.file_list --- old/installation-images-11.17/data/root/SLED.file_list 2008-09-17 13:55:48.000000000 +0200 +++ new/installation-images-11.19/data/root/SLED.file_list 2008-09-29 16:57:17.000000000 +0200 @@ -2,9 +2,9 @@ desktop-data-openSUSE: /usr/share/desktop-data/qtrc -yast2-theme-openSUSE: +yast2-theme-SLED: / - s openSUSE usr/share/YaST2/theme/current + s SLED usr/share/YaST2/theme/current include texts.file_list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/data/root/SLES.file_list new/installation-images-11.19/data/root/SLES.file_list --- old/installation-images-11.17/data/root/SLES.file_list 2008-09-17 13:55:34.000000000 +0200 +++ new/installation-images-11.19/data/root/SLES.file_list 2008-09-29 16:58:27.000000000 +0200 @@ -2,9 +2,9 @@ desktop-data-openSUSE: /usr/share/desktop-data/qtrc -yast2-theme-openSUSE: +yast2-theme-SLED: / - s openSUSE usr/share/YaST2/theme/current + s SLED usr/share/YaST2/theme/current include texts.file_list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/etc/config new/installation-images-11.19/etc/config --- old/installation-images-11.17/etc/config 2008-09-17 14:28:19.000000000 +0200 +++ new/installation-images-11.19/etc/config 2008-09-26 18:06:42.000000000 +0200 @@ -41,8 +41,11 @@ ; extra kmps we need (',' separated list) [KMP] default = -i386 = at76_usb,wlan-ng -x86_64 = at76_usb,wlan-ng +i386 = at76_usb,wlan-ng,ofed +x86_64 = at76_usb,wlan-ng,ofed +ia64 = ofed +ppc = ofed +ppc64 = ofed ; lib directory diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/etc/module.list new/installation-images-11.19/etc/module.list --- old/installation-images-11.17/etc/module.list 2008-09-03 12:48:16.000000000 +0200 +++ new/installation-images-11.19/etc/module.list 2008-09-26 18:21:09.000000000 +0200 @@ -169,3 +169,6 @@ # kmps updates/ +# ofed-kmp +-updates/drivers/infiniband/ +-updates/net/rds/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.17/VERSION new/installation-images-11.19/VERSION --- old/installation-images-11.17/VERSION 2008-09-23 16:37:08.000000000 +0200 +++ new/installation-images-11.19/VERSION 2008-09-29 15:39:40.000000000 +0200 @@ -1 +1 @@ -11.17 +11.19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit compiz-fusion-plugins-extra
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package compiz-fusion-plugins-extra checked in at Mon Sep 29 17:42:26 CEST 2008. -------- --- compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.changes 2008-09-15 23:43:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.changes 2008-09-29 16:52:36.000000000 +0200 @@ -2 +2 @@ -Thu Sep 10 00:00:00 CEST 2008 - davidr(a)novell.com +Mon Sep 29 16:51:51 CEST 2008 - rodrigo(a)novell.com @@ -4,2 +4,16 @@ -- Include NOMAD changes with support for non top-level window - compositing. +- Review and merge changes from X11:Compiz + +------------------------------------------------------------------- +Fri Sep 19 13:31:47 IST 2008 - cyberorg(a)opensuse.org + +- Patch compiz-plugins-extra-defaults.diff + +------------------------------------------------------------------- +Wed Sep 17 20:20:07 IST 2008 - cyberorg(a)opensuse.org + +- Release 0.7.8 +- New animationaddon plugin +- l10n updates +- Fix a lot of mem leaks +- Merged cubecaps plugin functianality +- Add -devel package Old: ---- compiz-fusion-plugins-extra-0.7.6.tar.bz2 plugins-extra-0.7.6-NOMAD.diff New: ---- compiz-fusion-plugins-extra-0.7.8.tar.bz2 compiz-plugins-extra-defaults.diff plugins-extra-NOMAD.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-fusion-plugins-extra.spec ++++++ --- /var/tmp/diff_new_pack.eS1145/_old 2008-09-29 17:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.eS1145/_new 2008-09-29 17:42:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package compiz-fusion-plugins-extra (Version 0.7.6) +# spec file for package compiz-fusion-plugins-extra (Version 0.7.8 ) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,13 +31,14 @@ PreReq: %fillup_prereq Requires: compiz compiz-fusion-plugins-main Conflicts: compiz-extra compiz-extra-git -Version: 0.7.6 -Release: 67 +Version: 0.7.8 +Release: 1 Summary: Compiz-Fusion community extra plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 Source: %{name}-%{version}.tar.bz2 -Patch: plugins-extra-0.7.6-NOMAD.diff +Patch: compiz-plugins-extra-defaults.diff +Patch1: plugins-extra-NOMAD.diff %define gnome_prefix %(pkg-config --variable=prefix gnome-desktop-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc @@ -60,9 +61,30 @@ -------- David Reveman and the Compiz-Fusion community +%package devel +License: GPL v2 or later +Summary: Compiz-Fusion community extra plugins +Group: System/X11/Utilities +Requires: compiz-fusion-plugins-main-devel +AutoReqProv: on + +%description devel +This package contains Compiz-Fusion community extra plugins. + +Contains: addhelper crashhandler extrawm firepaint goto-viewport +mswitch scalefilter splash bench cubereflex fadedesktop gears group +mblur reflex showdesktop trailfocus. + + + +Authors: +-------- + David Reveman and the Compiz-Fusion community + %prep %setup -q -n %{name}-%{version} %patch -p1 +%patch1 -p1 %build # @@ -104,10 +126,23 @@ %{_libdir}/compiz/* %{_datadir}/compiz/* +%files devel +%defattr(-, root, root) +%{_includedir}/compiz/compiz-animationaddon.h +%{_libdir}/pkgconfig/compiz-animationaddon.pc + %changelog -* Wed Sep 10 2008 davidr(a)novell.com -- Include NOMAD changes with support for non top-level window - compositing. +* Mon Sep 29 2008 rodrigo(a)novell.com +- Review and merge changes from X11:Compiz +* Fri Sep 19 2008 cyberorg(a)opensuse.org +- Patch compiz-plugins-extra-defaults.diff +* Wed Sep 17 2008 cyberorg(a)opensuse.org +- Release 0.7.8 +- New animationaddon plugin +- l10n updates +- Fix a lot of mem leaks +- Merged cubecaps plugin functianality +- Add -devel package * Tue Jul 01 2008 mhopf(a)suse.de - Update from buildservice. * Sat May 31 2008 cyberorg(a)opensuse.org ++++++ compiz-fusion-plugins-extra-0.7.6.tar.bz2 -> compiz-fusion-plugins-extra-0.7.8.tar.bz2 ++++++ ++++ 169610 lines of diff (skipped) ++++++ compiz-plugins-extra-defaults.diff ++++++ diff -ur a/metadata/animationaddon.xml.in b/metadata/animationaddon.xml.in --- a/metadata/animationaddon.xml.in 2008-09-19 13:21:35.000000000 +0530 +++ b/metadata/animationaddon.xml.in 2008-09-19 13:23:55.000000000 +0530 @@ -90,14 +90,14 @@ <option name="fire_particles" type="int"> <_short>Number Of Fire Particles</_short> <_long>Number of fire particles.</_long> - <default>1000</default> + <default>300</default> <min>100</min> <max>10000</max> </option> <option name="fire_size" type="float"> <_short>Fire Particle Size</_short> <_long>Fire particle size.</_long> - <default>5</default> + <default>3</default> <min>0.1</min> <max>20</max> <precision>0.1</precision> diff -ur a/metadata/cubeaddon.xml.in b/metadata/cubeaddon.xml.in --- a/metadata/cubeaddon.xml.in 2008-09-19 13:21:35.000000000 +0530 +++ b/metadata/cubeaddon.xml.in 2008-09-19 13:25:15.000000000 +0530 @@ -220,7 +220,7 @@ <option name="top_scale" type="bool"> <_short>Scale top image</_short> <_long>Scale image to cover top face of cube</_long> - <default>true</default> + <default>false</default> </option> <option name="bottom_scale" type="bool"> <_short>Scale bottom image</_short> @@ -274,7 +274,7 @@ <type>string</type> <hints>file;image;</hints> <default> - <value>fusioncap.png</value> + <value>opensuse.png</value> </default> <hints>file;image;</hints> </option> ++++++ plugins-extra-0.7.6-NOMAD.diff -> plugins-extra-NOMAD.diff ++++++ --- compiz-fusion-plugins-extra/plugins-extra-0.7.6-NOMAD.diff 2008-09-10 19:24:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz-fusion-plugins-extra/plugins-extra-NOMAD.diff 2008-09-19 19:01:38.000000000 +0200 @@ -1,3 +1,9 @@ +commit ba8eb7e0a668c5ad7dd10729a70693b786735d5b +Author: David Reveman <david(a)x300.site> +Date: Tue Sep 9 21:26:04 2008 +0200 + + Minimal effort to make plugins build against core. + diff --git a/src/3d/3d.c b/src/3d/3d.c index 0afa8cc..545951a 100644 --- a/src/3d/3d.c @@ -69,8 +75,33 @@ { ADD_WINDOW (w); +diff --git a/src/animationaddon/polygon.c b/src/animationaddon/polygon.c +index 9095e8b..41e0f66 100644 +--- a/src/animationaddon/polygon.c ++++ b/src/animationaddon/polygon.c +@@ -980,8 +980,9 @@ polygonsDrawCustomGeometry (CompWindow * w) + aw->nDrawGeometryCalls++; + + // draw windows only on current viewport unless it's on all viewports +- if ((s->windowOffsetX != 0 || s->windowOffsetY != 0) && +- !windowOnAllViewports (w)) ++ if (!w->parent || ++ ((w->parent->viewportOffsetX || w->parent->viewportOffsetY) && ++ !windowOnAllViewports (w))) + { + return; + // since this is not the viewport the window was drawn +@@ -1643,7 +1644,7 @@ polygonsPrePaintOutput (CompScreen *s, CompOutput *output) + // Find out if an animation running now uses depth test + Bool depthUsed = FALSE; + CompWindow *w; +- for (w = s->windows; w; w = w->next) ++ for (w = s->root.windows; w; w = w->next) + { + ANIMADDON_WINDOW (w); + if (aw->com->animRemainingTime > 0 && diff --git a/src/cubeaddon/cubeaddon.c b/src/cubeaddon/cubeaddon.c -index 54400cb..7ed4896 100644 +index 413a72d..5f65385 100644 --- a/src/cubeaddon/cubeaddon.c +++ b/src/cubeaddon/cubeaddon.c @@ -963,8 +963,10 @@ cubeaddonAddWindowGeometry (CompWindow *w, @@ -113,7 +144,7 @@ if (cs->moMode == CUBE_MOMODE_ONE) diff --git a/src/fadedesktop/fadedesktop.c b/src/fadedesktop/fadedesktop.c -index 0f341d1..41306a7 100644 +index 3336f74..16f74f4 100644 --- a/src/fadedesktop/fadedesktop.c +++ b/src/fadedesktop/fadedesktop.c @@ -96,7 +96,7 @@ fadeDesktopActivateEvent (CompScreen *s, @@ -162,10 +193,10 @@ if (w && (w->id != cw->id)) continue; diff --git a/src/firepaint/firepaint.c b/src/firepaint/firepaint.c -index f9df36b..b037eda 100644 +index 825ca69..2db549a 100644 --- a/src/firepaint/firepaint.c +++ b/src/firepaint/firepaint.c -@@ -478,7 +478,7 @@ fireTerminate (CompDisplay *d, +@@ -509,7 +509,7 @@ fireTerminate (CompDisplay *d, { FIRE_SCREEN (s); @@ -175,10 +206,10 @@ if (fs->grabIndex) diff --git a/src/group/cairo.c b/src/group/cairo.c -index 533b4ac..da36720 100644 +index a3aef9c..9b3d2bd 100644 --- a/src/group/cairo.c +++ b/src/group/cairo.c -@@ -684,7 +684,8 @@ groupRenderWindowTitle (GroupSelection *group) +@@ -689,7 +689,8 @@ groupRenderWindowTitle (GroupSelection *group) { /* getting the pixmap failed, so create an empty one */ Pixmap emptyPixmap; @@ -189,7 +220,7 @@ if (emptyPixmap) { diff --git a/src/group/group.c b/src/group/group.c -index 0447fac..53bf3f0 100644 +index 3a1d4e0..67eab18 100644 --- a/src/group/group.c +++ b/src/group/group.c @@ -276,7 +276,7 @@ groupRaiseWindows (CompWindow *top, @@ -211,7 +242,7 @@ if (w->id == cw->frame) { diff --git a/src/group/init.c b/src/group/init.c -index 7f22ce5..d8d817a 100644 +index 920e181..336e124 100644 --- a/src/group/init.c +++ b/src/group/init.c @@ -75,7 +75,7 @@ groupScreenOptionChanged (CompScreen *s, @@ -255,7 +286,7 @@ if (groupIsGroupWindow (w) && groupWindowInRegion (w, reg, precision)) diff --git a/src/group/tab.c b/src/group/tab.c -index fe43a1b..3a85de8 100644 +index 2e57b69..8a1b861 100644 --- a/src/group/tab.c +++ b/src/group/tab.c @@ -43,7 +43,7 @@ groupGetCurrentMousePosition (CompScreen *s, @@ -276,7 +307,7 @@ o[1].type = CompOptionTypeBool; o[1].name = "active"; -@@ -940,7 +940,7 @@ groupUpdateTabBars (CompScreen *s, +@@ -942,7 +942,7 @@ groupUpdateTabBars (CompScreen *s, if (!otherScreenGrabExist (s, "group", "group-drag", 0)) { /* first check if the entered window is a frame */ @@ -285,7 +316,7 @@ { if (w->frame == enteredWin) break; -@@ -1054,7 +1054,7 @@ groupGetConstrainRegion (CompScreen *s) +@@ -1056,7 +1056,7 @@ groupGetConstrainRegion (CompScreen *s) r.rects = &r.extents; r.numRects = r.size = 1; @@ -294,7 +325,7 @@ { if (!w->mapNum) continue; -@@ -2752,7 +2752,7 @@ groupCreateInputPreventionWindow (GroupSelection *group) +@@ -2756,7 +2756,7 @@ groupCreateInputPreventionWindow (GroupSelection *group) group->inputPrevention = XCreateWindow (group->screen->display->display, @@ -326,7 +357,7 @@ } } diff --git a/src/maximumize/maximumize.c b/src/maximumize/maximumize.c -index 0f11aa4..5834520 100644 +index 8b20364..f93ee15 100644 --- a/src/maximumize/maximumize.c +++ b/src/maximumize/maximumize.c @@ -77,7 +77,7 @@ maximumizeEmptyRegion (CompWindow *window, @@ -361,7 +392,7 @@ } } diff --git a/src/scalefilter/scalefilter.c b/src/scalefilter/scalefilter.c -index 277fbd9..5a4f095 100644 +index cc7e545..1a4bdb8 100644 --- a/src/scalefilter/scalefilter.c +++ b/src/scalefilter/scalefilter.c @@ -323,7 +323,7 @@ scalefilterRelayout (CompScreen *s) @@ -374,7 +405,7 @@ if (action->initiate) { diff --git a/src/shelf/shelf.c b/src/shelf/shelf.c -index 2605daa..70774fe 100644 +index e6b636c..d522280 100644 --- a/src/shelf/shelf.c +++ b/src/shelf/shelf.c @@ -241,7 +241,7 @@ shelfPreparePaintScreen (CompScreen *s, @@ -396,7 +427,7 @@ w->serverY - w->input.top, w->serverWidth + w->input.left + w->input.right, diff --git a/src/showdesktop/showdesktop.c b/src/showdesktop/showdesktop.c -index cee5bed..751b0d4 100644 +index cc5a07d..30c87dd 100644 --- a/src/showdesktop/showdesktop.c +++ b/src/showdesktop/showdesktop.c @@ -285,7 +285,7 @@ prepareSDWindows (CompScreen *s, @@ -426,7 +457,7 @@ { if (w->inShowDesktopMode) inSDMode = TRUE; -@@ -661,7 +661,7 @@ showdesktopEnterShowDesktopMode (CompScreen *s) +@@ -663,7 +663,7 @@ showdesktopEnterShowDesktopMode (CompScreen *s) count = prepareSDWindows (s, ss->state); if (count > 0) { @@ -435,7 +466,7 @@ RevertToPointerRoot, CurrentTime); ss->state = SD_STATE_ACTIVATING; damageScreen (s); -@@ -683,7 +683,7 @@ showdesktopLeaveShowDesktopMode (CompScreen *s, +@@ -685,7 +685,7 @@ showdesktopLeaveShowDesktopMode (CompScreen *s, { CompWindow *cw; @@ -445,7 +476,7 @@ SD_WINDOW (cw); diff --git a/src/splash/splash.c b/src/splash/splash.c -index e3da718..691d5cb 100644 +index c1c0f51..f2a3a64 100644 --- a/src/splash/splash.c +++ b/src/splash/splash.c @@ -237,7 +237,7 @@ splashGetCurrentOutputRect (CompScreen *s, @@ -476,10 +507,10 @@ (unsigned char *) &value, 1); ss->initiate = TRUE; diff --git a/src/trailfocus/trailfocus.c b/src/trailfocus/trailfocus.c -index ca73ba1..49843b2 100644 +index e89d48f..9918f45 100644 --- a/src/trailfocus/trailfocus.c +++ b/src/trailfocus/trailfocus.c -@@ -124,7 +124,7 @@ setWindows (CompScreen *s) +@@ -127,7 +127,7 @@ setWindows (CompScreen *s) winMax = trailfocusGetWindowsCount (s); @@ -488,7 +519,7 @@ { TRAILFOCUS_WINDOW (w); -@@ -303,7 +303,7 @@ cleanList (CompScreen *s) +@@ -306,7 +306,7 @@ cleanList (CompScreen *s) if (i < winMax) { @@ -498,7 +529,7 @@ w = w->next; diff --git a/src/wallpaper/wallpaper.c b/src/wallpaper/wallpaper.c -index 8b83d89..72c632c 100644 +index 3adc78b..6d5c108 100644 --- a/src/wallpaper/wallpaper.c +++ b/src/wallpaper/wallpaper.c @@ -368,9 +368,10 @@ createFakeDesktopWindow (CompScreen *s) @@ -558,10 +589,10 @@ if (ws->fakeDesktop != None) destroyFakeDesktopWindow (s); diff --git a/src/widget/widget.c b/src/widget/widget.c -index d737e41..97eeab3 100644 +index ba6b27b..6ac7d68 100644 --- a/src/widget/widget.c +++ b/src/widget/widget.c -@@ -117,14 +117,14 @@ widgetUpdateTreeStatus (CompWindow *w) +@@ -119,14 +119,14 @@ widgetUpdateTreeStatus (CompWindow *w) WIDGET_SCREEN (w->screen); /* first clear out every reference to our window */ @@ -578,16 +609,16 @@ { Window clientLeader; -@@ -233,7 +233,7 @@ widgetSetWidgetLayerMapState (CompScreen *s, - { - CompWindow *w; +@@ -249,7 +249,7 @@ widgetSetWidgetLayerMapState (CompScreen *s, + + WIDGET_DISPLAY (s->display); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { WIDGET_WINDOW (w); -@@ -300,7 +300,7 @@ widgetMatchExpHandlerChanged (CompDisplay *d) +@@ -339,7 +339,7 @@ widgetMatchExpHandlerChanged (CompDisplay *d) /* match options are up to date after the call to matchExpHandlerChanged */ for (s = d->screens; s; s = s->next) { @@ -596,7 +627,7 @@ if (widgetUpdateWidgetStatus (w)) { Bool map; -@@ -435,7 +435,7 @@ widgetHandleEvent (CompDisplay *d, +@@ -474,7 +474,7 @@ widgetHandleEvent (CompDisplay *d, o.type = CompOptionTypeInt; o.name = "root"; @@ -605,7 +636,7 @@ widgetToggle (d, NULL, 0, &o, 1); } -@@ -652,7 +652,7 @@ widgetScreenOptionChanged (CompScreen *s, +@@ -691,7 +691,7 @@ widgetScreenOptionChanged (CompScreen *s, case WidgetScreenOptionMatch: { CompWindow *w; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icewm
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package icewm checked in at Mon Sep 29 17:40:36 CEST 2008. -------- --- icewm/icewm.changes 2008-09-11 12:15:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/icewm/icewm.changes 2008-09-29 16:08:43.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 16:08:25 CEST 2008 - mmarek(a)suse.cz + +- fixed unaligned access in XChangeProperly() + +------------------------------------------------------------------- icewm-lite.changes: same change New: ---- icewm-1.2.35-unaligned-access.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm-lite.spec ++++++ --- /var/tmp/diff_new_pack.L19934/_old 2008-09-29 17:40:17.000000000 +0200 +++ /var/tmp/diff_new_pack.L19934/_new 2008-09-29 17:40:17.000000000 +0200 @@ -28,7 +28,7 @@ AutoReqProv: on %define ver 1.2.36pre2 Version: 1.2.35.99.pre2 -Release: 1 +Release: 4 Source: icewm-%{ver}.tar.bz2 Patch0: icewm-LANG.menu.patch Patch1: icewm-multiByte.patch @@ -39,6 +39,7 @@ Patch6: icewm-1.2.35-lite-build.patch Patch7: icewm-1.2.35-dialog-center-fix.patch Patch8: icewm-1.2.35-empty-winmenu.patch +Patch9: icewm-1.2.35-unaligned-access.patch Url: http://www.icewm.org/ Summary: IceWM Window Manager--Lite Version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,6 +70,7 @@ %patch6 %patch7 %patch8 +%patch9 %build %{?suse_update_config:%{suse_update_config -f}} @@ -106,6 +108,8 @@ /usr/bin/icewm-session %changelog +* Mon Sep 29 2008 mmarek(a)suse.cz +- fixed unaligned access in XChangeProperly() * Thu Sep 11 2008 mmarek(a)suse.cz - updated to 1.2.16pre2 * add support for sysfs interface (instead of proc) for battery ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.L19934/_old 2008-09-29 17:40:18.000000000 +0200 +++ /var/tmp/diff_new_pack.L19934/_new 2008-09-29 17:40:18.000000000 +0200 @@ -30,7 +30,7 @@ AutoReqProv: on %define ver 1.2.36pre2 Version: 1.2.35.99.pre2 -Release: 1 +Release: 4 Source: icewm-%{ver}.tar.bz2 Source1: %{name}.desktop Patch0: icewm-LANG.menu.patch @@ -42,6 +42,7 @@ Patch6: icewm-1.2.35-lite-build.patch Patch7: icewm-1.2.35-dialog-center-fix.patch Patch8: icewm-1.2.35-empty-winmenu.patch +Patch9: icewm-1.2.35-unaligned-access.patch # applied in %%build Patch99: icewm-preferences.patch Url: http://www.icewm.org/ @@ -113,6 +114,7 @@ %patch6 %patch7 %patch8 +%patch9 %build %{?suse_update_config:%{suse_update_config -f}} @@ -182,6 +184,8 @@ /usr/bin/icewm-menu-gnome2 %changelog +* Mon Sep 29 2008 mmarek(a)suse.cz +- fixed unaligned access in XChangeProperly() * Thu Sep 11 2008 mmarek(a)suse.cz - updated to 1.2.16pre2 * add support for sysfs interface (instead of proc) for battery ++++++ icewm-1.2.35-unaligned-access.patch ++++++ --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -218,7 +218,7 @@ static void registerProtocols2(Window xi PropModeReplace, (unsigned char *)win_proto, i); #endif - pid_t pid = getpid(); + XID pid = getpid(); const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; #ifdef GNOME1_HINTS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hwinfo
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package hwinfo checked in at Mon Sep 29 17:40:28 CEST 2008. -------- --- hwinfo/hwinfo.changes 2008-09-25 15:01:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2008-09-26 17:53:57.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 26 17:53:52 CEST 2008 - snwint(a)suse.de + +- dump network card eeprom to log (bnc #430170) + +------------------------------------------------------------------- Old: ---- hwinfo-15.6.tar.bz2 New: ---- hwinfo-15.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.H16868/_old 2008-09-29 17:39:53.000000000 +0200 +++ /var/tmp/diff_new_pack.H16868/_new 2008-09-29 17:39:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 15.6) +# spec file for package hwinfo (Version 15.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,9 +28,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 15.6 +Version: 15.7 Release: 1 -Source: hwinfo-15.6.tar.bz2 +Source: hwinfo-15.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +102,8 @@ %doc doc/libhd/html %changelog +* Fri Sep 26 2008 snwint(a)suse.de +- dump network card eeprom to log (bnc #430170) * Thu Sep 25 2008 uli(a)suse.de - s390: dual port OSA Express devices are not detectable; fixing dualport flag to 1 (fate #304080) ++++++ hwinfo-15.6.tar.bz2 -> hwinfo-15.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/Changelog new/hwinfo-15.7/Changelog --- old/hwinfo-15.6/Changelog 2008-09-25 15:00:34.000000000 +0200 +++ new/hwinfo-15.7/Changelog 2008-09-26 17:53:42.000000000 +0200 @@ -1,4 +1,7 @@ -25/9/2008: v15.6 +26/9/2008: v15.7 + - dump network card eeprom to log (bnc #430170) + +26/9/2008: v15.6 - s390: dual port OSA Express devices are not detectable; fixing dualport flag to 1 (fate #304080) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/hd.c new/hwinfo-15.7/src/hd/hd.c --- old/hwinfo-15.6/src/hd/hd.c 2008-09-15 14:25:24.000000000 +0200 +++ new/hwinfo-15.7/src/hd/hd.c 2008-09-26 17:31:43.000000000 +0200 @@ -259,6 +259,7 @@ { pr_isapnp_mod, 0, 4 , "isapnp.mod" }, { pr_isapnp, 0, 0, "pnpdump" }, /* alias for isapnp */ { pr_net, 0, 8|4|2|1, "net" }, + { pr_net_eeprom, 0, 0, "net.eeprom" }, { pr_floppy, 0, 8|4|2|1, "floppy" }, { pr_misc, pr_bios, 8|4|2|1, "misc" }, // ugly hack! { pr_misc_serial, pr_misc, 8|4|2|1, "misc.serial" }, @@ -1812,6 +1813,7 @@ if(hd_probe_feature(hd_data, pr_bios_vram)) hd_data->flags.biosvram = 1; hd_set_probe_feature(hd_data, pr_bios_acpi); hd_set_probe_feature(hd_data, pr_modules_pata); + hd_set_probe_feature(hd_data, pr_net_eeprom); hd_data->flags.pata = hd_probe_feature(hd_data, pr_modules_pata) ? 1 : 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/hd.h new/hwinfo-15.7/src/hd/hd.h --- old/hwinfo-15.6/src/hd/hd.h 2008-09-25 13:52:53.000000000 +0200 +++ new/hwinfo-15.7/src/hd/hd.h 2008-09-26 17:35:50.000000000 +0200 @@ -118,7 +118,7 @@ pr_bios_fb, pr_bios_mode, pr_input, pr_block_mods, pr_bios_vesa, pr_cpuemu_debug, pr_scsi_noserial, pr_wlan, pr_bios_crc, pr_hal, pr_bios_vram, pr_bios_acpi, pr_bios_ddc_ports_1, pr_bios_ddc_ports_2, - pr_bios_ddc_ports_3, pr_bios_ddc_ports_4, pr_modules_pata, + pr_bios_ddc_ports_3, pr_bios_ddc_ports_4, pr_modules_pata, pr_net_eeprom, pr_max, pr_lxrc, pr_default, pr_all /**< pr_all must be last */ } hd_probe_feature_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/net.c new/hwinfo-15.7/src/hd/net.c --- old/hwinfo-15.6/src/hd/net.c 2008-09-11 15:11:51.000000000 +0200 +++ new/hwinfo-15.7/src/hd/net.c 2008-09-26 17:49:52.000000000 +0200 @@ -354,12 +354,30 @@ add_uml(hd_data); add_kma(hd_data); - /* add link status info */ + /* add link status info & dump eeprom */ for(hd = hd_data->hd ; hd; hd = hd->next) { if( hd->module == hd_data->module && hd->base_class.id == bc_network_interface ) { + char *buf = NULL; + str_list_t *sl0, *sl; + + if(hd_probe_feature(hd_data, pr_net_eeprom) && hd->unix_dev_name) { + PROGRESS(2, 0, "eeprom dump"); + + str_printf(&buf, 0, "|/usr/sbin/ethtool -e %s 2>/dev/null", hd->unix_dev_name); + if((sl0 = read_file(buf, 0, 0))) { + ADD2LOG("----- %s %s -----\n", hd->unix_dev_name, "EEPROM dump"); + for(sl = sl0; sl; sl = sl->next) { + ADD2LOG("%s", sl->str); + } + ADD2LOG("----- %s end -----\n", "EEPROM dump"); + free_str_list(sl0); + } + free(buf); + } + for(res = hd->res; res; res = res->next) { if(res->any.type == res_link) break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/s390.c new/hwinfo-15.7/src/hd/s390.c --- old/hwinfo-15.6/src/hd/s390.c 2008-09-25 13:52:21.000000000 +0200 +++ new/hwinfo-15.7/src/hd/s390.c 2007-08-10 15:55:38.000000000 +0200 @@ -218,11 +218,6 @@ hd->detail->ccw.data->cu_model=cumod; hd->detail->ccw.data->dev_model=devmod; hd->detail->ccw.data->lcss=(strtol(curdev->d_name,0,16) << 8) + strtol(curdev->d_name+2,0,16); - - /* OSA Express devices with more than one port are not detectable, so we - have to set dualport for all OSA Express network interfaces */ - if(cutype == 0x1731 && cumod == 1) hd->is.dualport = 1; - hddb_add_info(hd_data,hd); } closedir(bus); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/VERSION new/hwinfo-15.7/VERSION --- old/hwinfo-15.6/VERSION 2008-09-25 15:00:37.000000000 +0200 +++ new/hwinfo-15.7/VERSION 2008-09-26 17:53:09.000000000 +0200 @@ -1 +1 @@ -15.6 +15.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-cups-manager
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gnome-cups-manager checked in at Mon Sep 29 17:40:06 CEST 2008. -------- --- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2008-04-01 21:31:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-cups-manager/gnome-cups-manager.changes 2008-09-28 22:21:06.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 28 22:21:00 CEST 2008 - aj(a)suse.de + +- Cleanup buildrequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-cups-manager.spec ++++++ --- /var/tmp/diff_new_pack.n12822/_old 2008-09-29 17:38:27.000000000 +0200 +++ /var/tmp/diff_new_pack.n12822/_new 2008-09-29 17:38:27.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package gnome-cups-manager (Version 0.33) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,9 +19,9 @@ Name: gnome-cups-manager -BuildRequires: cups cups-devel dbus-1 dbus-1-glib fdupes gcc-c++ gnome-common gnome-icon-theme gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files +BuildRequires: cups-devel dbus-1-glib fdupes gcc-c++ gnome-common gnome-icon-theme intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeui-devel libsmbclient-devel mDNSResponder-devel update-desktop-files Version: 0.33 -Release: 1 +Release: 78 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 only @@ -48,7 +55,7 @@ %package devel License: GPL v2 or later -Group: System/GUI/GNOME +Group: Development/Libraries/GNOME Summary: GNOME CUPS Printer Manager Requires: %{name} = %{version} libgnomecups-devel glib2-devel gnome-keyring-devel gtk2-devel libgnomeui-devel libgnome-devel libglade2-devel libbonobo-devel libsmbclient-devel @@ -118,6 +125,8 @@ %{_includedir}/libgnomecups-1/libgnomecups/* %changelog +* Mon Sep 29 2008 aj(a)suse.de +- Cleanup buildrequires. * Tue Apr 01 2008 crivera(a)suse.de - Update to 0.33. This includes translation updates and three of our patches that we've committed upstream. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnash
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gnash checked in at Mon Sep 29 17:39:21 CEST 2008. -------- --- gnash/gnash.changes 2008-06-18 16:18:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnash/gnash.changes 2008-09-29 17:39:04.354269000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 17:38:54 CEST 2008 - ro(a)suse.de + +- disable autoreconf for new libtool + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.I15703/_old 2008-09-29 17:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.I15703/_new 2008-09-29 17:39:15.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package gnash (Version 0.8.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -21,7 +28,7 @@ %endif Summary: Free Flash movie player Version: 0.8.3 -Release: 1 +Release: 47 License: GPL v2 or later Group: Productivity/Networking/Web/Browsers %if %{cvs_date} @@ -64,7 +71,7 @@ %patch %build -autoreconf -fi +#autoreconf -fi # -fpermissive is for broken boost with gcc-4.3 (#353897) CXXFLAGS="$RPM_OPT_FLAGS -fpermissive" \ %configure \ @@ -106,6 +113,8 @@ %config(noreplace) /etc/gnashpluginrc %changelog +* Mon Sep 29 2008 ro(a)suse.de +- disable autoreconf for new libtool * Wed Jun 18 2008 tiwai(a)suse.de - updated to version 0.8.3: * Native fullscreen support (from AS) implemented. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package git checked in at Mon Sep 29 17:38:01 CEST 2008. -------- --- git/git.changes 2008-09-25 16:09:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git.changes 2008-09-26 17:17:20.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 26 17:17:12 CEST 2008 - schwab(a)suse.de + +- Fix manual pages. + +------------------------------------------------------------------- New: ---- asciidoc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.ch9889/_old 2008-09-29 17:37:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ch9889/_new 2008-09-29 17:37:39.000000000 +0200 @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: git BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto Version: 1.6.0.2 -Release: 1 +Release: 2 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -31,6 +30,7 @@ Source2: sysconfig.git-daemon Source3: git-daemon.init Source4: git.xinetd +Patch: asciidoc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web @@ -226,6 +226,7 @@ %prep %setup -q +%patch -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -376,6 +377,8 @@ /etc/bash_completion.d/git.sh %changelog +* Fri Sep 26 2008 schwab(a)suse.de +- Fix manual pages. * Thu Sep 25 2008 tiwai(a)suse.de - updated to 1.6.0.2: Mostly small bug fixes, see details in ++++++ asciidoc.diff ++++++ diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 40d43b7..9fe70b2 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -24,7 +24,7 @@ ifdef::backend-docbook[] endif::backend-docbook[] ifdef::backend-docbook[] -ifndef::docbook-xsl-172[] +ifdef::docbook-xsl-168[] # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. # v1.72 breaks with this because it replaces dots not in roff requests. [listingblock] @@ -39,7 +39,7 @@ ifdef::doctype-manpage[] endif::doctype-manpage[] </literallayout> {title#}</example> -endif::docbook-xsl-172[] +endif::docbook-xsl-168[] endif::backend-docbook[] ifdef::doctype-manpage[] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gfxboot
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gfxboot checked in at Mon Sep 29 17:37:47 CEST 2008. -------- --- arch/i386/gfxboot/gfxboot.changes 2008-09-25 18:29:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/gfxboot/gfxboot.changes 2008-09-29 14:30:43.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 29 14:30:19 CEST 2008 - snwint(a)suse.de + +- updated SLE themes + +------------------------------------------------------------------- +Fri Sep 26 18:02:53 CEST 2008 - snwint(a)suse.de + +- translations updated + +------------------------------------------------------------------- Old: ---- gfxboot-4.1.4.tar.bz2 New: ---- gfxboot-4.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.NS9446/_old 2008-09-29 17:37:33.000000000 +0200 +++ /var/tmp/diff_new_pack.NS9446/_new 2008-09-29 17:37:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.1.4) +# spec file for package gfxboot (Version 4.1.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,10 +26,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.1.4 +Version: 4.1.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.1.4.tar.bz2 +Source: gfxboot-4.1.6.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 @@ -186,6 +186,10 @@ %ghost /boot/message %changelog +* Mon Sep 29 2008 snwint(a)suse.de +- updated SLE themes +* Fri Sep 26 2008 snwint(a)suse.de +- translations updated * Thu Sep 25 2008 snwint(a)suse.de - added keyboard selection dialog (bnc #422175) * Thu Sep 25 2008 snwint(a)suse.de ++++++ gfxboot-4.1.4.tar.bz2 -> gfxboot-4.1.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-4.1.4/Changelog new/gfxboot-4.1.6/Changelog --- old/gfxboot-4.1.4/Changelog 2008-09-25 18:28:14.000000000 +0200 +++ new/gfxboot-4.1.6/Changelog 2008-09-29 14:29:45.000000000 +0200 @@ -1,3 +1,9 @@ +29/9/2008: v4.1.6 + - updated SLE themes + +26/9/2008: v4.1.5 + - translations updated + 25/9/2008: v4.1.4 - added keyboard selection dialog (bnc #422175) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-4.1.4/VERSION new/gfxboot-4.1.6/VERSION --- old/gfxboot-4.1.4/VERSION 2008-09-25 18:15:08.000000000 +0200 +++ new/gfxboot-4.1.6/VERSION 2008-09-29 14:27:39.000000000 +0200 @@ -1 +1 @@ -4.1.4 +4.1.6 ++++++ openSUSE.tar.bz2 ++++++ ++++ 37690 lines of diff (skipped) ++++++ SLED.tar.bz2 ++++++ Files old/themes/SLED/data-boot/back.jpg and new/themes/SLED/data-boot/back.jpg differ Files old/themes/SLED/data-install/back.jpg and new/themes/SLED/data-install/back.jpg differ Files old/themes/SLED/data-install/text.jpg and new/themes/SLED/data-install/text.jpg differ Files old/themes/SLED/data-install/welcome.jpg and new/themes/SLED/data-install/welcome.jpg differ ++++++ SLES.tar.bz2 ++++++ Files old/themes/SLES/data-boot/back.jpg and new/themes/SLES/data-boot/back.jpg differ Files old/themes/SLES/data-install/back.jpg and new/themes/SLES/data-install/back.jpg differ Files old/themes/SLES/data-install/text.jpg and new/themes/SLES/data-install/text.jpg differ Files old/themes/SLES/data-install/welcome.jpg and new/themes/SLES/data-install/welcome.jpg differ ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eIDconfig-belgium
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package eIDconfig-belgium checked in at Mon Sep 29 17:37:28 CEST 2008. -------- --- eIDconfig-belgium/eIDconfig-belgium.changes 2008-05-08 16:04:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/eIDconfig-belgium/eIDconfig-belgium.changes 2008-09-29 14:44:34.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 29 14:24:44 CEST 2008 - hvogel(a)suse.de + +- merge with latest package from build service: + - update version 1.1.3 + * Added Gendarme rules file and made various changes as per + Gendarme recommendations + * EidConfigWindow.cs: Made the call to eidCard.Initialize() + asynchronous. + * Added support for OpenOffice.org version 3.x + * Using yelp file:/// syntax for now. + - Removed Belgium_Root_CA_Self-signed.cer + - Removed INSTALL doc + +------------------------------------------------------------------- Old: ---- eidconfig-belgium-1.1.1.tar.gz eIDconfig-belgium-CardReader.diff eIDconfig-belgium-CheckDbus.diff eIDconfig-belgium-Debug.diff New: ---- eidconfig-belgium-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eIDconfig-belgium.spec ++++++ --- /var/tmp/diff_new_pack.cA8337/_old 2008-09-29 17:37:19.000000000 +0200 +++ /var/tmp/diff_new_pack.cA8337/_new 2008-09-29 17:37:19.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package eIDconfig-belgium (Version 1.1.1) +# spec file for package eIDconfig-belgium (Version 1.1.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,15 +24,12 @@ Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) License: GPL v2 or later Group: System/Libraries -Version: 1.1.1 -Release: 12 +Version: 1.1.3 +Release: 1 Summary: Configuration toolkit for the Belgian eID middleware Url: http://developer.novell.com/wiki/index.php/eID-belgium BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://forgeftp.novell.com/eID-belgium/eidconfig-belgium-%{version}.tar.gz -Patch0: eIDconfig-belgium-CardReader.diff -Patch1: eIDconfig-belgium-CheckDbus.diff -Patch2: eIDconfig-belgium-Debug.diff +Source: eidconfig-belgium-1.1.3.tar.bz2 %description eIDconfig-belgium aims at easing the configuration of both the Belgian @@ -36,9 +40,6 @@ %prep %setup -n eidconfig-belgium-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -55,7 +56,6 @@ %defattr(-,root,root) %{_bindir}/eidconfig-belgium %dir %{_libdir}/eidconfig-belgium -%{_libdir}/eidconfig-belgium/Belgium_Root_CA_Self-signed.cer %{_libdir}/eidconfig-belgium/eIDconfig-belgium.exe %{_libdir}/eidconfig-belgium/CheckDbus.exe %{_libdir}/eidconfig-belgium/eIDconfig-belgium.sh @@ -66,8 +66,6 @@ %{_datadir}/locale/nl/LC_MESSAGES/eidconfig-belgium.mo %{_datadir}/applications/eIDconfig-belgium.desktop %{_datadir}/pixmaps/eIDconfig-belgium.png -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help %dir %{_datadir}/gnome/help/eIDconfig-belgium %{_datadir}/gnome/help/eIDconfig-belgium/* %dir %{_datadir}/omf/eIDconfig-belgium @@ -75,7 +73,6 @@ %doc AUTHORS %doc ChangeLog %doc COPYING -%doc INSTALL %doc NEWS %doc README @@ -106,6 +103,17 @@ fi %changelog +* Mon Sep 29 2008 hvogel(a)suse.de +- merge with latest package from build service: + - update version 1.1.3 + * Added Gendarme rules file and made various changes as per + Gendarme recommendations + * EidConfigWindow.cs: Made the call to eidCard.Initialize() + asynchronous. + * Added support for OpenOffice.org version 3.x + * Using yelp file:/// syntax for now. + - Removed Belgium_Root_CA_Self-signed.cer + - Removed INSTALL doc * Thu May 08 2008 skh(a)suse.de - src/Debug.cs: Fixed a crash / failing assertion in XCB. Patch: eIDconfig-belgium-Debug.diff (sbrys(a)novell.com) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0