August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit gcc43
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package gcc43 checked in at Mon Aug 11 18:52:58 CEST 2008. -------- --- gcc43/cross-avr-gcc43.changes 2008-08-06 23:05:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc43/cross-avr-gcc43.changes 2008-08-11 11:46:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 11:45:43 CEST 2008 - rguenther(a)suse.de + +- Add patch for PR36998. [bnc#416157] + +------------------------------------------------------------------- cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-spu-gcc.changes: same change cross-spu-gcc-static.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc43.changes: same change libgcj43.changes: same change New: ---- nov415378.diff pr36998.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc43.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -62,7 +62,7 @@ Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT Version: 4.3.2_20080806 -Release: 1 +Release: 3 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -95,6 +95,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -187,6 +189,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -415,6 +419,8 @@ %defattr(-,root,root) %{_prefix} %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -42,7 +42,7 @@ Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT Version: 4.3.2_20080806 -Release: 1 +Release: 3 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -75,6 +75,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -170,6 +172,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -436,6 +440,8 @@ /usr/share/icecream-envs %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change ++++++ cross-spu-gcc.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -53,7 +53,7 @@ Url: http://gcc.gnu.org/ License: GPL v2 or later Version: 4.3.2_20080806 -Release: 1 +Release: 2 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -86,6 +86,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -173,6 +175,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -401,6 +405,8 @@ %defattr(-,root,root) %{_prefix} %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). cross-spu-gcc-static.spec: same change ++++++ cross-x86_64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -42,7 +42,7 @@ Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT Version: 4.3.2_20080806 -Release: 1 +Release: 3 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -75,6 +75,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -170,6 +172,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -436,6 +440,8 @@ /usr/share/icecream-envs %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). ++++++ gcc43.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -115,7 +115,7 @@ Url: http://gcc.gnu.org/ License: GPL v3 or later Version: 4.3.2_20080806 -Release: 1 +Release: 3 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -159,6 +159,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -1347,6 +1349,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -2388,6 +2392,8 @@ %endif %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). ++++++ libgcj43.spec ++++++ --- /var/tmp/diff_new_pack.B22758/_old 2008-08-11 18:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B22758/_new 2008-08-11 18:51:54.000000000 +0200 @@ -126,7 +126,7 @@ Url: http://gcc.gnu.org/ License: GPL v2 or later; LGPL v2.1 or later Version: 4.3.2_20080806 -Release: 1 +Release: 3 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -170,6 +170,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -585,6 +587,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 @@ -1200,6 +1204,8 @@ %endif %changelog +* Mon Aug 11 2008 rguenther(a)suse.de +- Add patch for PR36998. [bnc#416157] * Tue Aug 05 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r138797). - Add patches for context sensitive vector keyword support (IBM). ++++++ gcc.spec.in ++++++ --- gcc43/gcc.spec.in 2008-08-06 14:41:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc43/gcc.spec.in 2008-08-11 11:45:37.000000000 +0200 @@ -169,6 +169,8 @@ Patch39: pr36343.diff Patch40: pr36765.diff Patch41: pr36613.diff +Patch42: nov415378.diff +Patch43: pr36998.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -842,6 +844,8 @@ %patch39 %patch40 %patch41 +%patch42 +%patch43 %patch51 %patch55 %patch57 ++++++ nov415378.diff ++++++ 2008-08-06 Andreas Krebbel <krebbel1(a)de.ibm.com> * reload.c (find_reloads): Force constants into literal pool also if they are wrapped in a SUBREG. * gcc.c-torture/compile/20080806-1.c: New testcase. Index: gcc/reload.c =================================================================== --- gcc/reload.c (revision 138762) +++ gcc/reload.c (revision 138763) @@ -3843,49 +3843,61 @@ find_reloads (rtx insn, int replace, int /* Any constants that aren't allowed and can't be reloaded into registers are here changed into memory references. */ for (i = 0; i < noperands; i++) - if (! goal_alternative_win[i] - && CONST_POOL_OK_P (recog_data.operand[i]) - && ((PREFERRED_RELOAD_CLASS (recog_data.operand[i], - (enum reg_class) goal_alternative[i]) - == NO_REGS) - || no_input_reloads) - && operand_mode[i] != VOIDmode) + if (! goal_alternative_win[i]) { - int this_address_reloaded; + rtx op = recog_data.operand[i]; + rtx subreg = NULL_RTX; + rtx plus = NULL_RTX; + enum machine_mode mode = operand_mode[i]; - this_address_reloaded = 0; - substed_operand[i] = recog_data.operand[i] - = find_reloads_toplev (force_const_mem (operand_mode[i], - recog_data.operand[i]), - i, address_type[i], ind_levels, 0, insn, - &this_address_reloaded); - if (alternative_allows_const_pool_ref (this_address_reloaded == 0 - ? substed_operand[i] - : NULL, - recog_data.constraints[i], - goal_alternative_number)) - goal_alternative_win[i] = 1; - } + /* Reloads of SUBREGs of CONSTANT RTXs are handled later in + push_reload so we have to let them pass here. */ + if (GET_CODE (op) == SUBREG) + { + subreg = op; + op = SUBREG_REG (op); + mode = GET_MODE (op); + } - /* Likewise any invalid constants appearing as operand of a PLUS - that is to be reloaded. */ - for (i = 0; i < noperands; i++) - if (! goal_alternative_win[i] - && GET_CODE (recog_data.operand[i]) == PLUS - && CONST_POOL_OK_P (XEXP (recog_data.operand[i], 1)) - && (PREFERRED_RELOAD_CLASS (XEXP (recog_data.operand[i], 1), - (enum reg_class) goal_alternative[i]) - == NO_REGS) - && operand_mode[i] != VOIDmode) - { - rtx tem = force_const_mem (operand_mode[i], - XEXP (recog_data.operand[i], 1)); - tem = gen_rtx_PLUS (operand_mode[i], - XEXP (recog_data.operand[i], 0), tem); - - substed_operand[i] = recog_data.operand[i] - = find_reloads_toplev (tem, i, address_type[i], - ind_levels, 0, insn, NULL); + if (GET_CODE (op) == PLUS) + { + plus = op; + op = XEXP (op, 1); + } + + if (CONST_POOL_OK_P (op) + && ((PREFERRED_RELOAD_CLASS (op, + (enum reg_class) goal_alternative[i]) + == NO_REGS) + || no_input_reloads) + && mode != VOIDmode) + { + int this_address_reloaded; + rtx tem = force_const_mem (mode, op); + + /* If we stripped a SUBREG or a PLUS above add it back. */ + if (plus != NULL_RTX) + tem = gen_rtx_PLUS (mode, XEXP (plus, 0), tem); + + if (subreg != NULL_RTX) + tem = gen_rtx_SUBREG (operand_mode[i], tem, SUBREG_BYTE (subreg)); + + this_address_reloaded = 0; + substed_operand[i] = recog_data.operand[i] + = find_reloads_toplev (tem, i, address_type[i], ind_levels, + 0, insn, &this_address_reloaded); + + /* If the alternative accepts constant pool refs directly + there will be no reload needed at all. */ + if (plus == NULL_RTX + && subreg == NULL_RTX + && alternative_allows_const_pool_ref (this_address_reloaded == 0 + ? substed_operand[i] + : NULL, + recog_data.constraints[i], + goal_alternative_number)) + goal_alternative_win[i] = 1; + } } /* Record the values of the earlyclobber operands for the caller. */ Index: gcc/testsuite/gcc.c-torture/compile/20080806-1.c =================================================================== --- gcc/testsuite/gcc.c-torture/compile/20080806-1.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/20080806-1.c (revision 138763) @@ -0,0 +1,33 @@ +int gl2; +typedef __SIZE_TYPE__ size_t; + +extern void *memcpy (void *dest, const void *src, size_t n); + +void +f1 () +{ + int i2; + unsigned char bf[64 * 1024 + 4]; + + for (i2 = 0; i2 < 3; i2++) + { + unsigned char *p2 = bf; + unsigned char *p3 = ((void *) 0); + unsigned short ctf2; + + p2 += sizeof (short); + + for (ctf2 = 0; ctf2 < 3; ctf2++) + { + if (ctf2 == 1) + { + unsigned short of = p2 - bf - 6; + unsigned short *ofp = (unsigned short *) &of; + memcpy (p3, ofp, sizeof (short)); + } + + if (gl2 == 1) + p2 += 3; + } + } +} ++++++ pr36998.diff ++++++ Index: gcc/dwarf2out.c =================================================================== *** gcc/dwarf2out.c (revision 138950) --- gcc/dwarf2out.c (working copy) *************** compute_barrier_args_size_1 (rtx insn, H *** 1175,1183 **** barrier_args_size [INSN_UID (dest)] = cur_args_size; VEC_safe_push (rtx, heap, *next, dest); } - else - gcc_assert (barrier_args_size[INSN_UID (dest)] - == cur_args_size); } } --- 1175,1180 ---- *************** compute_barrier_args_size (void) *** 1235,1242 **** { /* The insns starting with this label have been already scanned or are in the worklist. */ - gcc_assert (barrier_args_size[INSN_UID (insn)] - == cur_args_size); break; } } --- 1232,1237 ---- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mol
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package mol checked in at Mon Aug 11 18:51:01 CEST 2008. -------- --- arch/ppc/mol/mol.changes 2007-10-13 11:38:24.000000000 +0200 +++ /mounts/work_users/ro/STABLE/mol/mol.changes 2008-08-11 18:50:36.010105000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 18:50:30 CEST 2008 - ro(a)suse.de + +- use exclusivearch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mol.spec ++++++ --- /var/tmp/diff_new_pack.gT6333/_old 2008-08-11 18:50:47.000000000 +0200 +++ /var/tmp/diff_new_pack.gT6333/_new 2008-08-11 18:50:47.000000000 +0200 @@ -1,19 +1,27 @@ # # spec file for package mol (Version 0.9.72.1) # -# Copyright (c) 2007 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. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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/ # + Name: mol BuildRequires: alsa-devel bison libpng-devel ncurses-devel xorg-x11-devel Summary: Mac on Linux Version: 0.9.72.1 -Release: 1 +Release: 66 License: GPL v2 or later Group: System/Emulators/Other Source0: ftp://ftp.sourceforge.net/pub/sourceforge/m/ma/mac-on-linux/mol-%{version}.… @@ -22,6 +30,7 @@ Patch0: mol.make-verbose.patch Patch1: mol.insmod.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: ppc ppc64 %description Mac-On-Linux lets you run MacOS under LinuxPPC on PowerPC based @@ -66,8 +75,11 @@ /usr/share/mol /var/lib/mol %{_mandir}/man?/* + %changelog -* Sat Oct 13 2007 - schwab(a)suse.de +* Mon Aug 11 2008 ro(a)suse.de +- use exclusivearch +* Sat Oct 13 2007 schwab(a)suse.de - Update to mol 0.9.72.1. * Fix building on FC7 by adding missing headers * Additional fixes for find_physical_rom @@ -79,11 +91,11 @@ * Re-arrange the Kconfig menus * Remove configure directory * OSX Compatibility fixes -* Sat May 26 2007 - schwab(a)suse.de +* Sat May 26 2007 schwab(a)suse.de - Add patch to fix XDGA support. -* Sat Mar 31 2007 - schwab(a)suse.de +* Sat Mar 31 2007 schwab(a)suse.de - Add bison and ncurses-devel to BuildRequires. -* Mon Mar 12 2007 - schwab(a)suse.de +* Mon Mar 12 2007 schwab(a)suse.de - Update to mol 0.9.72. - changes include: * Fixed tilde key @@ -107,124 +119,124 @@ * Added block driver abstraction layer * Added qcow disk support * Added compressed dmg support -* Thu Feb 01 2007 - schwab(a)suse.de +* Thu Feb 01 2007 schwab(a)suse.de - Add -fno-stack-protector. -* Mon Oct 30 2006 - schwab(a)suse.de +* Mon Oct 30 2006 schwab(a)suse.de - Update to mol 0.9.71.1. * Added new molvconfig manpage from debian * Compile fixes for 2.6.19 -* Mon Oct 09 2006 - schwab(a)suse.de +* Mon Oct 09 2006 schwab(a)suse.de - Update to mol 0.9.71 (just cleanups). -* Wed Jul 19 2006 - schwab(a)suse.de +* Wed Jul 19 2006 schwab(a)suse.de - Use the version from Gentoo. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Jan 12 2006 - schwab(a)suse.de +* Fri Jan 13 2006 schwab(a)suse.de - Don't strip binaries. -* Sat Oct 22 2005 - olh(a)suse.de +* Sat Oct 22 2005 olh(a)suse.de - fix warnings remove tap support, was removed in 2.6.12-rc2 -* Mon Aug 29 2005 - olh(a)suse.de +* Mon Aug 29 2005 olh(a)suse.de - fix typo in last change, add a bit delay -* Sun Aug 28 2005 - olh(a)suse.de +* Mon Aug 29 2005 olh(a)suse.de - load mol.ko via modprobe, it is part of kernel-default -* Tue Jun 21 2005 - olh(a)suse.de +* Tue Jun 21 2005 olh(a)suse.de - update to 0.9.70 build with alsa and libpng remove km_mol, kernel driver will be a kernel patch -* Thu Nov 06 2003 - olh(a)suse.de +* Thu Nov 06 2003 olh(a)suse.de - package all km_mol directories -* Sat Nov 01 2003 - olh(a)suse.de +* Sat Nov 01 2003 olh(a)suse.de - update to current bk version -* Sun Mar 09 2003 - olh(a)suse.de +* Mon Mar 10 2003 olh(a)suse.de - update to current bk version -* Mon Nov 18 2002 - schwab(a)suse.de +* Mon Nov 18 2002 schwab(a)suse.de - Enable LFS. - Fix off_t configure test. - Fix use of off_t if it is 64 bits. -* Mon Oct 28 2002 - schwab(a)suse.de +* Mon Oct 28 2002 schwab(a)suse.de - Override -fsigned-char from RPM_OPT_FLAGS, there are some places that depend on char == unsigned char. -* Wed Oct 16 2002 - olh(a)suse.de +* Wed Oct 16 2002 olh(a)suse.de - use EXPAND_STACK_HAS_3_ARGS to check for aa patch: 000_silent-stack-overflow -* Fri Sep 06 2002 - olh(a)suse.de +* Fri Sep 06 2002 olh(a)suse.de - update to 0.9.65 final with MacOS X support -* Thu Aug 15 2002 - olh(a)suse.de +* Thu Aug 15 2002 olh(a)suse.de - add mol-automake.diff, from schwab, for latest automake update mol.diff to current bk status -* Sun Aug 04 2002 - olh(a)suse.de +* Sun Aug 04 2002 olh(a)suse.de - update to current bk status, some OS X support -* Wed Jul 24 2002 - olh(a)suse.de +* Wed Jul 24 2002 olh(a)suse.de - use wildcard in Makefile.module to catch all kernel drivers -* Mon Jul 08 2002 - olh(a)suse.de +* Mon Jul 08 2002 olh(a)suse.de - update to 0.9.64, remove suid from /usr/lib/mol/*/bin/mol -* Wed Jun 05 2002 - olh(a)suse.de +* Thu Jun 06 2002 olh(a)suse.de - update to 0.9.63 + bk update -* Mon Mar 04 2002 - olh(a)suse.de +* Mon Mar 04 2002 olh(a)suse.de - update to latest bk version -* Wed Feb 27 2002 - olh(a)suse.de +* Wed Feb 27 2002 olh(a)suse.de - use own default .config -* Sun Oct 14 2001 - olh(a)suse.de +* Sun Oct 14 2001 olh(a)suse.de - use -DEXPORT_SYMTAB for molsymglue -* Mon Oct 01 2001 - olh(a)suse.de +* Mon Oct 01 2001 olh(a)suse.de - apply some bk changesets to fix keymappings: mol-changeset-1.179.diff mol-changeset-1.183.diff mol-changeset-1.184.diff mol-changeset-1.185.diff -* Wed Sep 19 2001 - olh(a)suse.de +* Thu Sep 20 2001 olh(a)suse.de - do some ugly hackery to get module loading right (#10822) -* Tue Sep 18 2001 - olh(a)suse.de +* Tue Sep 18 2001 olh(a)suse.de - do not require mol version for kernel modules, the installer can not handle it -* Fri Aug 31 2001 - olh(a)suse.de +* Fri Aug 31 2001 olh(a)suse.de - update to 0.9.60 final -* Mon Jul 09 2001 - olh(a)suse.de +* Mon Jul 09 2001 olh(a)suse.de - add EXPAND_STACK_HAS_3_ARGS check to mmu.c -* Fri Jun 29 2001 - olh(a)suse.de +* Fri Jun 29 2001 olh(a)suse.de - add binary_libs, not included in bk tree -* Thu Jun 28 2001 - olh(a)suse.de +* Thu Jun 28 2001 olh(a)suse.de - update to 0.9.60 for recent 2.4.6-pre6 MM changes -* Wed Jun 06 2001 - olh(a)suse.de +* Wed Jun 06 2001 olh(a)suse.de - update to 0.9.58 -* Sun Apr 01 2001 - olh(a)suse.de +* Sun Apr 01 2001 olh(a)suse.de - update to current bk snapshot -* Fri Mar 23 2001 - olh(a)suse.de +* Fri Mar 23 2001 olh(a)suse.de - update to 0.9.56 snapshot -* Sat Dec 30 2000 - olh(a)suse.de +* Sat Dec 30 2000 olh(a)suse.de - fix dif -* Fri Dec 29 2000 - olh(a)suse.de +* Fri Dec 29 2000 olh(a)suse.de - Requires: mol_kernel_modules_0.9.53 -* Fri Dec 29 2000 - olh(a)suse.de +* Fri Dec 29 2000 olh(a)suse.de - fix module install path, add patch for 2.4 kernel -* Mon Dec 18 2000 - olh(a)suse.de +* Mon Dec 18 2000 olh(a)suse.de - fixed sheep.c compile against 2.2 headers -* Mon Dec 18 2000 - ro(a)suse.de +* Mon Dec 18 2000 ro(a)suse.de - fixed version -* Fri Dec 15 2000 - olh(a)suse.de +* Fri Dec 15 2000 olh(a)suse.de - fix 2.4 compilation again. -* Sat Dec 02 2000 - olh(a)suse.de +* Sat Dec 02 2000 olh(a)suse.de - update to 0.9.53 to prevent segfault on new PowerMacs -* Tue Nov 21 2000 - olh(a)suse.de +* Wed Nov 22 2000 olh(a)suse.de - add km_mol again, needs TARGETKERNEL for k_*.spec files -* Tue Oct 24 2000 - olh(a)suse.de +* Tue Oct 24 2000 olh(a)suse.de - fix typo in /etc/mol.rc , putonftp -* Tue Oct 03 2000 - olh(a)suse.de +* Wed Oct 04 2000 olh(a)suse.de - upate startscript and network script -* Sat Sep 02 2000 - olh(a)suse.de +* Sat Sep 02 2000 olh(a)suse.de - update to 0.9.50 -* Tue Jul 18 2000 - olh(a)suse.de +* Tue Jul 18 2000 olh(a)suse.de - update to 0.9.48 -* Sun Mar 05 2000 - olh(a)suse.de +* Sun Mar 05 2000 olh(a)suse.de - update to 0.9.41 -* Wed Feb 23 2000 - uli(a)suse.de +* Thu Feb 24 2000 uli(a)suse.de - souped up fb.modes parser so it won't throw up when parsing the fb.modes file from recent fbset packages - bash script "molpatching" now uses "wc" instead of "stat" which doesn't exist on SuSE Linux - mmu.c: changed expand_stack() call to new format (3 args) -* Sun Feb 06 2000 - olh(a)suse.de +* Sun Feb 06 2000 olh(a)suse.de - update to 0.9.40 -* Sun Jan 30 2000 - olh(a)suse.de +* Sun Jan 30 2000 olh(a)suse.de - add mol to SuSE PPC dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 asio
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package asio checked in at Mon Aug 11 18:46:26 CEST 2008. -------- --- asio/asio.changes 2008-04-06 01:07:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/asio/asio.changes 2008-08-11 18:46:09.236683000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 11 18:45:43 CEST 2008 - ro(a)suse.de + +- do not redefine debug_package +- use nodebuginfo instead and set debuginfo to no in PDB + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asio.spec ++++++ --- /var/tmp/diff_new_pack.t29872/_old 2008-08-11 18:46:20.000000000 +0200 +++ /var/tmp/diff_new_pack.t29872/_new 2008-08-11 18:46:20.000000000 +0200 @@ -2,19 +2,26 @@ # spec file for package asio (Version 1.0.0) # # 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/ # +# nodebuginfo -%define debug_package %{nil} Summary: A cross-platform C++ library for network programming Name: asio Version: 1.0.0 -Release: 2 +Release: 4 Url: http://asio.sourceforge.net/ Source0: http://downloads.sourceforge.net/asio/asio-%{version}.tar.bz2 License: BSD 3-Clause @@ -77,5 +84,8 @@ %{_includedir}/asio.hpp %changelog -* Sat Apr 05 2008 hfiguiere(a)suse.de +* Mon Aug 11 2008 ro(a)suse.de +- do not redefine debug_package +- use nodebuginfo instead and set debuginfo to no in PDB +* Sun Apr 06 2008 hfiguiere(a)suse.de - Initial checkin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mysql-gui-tools
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package mysql-gui-tools checked in at Mon Aug 11 13:07:11 CEST 2008. -------- --- mysql-gui-tools/mysql-gui-tools.changes 2008-07-31 14:18:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-gui-tools/mysql-gui-tools.changes 2008-08-11 09:57:49.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 11 09:52:45 CEST 2008 - anosek(a)suse.cz + +- fixed Dependencies for mysql-gui-tools should be mysql-administrator, + mysql-query-browser and mysql-workbench (bnc#415245) + - mysql-gui-tools now recommends those three packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-gui-tools.spec ++++++ --- /var/tmp/diff_new_pack.Ni5407/_old 2008-08-11 12:26:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Ni5407/_new 2008-08-11 12:26:38.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package mysql-gui-tools (Version 5.0r12) # # 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/ # @@ -16,7 +23,7 @@ BuildRequires: Mesa-devel Summary: Common Files for MySQL GUI Tools Version: 5.0r12 -Release: 203 +Release: 211 Group: Productivity/Databases/Clients License: GPL v2 or later Url: http://www.mysql.com/products/tools/query-browser/ @@ -38,6 +45,7 @@ Patch35: mysql-workbench-start.patch Patch36: mysql-gui-common-join.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: mysql-administrator mysql-query-browser mysql-workbench %description This package contains files used by mysql-query-browser, @@ -191,6 +199,10 @@ %{_datadir}/mysql-gui/workbench/ %changelog +* Mon Aug 11 2008 anosek(a)suse.cz +- fixed Dependencies for mysql-gui-tools should be mysql-administrator, + mysql-query-browser and mysql-workbench (bnc#415245) + - mysql-gui-tools now recommends those three packages * Thu Jul 31 2008 anosek(a)suse.cz - added Mesa-devel to BuildRequires * Mon Jul 14 2008 anosek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi-image-livecd-kde
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Mon Aug 11 12:22:45 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-10 01:22:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 12:22:01.219991000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 10:05:02 CEST 2008 - coolo(a)suse.de + +- remove possible outcome of patch + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.T29165/_old 2008-08-11 12:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.T29165/_new 2008-08-11 12:22:10.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 5 +Release: 6 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,6 +95,8 @@ %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem patch myoem/config.xml %{SOURCE18} +# do not package it +rm -f myoem/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -196,6 +198,8 @@ /usr/share/openSUSE %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- remove possible outcome of patch * Sat Aug 09 2008 coolo(a)suse.de - remove unneeded buildrequire * Fri Aug 08 2008 coolo(a)suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.T29165/_old 2008-08-11 12:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.T29165/_new 2008-08-11 12:22:10.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 5 +Release: 6 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,6 +95,8 @@ %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem patch myoem/config.xml %{SOURCE18} +# do not package it +rm -f myoem/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -196,6 +198,8 @@ /usr/share/openSUSE %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- remove possible outcome of patch * Sat Aug 09 2008 coolo(a)suse.de - remove unneeded buildrequire * Fri Aug 08 2008 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dosbootdisk
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package dosbootdisk checked in at Mon Aug 11 10:56:40 CEST 2008. -------- --- arch/i386/dosbootdisk/dosbootdisk.changes 2008-03-11 15:10:45.000000000 +0100 +++ /mounts/work_users/ro/STABLE/dosbootdisk/dosbootdisk.changes 2008-08-11 10:56:07.664928000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 10:55:58 CEST 2008 - ro(a)suse.de + +- make file executable needed during build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosbootdisk.spec ++++++ --- /var/tmp/diff_new_pack.O20581/_old 2008-08-11 10:56:23.000000000 +0200 +++ /var/tmp/diff_new_pack.O20581/_new 2008-08-11 10:56:23.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package dosbootdisk (Version 1.1) # # 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/ # @@ -18,7 +25,7 @@ AutoReqProv: on Summary: A DOS Boot Disk Based on FreeDOS Version: 1.1 -Release: 184 +Release: 227 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: kernel2036-binary.zip Source1: mkfloppy.bat @@ -41,6 +48,7 @@ %prep %setup -c test -d kernel || mkdir kernel && cd kernel && unzip %{SOURCE0} +chmod a+x %{SOURCE2} %build rm -rf $RPM_BUILD_ROOT @@ -68,6 +76,8 @@ %{_bindir}/dosbootdisk %changelog +* Mon Aug 11 2008 ro(a)suse.de +- make file executable needed during build * Tue Mar 11 2008 seife(a)suse.de - update to freeDOS kernel 2036 from may 2006, fixes problems with AMI Firmware Update Utility Ver.4.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-sip
by root＠Hilbert.suse.de 10 Aug '08

10 Aug '08

Hello community, here is the log from the commit of package python-sip checked in at Sun Aug 10 23:37:57 CEST 2008. -------- --- python-sip/python-sip.changes 2008-05-27 13:26:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-sip/python-sip.changes 2008-08-10 18:16:05.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Aug 10 18:14:20 CEST 2008 - dmueller(a)suse.de + +- update to 4.7.7: + * C++ structs are now properly handled as a class with + a default public section + * sip.dump() now includes the objects first child wrapper + +------------------------------------------------------------------- Old: ---- sip-4.7.6.tar.bz2 New: ---- sip-4.7.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.z31264/_old 2008-08-10 23:37:30.000000000 +0200 +++ /var/tmp/diff_new_pack.z31264/_new 2008-08-10 23:37:30.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package python-sip (Version 4.7.6) +# spec file for package python-sip (Version 4.7.7) # # 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/ # @@ -16,8 +23,8 @@ License: GPL v2 or later Group: Development/Libraries/Python Summary: SIP tool to create python bindings -Version: 4.7.6 -Release: 3 +Version: 4.7.7 +Release: 1 Url: http://www.riverbankcomputing.co.uk/sip/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: sip-%{version}.tar.bz2 @@ -64,6 +71,11 @@ /usr/share/sip %changelog +* Sun Aug 10 2008 dmueller(a)suse.de +- update to 4.7.7: + * C++ structs are now properly handled as a class with + a default public section + * sip.dump() now includes the objects first child wrapper * Tue May 27 2008 dmueller(a)suse.de - update to 4.7.6: * generator fixes for being able to bind Qt 4.4 ++++++ sip-4.7.6.tar.bz2 -> sip-4.7.7.tar.bz2 ++++++ ++++ 4113 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 btusb-kmp
by root＠Hilbert.suse.de 09 Aug '08

09 Aug '08

Hello community, here is the log from the commit of package btusb-kmp checked in at Sun Aug 10 01:43:52 CEST 2008. -------- --- btusb-kmp/btusb-kmp.changes 2008-07-18 10:08:22.000000000 +0200 +++ /mounts/work_users/ro/STABLE/btusb-kmp/btusb-kmp.changes 2008-08-10 01:43:35.945483000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 10 01:43:26 CEST 2008 - ro(a)suse.de + +- different hack to build this one + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btusb-kmp.spec ++++++ --- /var/tmp/diff_new_pack.x25077/_old 2008-08-10 01:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.x25077/_new 2008-08-10 01:43:46.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package btusb-kmp (Version 0.1) # # 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/ # @@ -18,7 +25,7 @@ AutoReqProv: on Summary: The new driver for USB Bluetooth dongles Version: 0.1 -Release: 4 +Release: 9 Source: README Source1: modprobe.btusb Source2: README.btusb @@ -67,29 +74,27 @@ %build echo "flavors_to_build: %{flavors_to_build}" -mkdir $RPM_BUILD_ROOT/usr/src -p -cp -a /usr/src/linux/ $RPM_BUILD_ROOT/usr/src -cp -a /usr/src/linux-obj/ $RPM_BUILD_ROOT/usr/src +cp -a /usr/src/linux/drivers/bluetooth source +mkdir obj %install export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=updates -cd $RPM_BUILD_ROOT/usr/src/linux for flavor in %flavors_to_build; do - cd $RPM_BUILD_ROOT/usr/src/linux - sed 's/^CONFIG_BT_HCIUSB=/CONFIG_BT_HCIBTUSB=/' /usr/src/linux-obj/%_target_cpu/$flavor/.config > .config - echo n | make oldconfig - make scripts - make prepare - cp .config $RPM_BUILD_ROOT/usr/src/linux-obj/%_target_cpu/$flavor/.config - cp $RPM_BUILD_ROOT/usr/src/linux-obj/%_target_cpu/$flavor/Module.symvers . - cd drivers/bluetooth - make -C $RPM_BUILD_ROOT/usr/src/linux-obj/%_target_cpu/$flavor M=$PWD "MAKEARGS=-C $RPM_BUILD_ROOT/usr/src/linux" btusb.ko - make -C $RPM_BUILD_ROOT/usr/src/linux-obj/%_target_cpu/$flavor M=$PWD modules_install + cp -a source obj/$flavor + pushd obj/$flavor + make -C /usr/src/linux-obj/%_target_cpu/$flavor M=$PWD modules CONFIG_BT_HCIBTUSB=m + make -C /usr/src/linux-obj/%_target_cpu/$flavor M=$PWD modules_install CONFIG_BT_HCIBTUSB=m + popd done -rm -r $RPM_BUILD_ROOT/usr/src/linux* install -D -m 644 %{S:1} %buildroot/%_sysconfdir/modprobe.d/btusb install -D -m 644 %{S:2} %buildroot/%_defaultdocdir/%name/README.btusb +for i in `find $RPM_BUILD_ROOT/lib/modules -name "*.ko"` ; do + case $i in + */btusb.ko) ;; + *) rm -v $i ;; + esac +done %files -n %name %defattr(-, root, root) @@ -97,6 +102,8 @@ %config %_sysconfdir/modprobe.d/btusb %changelog +* Sun Aug 10 2008 ro(a)suse.de +- different hack to build this one * Fri Jul 18 2008 seife(a)suse.de - add %%defattr for rpmlint checks * Fri Jul 18 2008 seife(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-storage
by root＠Hilbert.suse.de 09 Aug '08

09 Aug '08

Hello community, here is the log from the commit of package yast2-storage checked in at Sun Aug 10 01:37:31 CEST 2008. -------- --- yast2-storage/yast2-storage.changes 2008-08-08 17:39:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-08-09 11:14:34.010125000 +0200 @@ -1,0 +2,12 @@ +Sat Aug 09 10:42:06 CEST 2008 - aschnell(a)suse.de + +- added usedByDevice in StorageInterface.h +- version 2.17.15 + +------------------------------------------------------------------- +Fri Aug 08 21:56:00 CEST 2008 - aschnell(a)suse.de + +- added tab with used devices for device mapper devices +- version 2.17.14 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.17.13.tar.bz2 New: ---- yast2-storage-2.17.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.rV4984/_old 2008-08-10 01:36:19.000000000 +0200 +++ /var/tmp/diff_new_pack.rV4984/_new 2008-08-10 01:36:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.17.13) +# spec file for package yast2-storage (Version 2.17.15) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-storage -Version: 2.17.13 +Version: 2.17.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.17.13.tar.bz2 +Source0: yast2-storage-2.17.15.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup @@ -57,7 +57,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.17.13 +%setup -n yast2-storage-2.17.15 %build %{prefix}/bin/y2tool y2autoconf @@ -179,6 +179,12 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Sat Aug 09 2008 aschnell(a)suse.de +- added usedByDevice in StorageInterface.h +- version 2.17.15 +* Fri Aug 08 2008 aschnell(a)suse.de +- added tab with used devices for device mapper devices +- version 2.17.14 * Fri Aug 08 2008 aschnell(a)suse.de - integrated redesigned expert partitioner into installation workflow ++++++ yast2-storage-2.17.13.tar.bz2 -> yast2-storage-2.17.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/configure new/yast2-storage-2.17.15/configure --- old/yast2-storage-2.17.13/configure 2008-08-08 10:41:27.000000000 +0200 +++ new/yast2-storage-2.17.15/configure 2008-08-09 11:01:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.12. +# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.17.12' -PACKAGE_STRING='yast2-storage 2.17.12' +PACKAGE_VERSION='2.17.15' +PACKAGE_STRING='yast2-storage 2.17.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1449,7 +1449,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-storage 2.17.12 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.17.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1520,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.17.12:";; + short | recursive ) echo "Configuration of yast2-storage 2.17.15:";; esac cat <<\_ACEOF @@ -1630,7 +1630,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.17.12 +yast2-storage configure 2.17.15 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1644,7 +1644,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-storage $as_me 2.17.12, which was +It was created by yast2-storage $as_me 2.17.15, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2465,7 +2465,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.17.12' + VERSION='2.17.15' cat >>confdefs.h <<_ACEOF @@ -2693,7 +2693,7 @@ -VERSION="2.17.12" +VERSION="2.17.15" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" @@ -21746,7 +21746,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.17.12, which was +This file was extended by yast2-storage $as_me 2.17.15, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21799,7 +21799,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-storage config.status 2.17.12 +yast2-storage config.status 2.17.15 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/configure.in new/yast2-storage-2.17.15/configure.in --- old/yast2-storage-2.17.13/configure.in 2008-08-08 10:41:13.000000000 +0200 +++ new/yast2-storage-2.17.15/configure.in 2008-08-09 11:01:19.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.17.12, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.17.15, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.12" +VERSION="2.17.15" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Container.cc new/yast2-storage-2.17.15/libstorage/src/Container.cc --- old/yast2-storage-2.17.13/libstorage/src/Container.cc 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Container.cc 2008-08-09 11:00:33.000000000 +0200 @@ -285,8 +285,9 @@ info.name = name(); info.device = device(); info.volcnt = vp.length(); - info.usedBy = getUsedByType(); - info.usedByName = usedByName(); + info.usedByType = uby.type(); + info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.readonly = readonly(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Container.h new/yast2-storage-2.17.15/libstorage/src/Container.h --- old/yast2-storage-2.17.13/libstorage/src/Container.h 2008-08-06 12:34:18.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Container.h 2008-08-09 11:00:33.000000000 +0200 @@ -141,10 +141,12 @@ void setDeleted( bool val=true ) { del=val; } void setCreated( bool val=true ) { create=val; } void setSilent( bool val=true ) { silent=val; } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name ); } - const storage::usedBy& getUsedBy() const { return( uby ); } - storage::UsedByType getUsedByType() const { return( uby.type() ); } - const string& usedByName() const { return( uby.name() ); } + + void clearUsedBy() { uby.clear(); } + void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } + const storage::usedBy& getUsedBy() const { return uby; } + storage::UsedByType getUsedByType() const { return uby.type(); } + bool readonly() const { return ronly; } unsigned long minorNr() const { return mnr; } unsigned long majorNr() const { return mjr; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/DmCo.cc new/yast2-storage-2.17.15/libstorage/src/DmCo.cc --- old/yast2-storage-2.17.13/libstorage/src/DmCo.cc 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/DmCo.cc 2008-08-08 22:31:53.000000000 +0200 @@ -185,7 +185,7 @@ skip = true; getStorage()->setDmcryptData( it->first, m->device(), min_num, m->sizeK(), detectEncryption (m->device()) ); - getStorage()->setUsedBy( it->first, UB_NONE, "" ); + getStorage()->clearUsedBy(it->first); } if( !skip && m->sizeK()>0 ) addDm( m ); @@ -273,7 +273,7 @@ for( map<string,unsigned long>::const_iterator it = pe.begin(); it!=pe.end(); ++it ) { - getStorage()->setUsedBy( it->first, UB_NONE, "" ); + getStorage()->clearUsedBy(it->first); } i->setDeleted( true ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/MdCo.cc new/yast2-storage-2.17.15/libstorage/src/MdCo.cc --- old/yast2-storage-2.17.13/libstorage/src/MdCo.cc 2008-08-07 22:39:25.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/MdCo.cc 2008-08-08 22:31:53.000000000 +0200 @@ -400,7 +400,7 @@ if( ret==0 ) { string d = normalizeDevice( dev ); - getStorage()->setUsedBy( d, UB_NONE, "" ); + getStorage()->clearUsedBy(d); } y2milestone( "ret:%d", ret ); return( ret ); @@ -533,7 +533,7 @@ list<string> devs; i->getDevs( devs ); for( list<string>::const_iterator s=devs.begin(); s!=devs.end(); ++s ) - getStorage()->setUsedBy( *s, UB_NONE, "" ); + getStorage()->clearUsedBy(*s); if( i->created() ) { if( !removeFromList( &(*i) )) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/PeContainer.cc new/yast2-storage-2.17.15/libstorage/src/PeContainer.cc --- old/yast2-storage-2.17.13/libstorage/src/PeContainer.cc 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/PeContainer.cc 2008-08-08 22:31:53.000000000 +0200 @@ -28,9 +28,9 @@ void PeContainer::unuseDev() { for( list<Pv>::const_iterator s=pv.begin(); s!=pv.end(); ++s ) - getStorage()->setUsedBy( s->device, UB_NONE, "" ); + getStorage()->clearUsedBy(s->device); for( list<Pv>::const_iterator s=pv_add.begin(); s!=pv_add.end(); ++s ) - getStorage()->setUsedBy( s->device, UB_NONE, "" ); + getStorage()->clearUsedBy(s->device); } int @@ -157,7 +157,7 @@ } if( ret==0 ) { - getStorage()->setUsedBy( dev, UB_NONE, "" ); + getStorage()->clearUsedBy(dev); removed_pe += cur_pv.num_pe; if( !added_pv ) plrem.push_back( cur_pv ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Storage.cc new/yast2-storage-2.17.15/libstorage/src/Storage.cc --- old/yast2-storage-2.17.13/libstorage/src/Storage.cc 2008-08-07 11:07:18.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Storage.cc 2008-08-09 11:00:33.000000000 +0200 @@ -4585,32 +4585,39 @@ return( ret ); } -bool Storage::setUsedBy( const string& dev, UsedByType typ, const string& name ) - { + +bool Storage::clearUsedBy(const string& dev) +{ + return setUsedBy(dev, UB_NONE, ""); +} + + +bool Storage::setUsedBy(const string& dev, UsedByType ub_type, const string& ub_name) +{ bool ret=true; VolIterator v; if( !findVolume( dev, v ) ) - { + { DiskIterator i = findDisk( dev ); if( i != dEnd() ) - { - i->setUsedBy( typ, name ); - } + { + i->setUsedBy(ub_type, ub_name); + } else - { + { ret = false; - y2error( "could not set used by %d:%s for %s", typ, name.c_str(), - dev.c_str() ); - } + y2err("could not set ub_type:" << ub_type << " ub_name:" << ub_name << + "for dev: " << dev); } + } else - { - v->setUsedBy( typ, name ); - } - y2milestone( "dev:%s usedBy %d:%s ret:%d", dev.c_str(), typ, name.c_str(), - ret ); - return( ret ); + { + v->setUsedBy(ub_type, ub_name); } + y2mil("dev:" << dev << " ub_type:" << ub_type << " ub_name:" << ub_name << " ret:" << ret); + return ret; +} + bool Storage::usedBy( const string& dev, storage::usedBy& ub ) { @@ -4923,35 +4930,36 @@ return( ret ); } -int Storage::removeUsing( const string& device, const storage::usedBy& uby ) - { - y2mil( "device:" << device << uby ); - string name = uby.name(); + +int Storage::removeUsing(const string& device, const storage::usedBy& uby) +{ + y2mil("device:" << device << " uby:" << uby); int ret=0; switch( uby.type() ) { case UB_MD: - ret = removeVolume( "/dev/" + name ); + ret = removeVolume(uby.device()); break; case UB_DM: - ret = removeVolume( "/dev/mapper/" + name ); + ret = removeVolume(uby.device()); break; case UB_LVM: - ret = removeLvmVg( name ); + ret = removeLvmVg(uby.name()); break; case UB_DMRAID: //ret = removeDmraidCo( name ); break; case UB_NONE: - y2warning( "%s used by none", device.c_str() ); + y2war(device << " used by none"); break; default: ret = STORAGE_REMOVE_USING_UNKNOWN_TYPE; break; } - y2milestone( "ret:%d", ret ); - return( ret ); - } + y2mil("ret:" << ret); + return ret; +} + void Storage::rootMounted() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Storage.h new/yast2-storage-2.17.15/libstorage/src/Storage.h --- old/yast2-storage-2.17.13/libstorage/src/Storage.h 2008-08-06 12:34:18.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Storage.h 2008-08-09 00:15:17.000000000 +0200 @@ -234,8 +234,9 @@ void logProcData( const string& l="" ); storage::UsedByType usedBy( const string& dev ); bool usedBy( const string& dev, storage::usedBy& ub ); - bool setUsedBy( const string& dev, storage::UsedByType typ, - const string& name ); + bool clearUsedBy(const string& dev); + bool setUsedBy(const string& dev, storage::UsedByType ub_type, + const string& ub_name); bool canUseDevice( const string& dev, bool disks_allowed=false ); bool knownDevice( const string& dev, bool disks_allowed=false ); bool setDmcryptData( const string& dev, const string& dm, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/StorageInterface.h new/yast2-storage-2.17.15/libstorage/src/StorageInterface.h --- old/yast2-storage-2.17.13/libstorage/src/StorageInterface.h 2008-08-08 16:23:39.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/StorageInterface.h 2008-08-09 11:00:33.000000000 +0200 @@ -170,8 +170,9 @@ unsigned volcnt; string device; string name; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; bool readonly; }; @@ -243,8 +244,9 @@ string device; string mount; MountByType mount_by; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; string fstab_options; string uuid; string label; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/StorageTypes.cc new/yast2-storage-2.17.15/libstorage/src/StorageTypes.cc --- old/yast2-storage-2.17.13/libstorage/src/StorageTypes.cc 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/StorageTypes.cc 2008-08-09 11:00:33.000000000 +0200 @@ -13,7 +13,7 @@ { if( vol()==NULL || rhs.vol()==NULL ) return( false ); - else + else { if( rhs.vol()->getMount()=="swap" ) return( false ); @@ -51,5 +51,62 @@ return( unsigned(l)<unsigned(r) ); } -} + const string usedBy::device() const + { + switch (ub_type) + { + case UB_NONE: + return ""; + + case UB_LVM: + case UB_MD: + case UB_DMRAID: + return "/dev/" + ub_name; + + case UB_DM: + return "/dev/mapper/" + ub_name; + } + } + + + usedBy::operator string() const + { + string st; + if (type() != storage::UB_NONE) + { + switch (type()) + { + case storage::UB_LVM: + st = "lvm"; + break; + case storage::UB_MD: + st = "md"; + break; + case storage::UB_DM: + st = "dm"; + break; + case storage::UB_DMRAID: + st = "dmraid"; + break; + default: + st = "UNKNOWN"; + break; + } + st += "[" + name() + "]"; + } + return st; + } + + + std::ostream& operator<<(std::ostream& s, const usedBy& d) + { + if (d.type() != storage::UB_NONE) + { + s << " UsedBy:" << string(d); + } + return s; + } + + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/StorageTypes.h new/yast2-storage-2.17.15/libstorage/src/StorageTypes.h --- old/yast2-storage-2.17.13/libstorage/src/StorageTypes.h 2008-08-06 12:34:18.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/StorageTypes.h 2008-08-09 11:00:33.000000000 +0200 @@ -97,63 +97,37 @@ { return( !(*this < rhs && *this == rhs) ); } }; -struct usedBy - { - usedBy() : t(storage::UB_NONE) {;} - usedBy( storage::UsedByType typ, const string& n ) : t(typ), nm(n) {;} - void clear() { t=storage::UB_NONE; nm.erase(); } - void set( storage::UsedByType type, const string& n ) - { t=type; (t==storage::UB_NONE)?nm.erase():nm=n; } - bool operator==( const usedBy& rhs ) const - { return( t==rhs.t && nm==rhs.nm ); } - bool operator!=( const usedBy& rhs ) const - { return( !(*this==rhs)); } - inline operator string() const; - - storage::UsedByType type() const { return( t ); } - const string& name() const { return( nm ); } - friend inline std::ostream& operator<< (std::ostream&, const usedBy& ); - storage::UsedByType t; - string nm; - }; +class usedBy +{ + // TODO: save device instead of name? + +public: + usedBy() : ub_type(storage::UB_NONE) {} + usedBy(storage::UsedByType type, const string& name) : ub_type(type), ub_name(name) {} + + void clear() { ub_type = storage::UB_NONE; ub_name.erase(); } + void set(storage::UsedByType type, const string& name) + { ub_type = type; (ub_type==storage::UB_NONE)?ub_name.erase():ub_name = name; } + + bool operator==(const usedBy& rhs) const + { return ub_type == rhs.ub_type && ub_name == rhs.ub_name; } + bool operator!=(const usedBy& rhs) const + { return !(*this == rhs); } + + operator string() const; + + storage::UsedByType type() const { return ub_type; } + const string& name() const { return ub_name; } + const string device() const; + + friend std::ostream& operator<<(std::ostream&, const usedBy&); + +private: + storage::UsedByType ub_type; + string ub_name; +}; -inline usedBy::operator string() const - { - string st; - if( t!=storage::UB_NONE ) - { - switch( t ) - { - case storage::UB_LVM: - st = "lvm"; - break; - case storage::UB_MD: - st = "md"; - break; - case storage::UB_DM: - st = "dm"; - break; - case storage::UB_DMRAID: - st = "dmraid"; - break; - default: - st = "UNKNOWN"; - break; - } - st += "[" + nm + "]"; - } - return( st ); - } - -inline std::ostream& operator<< (std::ostream& s, const usedBy& d ) - { - if( d.t!=storage::UB_NONE ) - { - s << " UsedBy:" << string(d); - } - return( s ); - } struct match_string { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Volume.cc new/yast2-storage-2.17.15/libstorage/src/Volume.cc --- old/yast2-storage-2.17.13/libstorage/src/Volume.cc 2008-08-08 16:31:22.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Volume.cc 2008-08-09 11:00:33.000000000 +0200 @@ -487,7 +487,7 @@ else { FsCapabilities caps; - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -528,7 +528,7 @@ { ret = VOLUME_MOUNT_POINT_INVALID; } - else if( uby.t != UB_NONE ) + else if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -554,7 +554,7 @@ int ret = 0; y2milestone( "device:%s mby:%s", dev.c_str(), mbyTypeString(mby).c_str() ); y2mil( "vorher:" << *this ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -598,7 +598,7 @@ int ret = 0; y2milestone( "device:%s options:%s encr:%s", dev.c_str(), options.c_str(), encTypeString(encryption).c_str() ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -670,7 +670,7 @@ { cont->getStorage()->showInfoCb( formatText(true) ); } - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -1131,7 +1131,7 @@ { createPath( lmount ); } - if( ret==0 && !mp.empty() && uby.t != UB_NONE ) + if( ret==0 && !mp.empty() && uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -1166,7 +1166,7 @@ { int ret=0; y2milestone( "val:%llu", newSizeK ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -1497,15 +1497,15 @@ { cmd += " --key-file /dev/urandom create"; cmd += ' '; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); } else { cmd += " luksFormat"; cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += ' '; cmd += pwdf; } @@ -2695,8 +2695,9 @@ info.device = dev; info.mount = mp; info.mount_by = mount_by; - info.usedBy = uby.type(); + info.usedByType = uby.type(); info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.fstab_options = fstab_opt; info.uuid = uuid; info.label = label; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/libstorage/src/Volume.h new/yast2-storage-2.17.15/libstorage/src/Volume.h --- old/yast2-storage-2.17.13/libstorage/src/Volume.h 2008-08-06 12:34:18.000000000 +0200 +++ new/yast2-storage-2.17.15/libstorage/src/Volume.h 2008-08-09 11:00:33.000000000 +0200 @@ -51,10 +51,12 @@ void setFstabAdded( bool val=true ) { fstab_added=val; } bool sameDevice( const string& device ) const; bool fstabAdded() const { return( fstab_added ); } - const storage::usedBy& getUsedBy() const{ return( uby ); } - storage::UsedByType getUsedByType() const { return( uby.type() ); } - const string& usedByName() const { return( uby.name() ); } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name );} + + void clearUsedBy() { uby.clear(); } + void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } + const storage::usedBy& getUsedBy() const { return uby; } + storage::UsedByType getUsedByType() const { return uby.type(); } + void getFsInfo( const Volume* source ); virtual int setFormat( bool format=true, storage::FsType fs=storage::REISERFS ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/include/ep-dm.ycp new/yast2-storage-2.17.15/storage/src/include/ep-dm.ycp --- old/yast2-storage-2.17.13/storage/src/include/ep-dm.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/include/ep-dm.ycp 2008-08-08 22:31:53.000000000 +0200 @@ -44,7 +44,7 @@ } - void CreateDmPanel(any user_data) + void CreateDmOverviewTab(any user_data) { string dm_device = (string) user_data; @@ -54,7 +54,7 @@ `heading_filesystem, `fs_type, `mount_point, `mount_by, `uuid, `label ]); - UI::ReplaceWidget(`tree_panel, + UI::ReplaceWidget(`tab_panel, Greasemonkey::Transform( `VBox( `IconAndHeading(sformat(_("DM Device: %1"), dm_device), dm_icon), @@ -74,7 +74,7 @@ } - void HandleDmPanel(any user_data, symbol widget) + void HandleDmOverviewTab(any user_data, symbol widget) { string dm_device = (string) user_data; @@ -85,4 +85,67 @@ break; } } + + + void CreateDmDevicesTab(any user_data) + { + string part_device = (string) user_data; + + Debug("part_device", substring(part_device, 5)); + + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]); + } + + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, + `format, `type, `used_by ]); + + map<string, map> target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + + UI::ReplaceWidget(`tab_panel, + `VBox( + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + ) + ); + + string helptext = _("<p>DM TODO</p>"); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + + void CreateDmPanel(any user_data) + { + string device = (string) user_data; + + map<symbol, map> data = $[ `overview : $[ `create : CreateDmOverviewTab, `handle : HandleDmOverviewTab, `user_data : user_data ], + `devices : $[ `create : CreateDmDevicesTab, `user_data : user_data ] ]; + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + `IconAndHeading(sformat(_("Dm Device: %1"), device), dm_icon), + `DumbTab(`id(`tab), [ + `item(`id(`overview), _("&Overview")), + `item(`id(`devices), _("&Used Devices")) + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + ) + ) + ); + + TabPanel::Init(data); + } + + + void HandleDmPanel(any user_data, symbol widget) + { + TabPanel::Handle(widget); + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.17.15/storage/src/include/ep-lvm-dialogs.ycp --- old/yast2-storage-2.17.13/storage/src/include/ep-lvm-dialogs.ycp 2008-08-07 18:31:02.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/include/ep-lvm-dialogs.ycp 2008-08-09 11:00:33.000000000 +0200 @@ -229,8 +229,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; }); - list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == vgname; }); + list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == ""; }); + list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == "/dev/" + vgname; }); term contents = `VBox(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/include/ep-raid-dialogs.ycp new/yast2-storage-2.17.15/storage/src/include/ep-raid-dialogs.ycp --- old/yast2-storage-2.17.13/storage/src/include/ep-raid-dialogs.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/include/ep-raid-dialogs.ycp 2008-08-09 11:00:33.000000000 +0200 @@ -267,8 +267,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == ""; }); - list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return "/dev/" + dev["used_by"]:"" == device; }); + list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == ""; }); + list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == device; }); term contents = `VBox(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/include/ep-raid.ycp new/yast2-storage-2.17.15/storage/src/include/ep-raid.ycp --- old/yast2-storage-2.17.13/storage/src/include/ep-raid.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/include/ep-raid.ycp 2008-08-08 22:31:53.000000000 +0200 @@ -63,7 +63,7 @@ { string part_device = (string) user_data; - map<string, map> tg = Storage::GetTargetMap(); + map<string, map> target_map = Storage::GetTargetMap(); list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by, `heading_md, `raid_type, `chunk_size, @@ -74,7 +74,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(fields, tg, part_device), + StorageFields::Overview(fields, target_map, part_device), `HBox( `PushButton(`id(`edit), _("Edit...")), `PushButton(`id(`resize), _("Resize...")), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/modules/Partitions.ycp new/yast2-storage-2.17.15/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.17.13/storage/src/modules/Partitions.ycp 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/modules/Partitions.ycp 2008-08-09 11:00:33.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Provides information about partitions * - * $Id: Partitions.ycp 49678 2008-08-05 08:55:56Z aschnell $ + * $Id: Partitions.ycp 49899 2008-08-09 08:45:50Z aschnell $ */ { module "Partitions"; @@ -51,11 +51,11 @@ global boolean no_fsid_menu = Arch::s390 (); - global string raid_name = "MD Raid"; + global string raid_name = "MD RAID"; global string lv_name = "LV"; global string dm_name = "DM"; global string loop_name = "Loop Device"; - global string dmraid_name = "DM Raid"; + global string dmraid_name = "DM RAID"; global string nfs_name = "NFS"; // filesystems for /win diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/modules/StorageFields.ycp new/yast2-storage-2.17.15/storage/src/modules/StorageFields.ycp --- old/yast2-storage-2.17.13/storage/src/modules/StorageFields.ycp 2008-08-07 12:35:25.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/modules/StorageFields.ycp 2008-08-09 11:00:33.000000000 +0200 @@ -394,7 +394,7 @@ case `used_by: { - string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by"]:""); + string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by_device"]:""); if (style == `table) return value; else @@ -756,14 +756,14 @@ { if (partition == nil) { - if (contains(devices, "/dev/" + disk["used_by"]:"")) + if (contains(devices, disk["used_by_device"]:"")) return `showandfollow; else return `follow; } else { - if (contains(devices, "/dev/" + partition["used_by"]:"")) + if (contains(devices, partition["used_by_device"]:"")) return `show; else return `ignore; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/storage/src/modules/Storage.ycp new/yast2-storage-2.17.15/storage/src/modules/Storage.ycp --- old/yast2-storage-2.17.13/storage/src/modules/Storage.ycp 2008-08-07 14:56:03.000000000 +0200 +++ new/yast2-storage-2.17.15/storage/src/modules/Storage.ycp 2008-08-09 11:00:33.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 49817 2008-08-07 12:56:03Z aschnell $ + * $Id: Storage.ycp 49899 2008-08-09 08:45:50Z aschnell $ */ { @@ -1417,11 +1417,12 @@ t = LibStorage::VolumeInfo::swig_mount_by_get(vinfo); p["mountby"] = toSymbol( conv_mountby, t ); } - t = LibStorage::VolumeInfo::swig_usedBy_get(vinfo); + t = LibStorage::VolumeInfo::swig_usedByType_get(vinfo); if( t!=LibStorage::UB_NONE() ) { p["used_by_type"] = toSymbol( conv_usedby, t ); p["used_by"] = LibStorage::VolumeInfo::swig_usedByName_get(vinfo); + p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); if( size(tmp)>0 ) @@ -1727,7 +1728,7 @@ { list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by", "partitions", "dasdfmt", + "used_by_type", "used_by", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1751,11 +1752,12 @@ c["device"] = LibStorage::ContainerInfo::swig_device_get(info); integer t = LibStorage::ContainerInfo::swig_type_get(info); c["type"] = toSymbol( conv_ctype, t ); - t = LibStorage::ContainerInfo::swig_usedBy_get(info); + t = LibStorage::ContainerInfo::swig_usedByType_get(info); if( t!=LibStorage::UB_NONE() ) { c["used_by_type"] = toSymbol( conv_usedby, t ); c["used_by"] = LibStorage::ContainerInfo::swig_usedByName_get(info); + c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); if( b ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.13/VERSION new/yast2-storage-2.17.15/VERSION --- old/yast2-storage-2.17.13/VERSION 2008-08-08 15:01:03.000000000 +0200 +++ new/yast2-storage-2.17.15/VERSION 2008-08-09 11:00:33.000000000 +0200 @@ -1 +1 @@ -2.17.13 +2.17.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11
by root＠Hilbert.suse.de 09 Aug '08

09 Aug '08

Hello community, here is the log from the commit of package xorg-x11 checked in at Sun Aug 10 01:36:09 CEST 2008. -------- --- xorg-x11/xorg-x11.changes 2008-08-01 11:49:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2008-08-09 12:30:36.369250286 +0200 @@ -1,0 +2,7 @@ +Sat Aug 9 12:29:23 CEST 2008 - sndirsch(a)suse.de + +- no longer enable external resolution on laptops, i.e. set + sysconfig variable DISPLAYMANAGER_RANDR_MODE_VGA to empty string + instead of "auto" before; this time for real! (bnc #405399) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Z31522/_old 2008-08-10 01:34:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Z31522/_new 2008-08-10 01:34:21.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xorg-x11 (Version 7.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/ # @@ -19,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 112 +Release: 119 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -457,6 +464,10 @@ /var/lib/xdm/authdir/ %changelog +* Sat Aug 09 2008 sndirsch(a)suse.de +- no longer enable external resolution on laptops, i.e. set + sysconfig variable DISPLAYMANAGER_RANDR_MODE_VGA to empty string + instead of "auto" before; this time for real! (bnc #405399) * Fri Aug 01 2008 sndirsch(a)suse.de - xedit 1.1.1 - obsoletes additionally packaged util.h ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/var/adm/fillup-templates/sysconfig.displaymanager new/var/adm/fillup-templates/sysconfig.displaymanager --- old/var/adm/fillup-templates/sysconfig.displaymanager 2008-07-02 15:41:11.000000000 +0200 +++ new/var/adm/fillup-templates/sysconfig.displaymanager 2008-08-09 12:28:40.000000000 +0200 @@ -108,7 +108,7 @@ # Variables are checked according to their extension for # VGA DVI_I DVI_D DVI_A Composite S_Video Component LFP Proprietary # -DISPLAYMANAGER_RANDR_MODE_VGA="auto" +DISPLAYMANAGER_RANDR_MODE_VGA="" #DISPLAYMANAGER_RANDR_MODE_DVI_I="" #DISPLAYMANAGER_RANDR_MODE_DVI_D="" #DISPLAYMANAGER_RANDR_MODE_DVI_A="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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