February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit netatalk for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package netatalk for openSUSE:12.3 checked in at 2013-02-26 15:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/netatalk (Old) and /work/SRC/openSUSE:12.3/.netatalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netatalk", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/netatalk/netatalk.changes 2013-01-31 01:28:09.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.netatalk.new/netatalk.changes 2013-02-26 15:22:37.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 08:48:30 UTC 2013 - mlin(a)suse.com + +- Install netatalk.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + * Added netatalk-suse-servicedir-update.diff + +------------------------------------------------------------------- New: ---- netatalk-suse-servicedir-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netatalk.spec ++++++ --- /var/tmp/diff_new_pack.kPa8W6/_old 2013-02-26 15:22:38.000000000 +0100 +++ /var/tmp/diff_new_pack.kPa8W6/_new 2013-02-26 15:22:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package netatalk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -63,6 +63,13 @@ Source4: netatalk-rpmlintrc Source6: netatalk-upgrade_netatalk_AppleDB.sh Patch1: netatalk.papd.ppdfile.patch +Patch2: netatalk-suse-servicedir-update.diff + +%if %suse_version > 1220 +%define _unitdir /usr/lib/systemd +%else +%define _unitdir /lib/systemd +%endif %description Netatalk is a freely-available Open Source AFP fileserver. It also @@ -105,6 +112,9 @@ %prep %setup -q -n netatalk-%{version} %patch1 -p1 +%if 0%{?suse_version} > 1220 +%patch2 -p1 +%endif cp -avL %{SOURCE1} . cat >> config/AppleVolumes.default.tmpl <<EOF # @@ -225,7 +235,7 @@ %config %{_sysconfdir}/pam.d/* # %attr(755,root,root) %{_sysconfdir}/init.d/netatalk -/lib/systemd/system/netatalk.service +%{_unitdir}/system/netatalk.service %attr(755,root,root) %{_bindir}/* %attr(755,root,lp) %{_sbindir}/papd ++++++ netatalk-suse-servicedir-update.diff ++++++ Index: netatalk-2.2.4/distrib/initscripts/Makefile.am =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.am +++ netatalk-2.2.4/distrib/initscripts/Makefile.am @@ -88,7 +88,7 @@ if USE_SYSTEMD sysvdir = $(pkglibexecdir) sysv_SCRIPTS = netatalk.sh -servicedir = /lib/systemd/system +servicedir = /usr/lib/systemd/system service_DATA = netatalk.service $(sysv_SCRIPTS): rc.atalk.systemd Index: netatalk-2.2.4/distrib/initscripts/Makefile.in =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.in +++ netatalk-2.2.4/distrib/initscripts/Makefile.in @@ -398,7 +398,7 @@ EXTRA_DIST = $(TEMPLATES) @USE_SUSE_SYSV_TRUE@sysv_SCRIPTS = netatalk @USE_SYSTEMD_TRUE@sysv_SCRIPTS = netatalk.sh @USE_TRU64_TRUE@sysv_SCRIPTS = netatalk -@USE_SYSTEMD_TRUE@servicedir = /lib/systemd/system +@USE_SYSTEMD_TRUE@servicedir = /usr/lib/systemd/system @USE_SYSTEMD_TRUE@service_DATA = netatalk.service all: all-am -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit netatalk for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package netatalk for openSUSE:Factory checked in at 2013-02-26 15:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netatalk (Old) and /work/SRC/openSUSE:Factory/.netatalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netatalk", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/netatalk/netatalk.changes 2012-10-03 08:04:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netatalk.new/netatalk.changes 2013-02-26 15:22:32.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 08:48:30 UTC 2013 - mlin(a)suse.com + +- Install netatalk.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + * Added netatalk-suse-servicedir-update.diff + +------------------------------------------------------------------- New: ---- netatalk-suse-servicedir-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netatalk.spec ++++++ --- /var/tmp/diff_new_pack.3tWn86/_old 2013-02-26 15:22:34.000000000 +0100 +++ /var/tmp/diff_new_pack.3tWn86/_new 2013-02-26 15:22:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package netatalk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -63,6 +63,13 @@ Source4: netatalk-rpmlintrc Source6: netatalk-upgrade_netatalk_AppleDB.sh Patch1: netatalk.papd.ppdfile.patch +Patch2: netatalk-suse-servicedir-update.diff + +%if %suse_version > 1220 +%define _unitdir /usr/lib/systemd +%else +%define _unitdir /lib/systemd +%endif %description Netatalk is a freely-available Open Source AFP fileserver. It also @@ -105,6 +112,9 @@ %prep %setup -q -n netatalk-%{version} %patch1 -p1 +%if 0%{?suse_version} > 1220 +%patch2 -p1 +%endif cp -avL %{SOURCE1} . cat >> config/AppleVolumes.default.tmpl <<EOF # @@ -225,7 +235,7 @@ %config %{_sysconfdir}/pam.d/* # %attr(755,root,root) %{_sysconfdir}/init.d/netatalk -/lib/systemd/system/netatalk.service +%{_unitdir}/system/netatalk.service %attr(755,root,root) %{_bindir}/* %attr(755,root,lp) %{_sbindir}/papd ++++++ netatalk-suse-servicedir-update.diff ++++++ Index: netatalk-2.2.4/distrib/initscripts/Makefile.am =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.am +++ netatalk-2.2.4/distrib/initscripts/Makefile.am @@ -88,7 +88,7 @@ if USE_SYSTEMD sysvdir = $(pkglibexecdir) sysv_SCRIPTS = netatalk.sh -servicedir = /lib/systemd/system +servicedir = /usr/lib/systemd/system service_DATA = netatalk.service $(sysv_SCRIPTS): rc.atalk.systemd Index: netatalk-2.2.4/distrib/initscripts/Makefile.in =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.in +++ netatalk-2.2.4/distrib/initscripts/Makefile.in @@ -398,7 +398,7 @@ EXTRA_DIST = $(TEMPLATES) @USE_SUSE_SYSV_TRUE@sysv_SCRIPTS = netatalk @USE_SYSTEMD_TRUE@sysv_SCRIPTS = netatalk.sh @USE_TRU64_TRUE@sysv_SCRIPTS = netatalk -@USE_SYSTEMD_TRUE@servicedir = /lib/systemd/system +@USE_SYSTEMD_TRUE@servicedir = /usr/lib/systemd/system @USE_SYSTEMD_TRUE@service_DATA = netatalk.service all: all-am -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package make for openSUSE:Factory checked in at 2013-02-26 15:22:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/make (Old) and /work/SRC/openSUSE:Factory/.make.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/make/make.changes 2013-02-04 18:00:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.make.new/make.changes 2013-02-26 15:22:21.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 15 10:39:32 UTC 2013 - schwab(a)suse.de + +- Fix missing definition of PAGE_SIZE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make-arglength.patch ++++++ --- /var/tmp/diff_new_pack.F3Aa8V/_old 2013-02-26 15:22:23.000000000 +0100 +++ /var/tmp/diff_new_pack.F3Aa8V/_new 2013-02-26 15:22:23.000000000 +0100 @@ -1,7 +1,8 @@ -diff -u make-3.82-orig/configure.in make-3.82/configure.in ---- make-3.82-orig/configure.in 2010-07-28 07:39:50.000000000 +0200 -+++ make-3.82/configure.in 2012-03-21 12:34:20.000000000 +0100 -@@ -64,7 +64,8 @@ +Index: make-3.82/configure.in +=================================================================== +--- make-3.82.orig/configure.in ++++ make-3.82/configure.in +@@ -64,7 +64,8 @@ AC_HEADER_DIRENT AC_HEADER_STAT AC_HEADER_TIME AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \ @@ -11,24 +12,26 @@ # Set a flag if we have an ANSI C compiler if test "$ac_cv_prog_cc_stdc" != no; then -Subdirectorios comunes: make-3.82-orig/doc y make-3.82/doc -Subdirectorios comunes: make-3.82-orig/glob y make-3.82/glob -diff -u make-3.82-orig/job.c make-3.82/job.c ---- make-3.82-orig/job.c 2010-07-24 10:27:50.000000000 +0200 -+++ make-3.82/job.c 2012-03-21 12:34:20.000000000 +0100 -@@ -29,6 +29,11 @@ +Index: make-3.82/job.c +=================================================================== +--- make-3.82.orig/job.c ++++ make-3.82/job.c +@@ -29,6 +29,14 @@ this program. If not, see <http://www.g #include <string.h> +#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) +#include <sys/user.h> +#include <linux/binfmts.h> ++#ifndef PAGE_SIZE ++#define PAGE_SIZE getpagesize() ++#endif +#endif + /* Default shell to use. */ #ifdef WINDOWS32 #include <windows.h> -@@ -2795,6 +2800,7 @@ +@@ -2795,6 +2803,7 @@ construct_command_argv_internal (char *l unsigned int sflags_len = strlen (shellflags); char *command_ptr = NULL; /* used for batch_mode_shell mode */ char *new_line; @@ -36,7 +39,7 @@ # ifdef __EMX__ /* is this necessary? */ if (!unixy_shell) -@@ -2865,8 +2871,17 @@ +@@ -2865,8 +2874,17 @@ construct_command_argv_internal (char *l return new_argv; } @@ -55,7 +58,7 @@ ap = new_line; memcpy (ap, shell, shell_len); ap += shell_len; -@@ -2875,6 +2890,30 @@ +@@ -2875,6 +2893,30 @@ construct_command_argv_internal (char *l ap += sflags_len; *(ap++) = ' '; command_ptr = ap; @@ -86,7 +89,7 @@ for (p = line; *p != '\0'; ++p) { if (restp != NULL && *p == '\n') -@@ -2922,6 +2961,14 @@ +@@ -2922,6 +2964,14 @@ construct_command_argv_internal (char *l } #endif *ap++ = *p; @@ -101,5 +104,3 @@ } if (ap == new_line + shell_len + sflags_len + 2) /* Line was empty. */ - - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:12.3 checked in at 2013-02-26 15:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/patterns-openSUSE (Old) and /work/SRC/openSUSE:12.3/.patterns-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-openSUSE", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/patterns-openSUSE/patterns-openSUSE.changes 2013-02-20 17:44:17.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.patterns-openSUSE.new/patterns-openSUSE.changes 2013-02-26 15:22:16.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 26 14:19:09 UTC 2013 - coolo(a)suse.com + +- Stephan Kulow (2): + suggest libyui backends for kde and gnome + install shim by default + +Commit: b9244511 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Ih4DY7/_old 2013-02-26 15:22:17.000000000 +0100 +++ /var/tmp/diff_new_pack.Ih4DY7/_new 2013-02-26 15:22:17.000000000 +0100 @@ -105,6 +105,9 @@ Recommends: branding-openSUSE Recommends: grub2 Recommends: grub2-efi +%ifarch ix86 +Recommends: grub2-i386-efi +%endif Recommends: pm-utils Recommends: systemd-sysvinit Requires: aaa_base @@ -128,6 +131,10 @@ Requires: rpm Requires: sbin_init Requires: sysconfig +%ifarch x86_64 +Recommends: grub2-x86_64-efi +Recommends: shim +%endif %description base This package is installed if a pattern is selected to have a working update path ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/BASIS new/patterns-openSUSE-data/data/BASIS --- old/patterns-openSUSE-data/data/BASIS 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/BASIS 2013-02-26 15:18:30.000000000 +0100 @@ -44,6 +44,13 @@ grub2 grub2-efi #endif +#if defined(__i386__) +grub2-i386-efi +#endif +#if defined (__x86_64__) +grub2-x86_64-efi +shim +#endif #if defined(__powerpc__) lilo #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME new/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME --- old/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME 2013-02-26 15:18:30.000000000 +0100 @@ -4,5 +4,8 @@ +Prc: gnome-packagekit - -Prc: + ++Psg: +libyui-gtk-pkg4 +-Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 new/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 --- old/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 2013-02-26 15:18:30.000000000 +0100 @@ -6,3 +6,7 @@ apper -Prc: ++Psg: +libyui-qt4 +libyui-qt-pkg4 +-Psg: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package lxc for openSUSE:12.3 checked in at 2013-02-26 15:18:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/lxc (Old) and /work/SRC/openSUSE:12.3/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/lxc/lxc.changes 2013-02-25 21:40:52.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.lxc.new/lxc.changes 2013-02-26 15:18:20.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 09:58:10 UTC 2013 - mvyskocil(a)suse.com + +- run zypper ar only if .repo file does not exists + fixes a partial created repos (bnc#804435#c16) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc-opensuse-12.3.patch ++++++ --- /var/tmp/diff_new_pack.EPIgVn/_old 2013-02-26 15:18:21.000000000 +0100 +++ /var/tmp/diff_new_pack.EPIgVn/_new 2013-02-26 15:18:21.000000000 +0100 @@ -35,9 +35,18 @@ touch $rootfs/etc/sysconfig/kernel -@@ -116,12 +122,12 @@ download_opensuse() - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 +@@ -113,15 +119,19 @@ download_opensuse() + # download a mini opensuse into a cache + echo "Downloading opensuse minimal ..." + mkdir -p "$cache/partial-$arch-packages" +- zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 +- zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 ++ if [[ ! -f $cache/partial-$arch-packages/etc/zypp/repos.d/repo-oss.repo ]]; then ++ zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 ++ fi ++ if [[ ! -f $cache/partial-$arch-packages/etc/zypp/repos.d/update.repo ]]; then ++ zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 ++ fi zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update || return 1 - zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar || return 1 + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar rsyslog || return 1 @@ -52,7 +61,7 @@ Preinstall: liblzma5 libcap2 libacl1 libattr1 Preinstall: libpopt0 libelf1 liblua5_1 Preinstall: libpcre1 -@@ -135,8 +141,8 @@ Support: ncurses-utils +@@ -135,8 +145,8 @@ Support: ncurses-utils Support: iputils Support: udev Support: netcfg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2013-02-26 15:18:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2013-02-25 21:40:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2013-02-26 15:18:15.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 09:58:10 UTC 2013 - mvyskocil(a)suse.com + +- run zypper ar only if .repo file does not exists + fixes a partial created repos (bnc#804435#c16) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc-opensuse-12.3.patch ++++++ --- /var/tmp/diff_new_pack.3OubG4/_old 2013-02-26 15:18:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3OubG4/_new 2013-02-26 15:18:16.000000000 +0100 @@ -35,9 +35,18 @@ touch $rootfs/etc/sysconfig/kernel -@@ -116,12 +122,12 @@ download_opensuse() - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 - zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 +@@ -113,15 +119,19 @@ download_opensuse() + # download a mini opensuse into a cache + echo "Downloading opensuse minimal ..." + mkdir -p "$cache/partial-$arch-packages" +- zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 +- zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 ++ if [[ ! -f $cache/partial-$arch-packages/etc/zypp/repos.d/repo-oss.repo ]]; then ++ zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 ++ fi ++ if [[ ! -f $cache/partial-$arch-packages/etc/zypp/repos.d/update.repo ]]; then ++ zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 ++ fi zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update || return 1 - zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar || return 1 + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar rsyslog || return 1 @@ -52,7 +61,7 @@ Preinstall: liblzma5 libcap2 libacl1 libattr1 Preinstall: libpopt0 libelf1 liblua5_1 Preinstall: libpcre1 -@@ -135,8 +141,8 @@ Support: ncurses-utils +@@ -135,8 +145,8 @@ Support: ncurses-utils Support: iputils Support: udev Support: netcfg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package libvirt for openSUSE:12.3 checked in at 2013-02-26 15:17:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/libvirt (Old) and /work/SRC/openSUSE:12.3/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt", Maintainer is "JFEHLIG(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/libvirt/libvirt.changes 2013-02-09 10:13:07.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.libvirt.new/libvirt.changes 2013-02-26 15:17:20.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 25 12:30:24 MST 2013 - jfehlig(a)suse.com + +- Fix detach of managed PCI devices from inactive domains. + Detected while running test cases for FATE #313570. + Modified xen-name-for-devid.patch + +------------------------------------------------------------------- +Thu Feb 21 15:48:39 MST 2013 - jfehlig(a)suse.com + +- spec: Fix installation of default network + +------------------------------------------------------------------- +Wed Feb 20 16:37:03 MST 2013 - jfehlig(a)suse.com + +- Fix default setting of backend field of libxl_device_disk + 567779e5-libxl-default-disk-backend.patch + rhb#912488 + +------------------------------------------------------------------- +Tue Feb 12 16:17:36 MST 2013 - jfehlig(a)suse.com + +- Fix build on IA64 + Modified clone.patch + +------------------------------------------------------------------- New: ---- 567779e5-libxl-default-disk-backend.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.27wh0Z/_old 2013-02-26 15:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.27wh0Z/_new 2013-02-26 15:17:22.000000000 +0100 @@ -419,6 +419,7 @@ # Upstream patches Patch0: a6b8bae5-python-generator-fix1.patch Patch1: 25ea8e47-python-generator-fix2.patch +Patch2: 567779e5-libxl-default-disk-backend.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -560,6 +561,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch100 -p1 %patch101 %patch102 -p1 @@ -858,7 +860,7 @@ %if %{with_libvirtd} %if %{with_network} # Install the default network if one doesn't exist -if ! /sbin/chkconfig libvirtd && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml +if test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml then UUID=`/usr/bin/uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ ++++++ 567779e5-libxl-default-disk-backend.patch ++++++ commit 567779e51a7727b021dee095c9d75cf0cde0bd43 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Wed Feb 20 13:02:28 2013 -0700 libxl: Fix setting of disk backend The libxl driver was setting the backend field of libxl_device_disk structure to LIBXL_DISK_BACKEND_TAP when the driver element of disk configuration was not specified. This needlessly forces the use of blktap driver, which may not be loaded in dom0 https://bugzilla.redhat.com/show_bug.cgi?id=912488 Ian Campbell suggested that LIBXL_DISK_BACKEND_UNKNOWN is a better default in this case https://www.redhat.com/archives/libvir-list/2013-February/msg01126.html Index: libvirt-1.0.2/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.0.2.orig/src/libxl/libxl_conf.c +++ libvirt-1.0.2/src/libxl/libxl_conf.c @@ -525,9 +525,13 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk return -1; } } else { - /* No driverName - default to raw/tap?? */ + /* + * If driverName is not specified, default to raw as per + * xl-disk-configuration.txt in the xen documentation and let + * libxl pick a suitable backend. + */ x_disk->format = LIBXL_DISK_FORMAT_RAW; - x_disk->backend = LIBXL_DISK_BACKEND_TAP; + x_disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } /* XXX is this right? */ ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.27wh0Z/_old 2013-02-26 15:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.27wh0Z/_new 2013-02-26 15:17:22.000000000 +0100 @@ -2,7 +2,39 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -2358,6 +2358,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -136,6 +136,7 @@ int lxcContainerHasReboot(void) + int cmd, v; + int status; + char *tmp; ++ int stacksize = getpagesize() * 4; + + if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) + return -1; +@@ -152,14 +153,21 @@ int lxcContainerHasReboot(void) + VIR_FREE(buf); + cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; + +- if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) { ++#ifdef __ia64__ ++ stacksize *= 2; ++#endif ++ if (VIR_ALLOC_N(stack, stacksize) < 0) { + virReportOOMError(); + return -1; + } + +- childStack = stack + (getpagesize() * 4); ++ childStack = stack + stacksize; + ++#ifdef __ia64__ ++ cpid = __clone2(lxcContainerRebootChild, stack, stacksize, flags, &cmd); ++#else + cpid = clone(lxcContainerRebootChild, childStack, flags, &cmd); ++#endif + VIR_FREE(stack); + if (cpid < 0) { + virReportSystemError(errno, "%s", +@@ -2358,6 +2366,9 @@ int lxcContainerStart(virDomainDefPtr de ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container */ @@ -12,7 +44,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -2377,7 +2380,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2377,7 +2388,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -24,7 +56,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2403,6 +2410,7 @@ int lxcContainerAvailable(int features) +@@ -2403,6 +2418,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; @@ -32,7 +64,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -2410,14 +2418,21 @@ int lxcContainerAvailable(int features) +@@ -2410,14 +2426,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.27wh0Z/_old 2013-02-26 15:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.27wh0Z/_new 2013-02-26 15:17:22.000000000 +0100 @@ -1,17 +1,18 @@ -commit 7906a668fa8d5c21cc729db8a13b08e3dd1d241f -Author: Jim Fehlig <jfehlig(a)novell.com> -Date: Wed Jan 27 16:11:41 2010 -0700 - - Do not search xenstore for disk device IDs + Do not search xenstore for disk/network/PCI device IDs - Disk devices can be referenced by name in Xen, e.g. when modifying - their configuration or remvoving them. As such, don't search - xenstore for a device ID corresponding to the disk device. Instead, - search the disks contained in the domain definition and use the - disk's target name if found. + Disk, network, and PCI devices can be referenced by name in Xen, + e.g. when modifying their configuration or remvoving them. As such, + don't search xenstore for a device ID corresponding to these devices. + Instead, search the devices contained in the domain definition and use + the devices's target name if found. + + Note that for network devices, the mac address is used for the device + name. For PCI devices, the bdf (bus:dev:fun) specifier is used for + the device name. - This approach allows removing a disk when domain is inactive. We - obviously can't search xenstore when the domain is inactive. + This approach allows removing a disk/network/PCI device when domain + is inactive. We obviously can't search xenstore when the domain is + inactive. Index: libvirt-1.0.2/src/xen/xend_internal.c =================================================================== @@ -52,7 +53,22 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3924,6 +3925,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3912,18 +3913,18 @@ struct xenUnifiedDriver xenDaemonDriver + * @dev: pointer to device config object + * @class: Xen device class "vbd" or "vif" (OUT) + * @ref: Xen device reference (OUT) ++ * @ref_len: Length of character buffer proviced by the ref parameter + * + * Set class according to XML root, and: + * - if disk, copy in ref the target name from description +- * - if network, get MAC address from description, scan XenStore and +- * copy in ref the corresponding vif number. +- * - if pci, get BDF from description, scan XenStore and +- * copy in ref the corresponding dev number. ++ * - if network, copy in ref the target MAC address from description ++ * - if pci, copy in ref the target BDF from description + * + * Returns 0 in case of success, -1 in case of failure. */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,12 +76,12 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3932,8 +3934,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3931,9 +3932,11 @@ virDomainXMLDevID(virDomainPtr domain, + { xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; - char *tmp; +- char *tmp; + unsigned int i; -+ virDomainDiskDefPtr disk; if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (dev->data.disk->dst == NULL) @@ -73,7 +89,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3943,19 +3949,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3943,19 +3946,17 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); @@ -90,15 +106,11 @@ - VIR_FREE(xref); - if (tmp == NULL) - return -1; -+ /* For disks, the device name can be used directly. -+ * If disk device exists in domain definintion, -+ * copy it to ref and return success. -+ */ ++ /* For disks, the device name can be used directly. */ + for (i = 0; i < domDef->ndisks; i++) { -+ disk = domDef->disks[i]; ++ virDomainDiskDefPtr disk = domDef->disks[i]; + if (STREQ(dev->data.disk->dst, disk->dst)) { -+ tmp = virStrcpy(ref, disk->dst, ref_len); -+ if (tmp == NULL) ++ if (virStrcpy(ref, disk->dst, ref_len) == NULL) + return -1; + else + return 0; @@ -108,3 +120,92 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[30]; virDomainNetDefPtr def = dev->data.net; +@@ -3965,17 +3966,22 @@ virDomainXMLDevID(virDomainPtr domain, + + strcpy(class, "vif"); + +- xenUnifiedLock(priv); +- xref = xenStoreDomainGetNetworkID(domain->conn, domain->id, +- mac); +- xenUnifiedUnlock(priv); +- if (xref == NULL) +- return -1; +- +- tmp = virStrcpy(ref, xref, ref_len); +- VIR_FREE(xref); +- if (tmp == NULL) +- return -1; ++ /* For nics, the mac address can be used directly. */ ++ for (i = 0; i < domDef->nnets; i++) { ++ char dst_mac[30]; ++ virDomainNetDefPtr dst_net = domDef->nets[i]; ++ snprintf(dst_mac, sizeof(dst_mac), "%02x:%02x:%02x:%02x:%02x:%02x", ++ dst_net->mac.addr[0], dst_net->mac.addr[1], ++ dst_net->mac.addr[2], dst_net->mac.addr[3], ++ dst_net->mac.addr[4], dst_net->mac.addr[5]); ++ if (STREQ(mac, dst_mac)) { ++ if (virStrcpy(ref, dst_mac, ref_len) == NULL) ++ return -1; ++ else ++ return 0; ++ } ++ } ++ return -1; + } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { +@@ -3993,17 +3999,44 @@ virDomainXMLDevID(virDomainPtr domain, + + strcpy(class, "pci"); + +- xenUnifiedLock(priv); +- xref = xenStoreDomainGetPCIID(domain->conn, domain->id, bdf); +- xenUnifiedUnlock(priv); +- VIR_FREE(bdf); +- if (xref == NULL) +- return -1; ++ /* For PCI devices, the device BFD can be used directly. */ ++ for (i = 0 ; i < domDef->nhostdevs ; i++) { ++ char *dst_bdf; ++ virDomainHostdevDefPtr hostdev = domDef->hostdevs[i]; ++ ++ if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) ++ continue; ++ if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) ++ continue; ++ ++ if (virAsprintf(&dst_bdf, "%04x:%02x:%02x.%0x", ++ hostdev->source.subsys.u.pci.domain, ++ hostdev->source.subsys.u.pci.bus, ++ hostdev->source.subsys.u.pci.slot, ++ hostdev->source.subsys.u.pci.function) < 0) { ++ virReportOOMError(); ++ VIR_FREE(bdf); ++ return -1; ++ } + +- tmp = virStrcpy(ref, xref, ref_len); +- VIR_FREE(xref); +- if (tmp == NULL) +- return -1; ++ if (STREQ(bdf, dst_bdf)) { ++ if (virStrcpy(ref, dst_bdf, ref_len) == NULL) { ++ virReportOOMError(); ++ VIR_FREE(dst_bdf); ++ VIR_FREE(bdf); ++ return -1; ++ } ++ else { ++ VIR_FREE(dst_bdf); ++ VIR_FREE(bdf); ++ return 0; ++ } ++ } ++ VIR_FREE(dst_bdf); ++ } ++ ++ VIR_FREE(bdf); ++ return -1; + } else { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("hotplug of device type not supported")); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2013-02-26 15:17:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt", Maintainer is "JFEHLIG(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2013-02-09 10:12:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2013-02-26 15:17:15.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 25 12:30:24 MST 2013 - jfehlig(a)suse.com + +- Fix detach of managed PCI devices from inactive domains. + Detected while running test cases for FATE #313570. + Modified xen-name-for-devid.patch + +------------------------------------------------------------------- +Thu Feb 21 15:48:39 MST 2013 - jfehlig(a)suse.com + +- spec: Fix installation of default network + +------------------------------------------------------------------- +Wed Feb 20 16:37:03 MST 2013 - jfehlig(a)suse.com + +- Fix default setting of backend field of libxl_device_disk + 567779e5-libxl-default-disk-backend.patch + rhb#912488 + +------------------------------------------------------------------- +Tue Feb 12 16:17:36 MST 2013 - jfehlig(a)suse.com + +- Fix build on IA64 + Modified clone.patch + +------------------------------------------------------------------- New: ---- 567779e5-libxl-default-disk-backend.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.oh4mKu/_old 2013-02-26 15:17:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oh4mKu/_new 2013-02-26 15:17:20.000000000 +0100 @@ -419,6 +419,7 @@ # Upstream patches Patch0: a6b8bae5-python-generator-fix1.patch Patch1: 25ea8e47-python-generator-fix2.patch +Patch2: 567779e5-libxl-default-disk-backend.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -560,6 +561,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch100 -p1 %patch101 %patch102 -p1 @@ -858,7 +860,7 @@ %if %{with_libvirtd} %if %{with_network} # Install the default network if one doesn't exist -if ! /sbin/chkconfig libvirtd && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml +if test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml then UUID=`/usr/bin/uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ ++++++ 567779e5-libxl-default-disk-backend.patch ++++++ commit 567779e51a7727b021dee095c9d75cf0cde0bd43 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Wed Feb 20 13:02:28 2013 -0700 libxl: Fix setting of disk backend The libxl driver was setting the backend field of libxl_device_disk structure to LIBXL_DISK_BACKEND_TAP when the driver element of disk configuration was not specified. This needlessly forces the use of blktap driver, which may not be loaded in dom0 https://bugzilla.redhat.com/show_bug.cgi?id=912488 Ian Campbell suggested that LIBXL_DISK_BACKEND_UNKNOWN is a better default in this case https://www.redhat.com/archives/libvir-list/2013-February/msg01126.html Index: libvirt-1.0.2/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.0.2.orig/src/libxl/libxl_conf.c +++ libvirt-1.0.2/src/libxl/libxl_conf.c @@ -525,9 +525,13 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk return -1; } } else { - /* No driverName - default to raw/tap?? */ + /* + * If driverName is not specified, default to raw as per + * xl-disk-configuration.txt in the xen documentation and let + * libxl pick a suitable backend. + */ x_disk->format = LIBXL_DISK_FORMAT_RAW; - x_disk->backend = LIBXL_DISK_BACKEND_TAP; + x_disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } /* XXX is this right? */ ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.oh4mKu/_old 2013-02-26 15:17:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oh4mKu/_new 2013-02-26 15:17:20.000000000 +0100 @@ -2,7 +2,39 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -2358,6 +2358,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -136,6 +136,7 @@ int lxcContainerHasReboot(void) + int cmd, v; + int status; + char *tmp; ++ int stacksize = getpagesize() * 4; + + if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) + return -1; +@@ -152,14 +153,21 @@ int lxcContainerHasReboot(void) + VIR_FREE(buf); + cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; + +- if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) { ++#ifdef __ia64__ ++ stacksize *= 2; ++#endif ++ if (VIR_ALLOC_N(stack, stacksize) < 0) { + virReportOOMError(); + return -1; + } + +- childStack = stack + (getpagesize() * 4); ++ childStack = stack + stacksize; + ++#ifdef __ia64__ ++ cpid = __clone2(lxcContainerRebootChild, stack, stacksize, flags, &cmd); ++#else + cpid = clone(lxcContainerRebootChild, childStack, flags, &cmd); ++#endif + VIR_FREE(stack); + if (cpid < 0) { + virReportSystemError(errno, "%s", +@@ -2358,6 +2366,9 @@ int lxcContainerStart(virDomainDefPtr de ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container */ @@ -12,7 +44,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -2377,7 +2380,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2377,7 +2388,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -24,7 +56,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2403,6 +2410,7 @@ int lxcContainerAvailable(int features) +@@ -2403,6 +2418,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; @@ -32,7 +64,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -2410,14 +2418,21 @@ int lxcContainerAvailable(int features) +@@ -2410,14 +2426,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.oh4mKu/_old 2013-02-26 15:17:20.000000000 +0100 +++ /var/tmp/diff_new_pack.oh4mKu/_new 2013-02-26 15:17:20.000000000 +0100 @@ -1,17 +1,18 @@ -commit 7906a668fa8d5c21cc729db8a13b08e3dd1d241f -Author: Jim Fehlig <jfehlig(a)novell.com> -Date: Wed Jan 27 16:11:41 2010 -0700 - - Do not search xenstore for disk device IDs + Do not search xenstore for disk/network/PCI device IDs - Disk devices can be referenced by name in Xen, e.g. when modifying - their configuration or remvoving them. As such, don't search - xenstore for a device ID corresponding to the disk device. Instead, - search the disks contained in the domain definition and use the - disk's target name if found. + Disk, network, and PCI devices can be referenced by name in Xen, + e.g. when modifying their configuration or remvoving them. As such, + don't search xenstore for a device ID corresponding to these devices. + Instead, search the devices contained in the domain definition and use + the devices's target name if found. + + Note that for network devices, the mac address is used for the device + name. For PCI devices, the bdf (bus:dev:fun) specifier is used for + the device name. - This approach allows removing a disk when domain is inactive. We - obviously can't search xenstore when the domain is inactive. + This approach allows removing a disk/network/PCI device when domain + is inactive. We obviously can't search xenstore when the domain is + inactive. Index: libvirt-1.0.2/src/xen/xend_internal.c =================================================================== @@ -52,7 +53,22 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3924,6 +3925,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3912,18 +3913,18 @@ struct xenUnifiedDriver xenDaemonDriver + * @dev: pointer to device config object + * @class: Xen device class "vbd" or "vif" (OUT) + * @ref: Xen device reference (OUT) ++ * @ref_len: Length of character buffer proviced by the ref parameter + * + * Set class according to XML root, and: + * - if disk, copy in ref the target name from description +- * - if network, get MAC address from description, scan XenStore and +- * copy in ref the corresponding vif number. +- * - if pci, get BDF from description, scan XenStore and +- * copy in ref the corresponding dev number. ++ * - if network, copy in ref the target MAC address from description ++ * - if pci, copy in ref the target BDF from description + * + * Returns 0 in case of success, -1 in case of failure. */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,12 +76,12 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3932,8 +3934,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3931,9 +3932,11 @@ virDomainXMLDevID(virDomainPtr domain, + { xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; - char *tmp; +- char *tmp; + unsigned int i; -+ virDomainDiskDefPtr disk; if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (dev->data.disk->dst == NULL) @@ -73,7 +89,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3943,19 +3949,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3943,19 +3946,17 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); @@ -90,15 +106,11 @@ - VIR_FREE(xref); - if (tmp == NULL) - return -1; -+ /* For disks, the device name can be used directly. -+ * If disk device exists in domain definintion, -+ * copy it to ref and return success. -+ */ ++ /* For disks, the device name can be used directly. */ + for (i = 0; i < domDef->ndisks; i++) { -+ disk = domDef->disks[i]; ++ virDomainDiskDefPtr disk = domDef->disks[i]; + if (STREQ(dev->data.disk->dst, disk->dst)) { -+ tmp = virStrcpy(ref, disk->dst, ref_len); -+ if (tmp == NULL) ++ if (virStrcpy(ref, disk->dst, ref_len) == NULL) + return -1; + else + return 0; @@ -108,3 +120,92 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[30]; virDomainNetDefPtr def = dev->data.net; +@@ -3965,17 +3966,22 @@ virDomainXMLDevID(virDomainPtr domain, + + strcpy(class, "vif"); + +- xenUnifiedLock(priv); +- xref = xenStoreDomainGetNetworkID(domain->conn, domain->id, +- mac); +- xenUnifiedUnlock(priv); +- if (xref == NULL) +- return -1; +- +- tmp = virStrcpy(ref, xref, ref_len); +- VIR_FREE(xref); +- if (tmp == NULL) +- return -1; ++ /* For nics, the mac address can be used directly. */ ++ for (i = 0; i < domDef->nnets; i++) { ++ char dst_mac[30]; ++ virDomainNetDefPtr dst_net = domDef->nets[i]; ++ snprintf(dst_mac, sizeof(dst_mac), "%02x:%02x:%02x:%02x:%02x:%02x", ++ dst_net->mac.addr[0], dst_net->mac.addr[1], ++ dst_net->mac.addr[2], dst_net->mac.addr[3], ++ dst_net->mac.addr[4], dst_net->mac.addr[5]); ++ if (STREQ(mac, dst_mac)) { ++ if (virStrcpy(ref, dst_mac, ref_len) == NULL) ++ return -1; ++ else ++ return 0; ++ } ++ } ++ return -1; + } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { +@@ -3993,17 +3999,44 @@ virDomainXMLDevID(virDomainPtr domain, + + strcpy(class, "pci"); + +- xenUnifiedLock(priv); +- xref = xenStoreDomainGetPCIID(domain->conn, domain->id, bdf); +- xenUnifiedUnlock(priv); +- VIR_FREE(bdf); +- if (xref == NULL) +- return -1; ++ /* For PCI devices, the device BFD can be used directly. */ ++ for (i = 0 ; i < domDef->nhostdevs ; i++) { ++ char *dst_bdf; ++ virDomainHostdevDefPtr hostdev = domDef->hostdevs[i]; ++ ++ if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) ++ continue; ++ if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) ++ continue; ++ ++ if (virAsprintf(&dst_bdf, "%04x:%02x:%02x.%0x", ++ hostdev->source.subsys.u.pci.domain, ++ hostdev->source.subsys.u.pci.bus, ++ hostdev->source.subsys.u.pci.slot, ++ hostdev->source.subsys.u.pci.function) < 0) { ++ virReportOOMError(); ++ VIR_FREE(bdf); ++ return -1; ++ } + +- tmp = virStrcpy(ref, xref, ref_len); +- VIR_FREE(xref); +- if (tmp == NULL) +- return -1; ++ if (STREQ(bdf, dst_bdf)) { ++ if (virStrcpy(ref, dst_bdf, ref_len) == NULL) { ++ virReportOOMError(); ++ VIR_FREE(dst_bdf); ++ VIR_FREE(bdf); ++ return -1; ++ } ++ else { ++ VIR_FREE(dst_bdf); ++ VIR_FREE(bdf); ++ return 0; ++ } ++ } ++ VIR_FREE(dst_bdf); ++ } ++ ++ VIR_FREE(bdf); ++ return -1; + } else { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("hotplug of device type not supported")); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmix for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package kmix for openSUSE:12.3 checked in at 2013-02-26 15:15:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kmix (Old) and /work/SRC/openSUSE:12.3/.kmix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmix", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/kmix/kmix.changes 2013-02-04 20:40:18.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kmix.new/kmix.changes 2013-02-26 15:15:46.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 22:24:50 UTC 2013 - tittiatcoke(a)gmail.com + +- Added patch correct_volume_change_with_mousewheel.diff to + correct the volume change step when used with mousewheel + (bko#313579) + +------------------------------------------------------------------- New: ---- correct_volume_change_with_mousewheel.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ --- /var/tmp/diff_new_pack.HLJ4Kg/_old 2013-02-26 15:15:47.000000000 +0100 +++ /var/tmp/diff_new_pack.HLJ4Kg/_new 2013-02-26 15:15:47.000000000 +0100 @@ -30,6 +30,8 @@ Version: 4.10.0 Release: 0 Source0: %{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff tittiatcoke(a)gmail.com -- Correct the volume change step when done with mousewheel +Patch1: correct_volume_change_with_mousewheel.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -38,6 +40,7 @@ %prep %setup -q +%patch1 -p1 %build %cmake_kde4 -d build ++++++ correct_volume_change_with_mousewheel.diff ++++++ diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp index 3bda22e..fee74d9 100644 --- a/gui/kmixdockwidget.cpp +++ b/gui/kmixdockwidget.cpp @@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation) if ( inc < 1 ) inc = 1; + if (delta < 0) + inc = -inc; + if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780 - delta = -delta; + inc = -inc; - long int cv = inc * (delta / 120 ); + // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should + // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change. + //long int cv = inc * (delta / 120 ); + long cv = inc; bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive; if ( cv > 0 && isInactive) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmix for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package kmix for openSUSE:Factory checked in at 2013-02-26 15:15:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmix (Old) and /work/SRC/openSUSE:Factory/.kmix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmix", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kmix/kmix.changes 2013-02-04 20:40:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2013-02-26 15:15:43.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 22:24:50 UTC 2013 - tittiatcoke(a)gmail.com + +- Added patch correct_volume_change_with_mousewheel.diff to + correct the volume change step when used with mousewheel + (bko#313579) + +------------------------------------------------------------------- New: ---- correct_volume_change_with_mousewheel.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ --- /var/tmp/diff_new_pack.BJZewA/_old 2013-02-26 15:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.BJZewA/_new 2013-02-26 15:15:44.000000000 +0100 @@ -30,6 +30,8 @@ Version: 4.10.0 Release: 0 Source0: %{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff tittiatcoke(a)gmail.com -- Correct the volume change step when done with mousewheel +Patch1: correct_volume_change_with_mousewheel.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -38,6 +40,7 @@ %prep %setup -q +%patch1 -p1 %build %cmake_kde4 -d build ++++++ correct_volume_change_with_mousewheel.diff ++++++ diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp index 3bda22e..fee74d9 100644 --- a/gui/kmixdockwidget.cpp +++ b/gui/kmixdockwidget.cpp @@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation) if ( inc < 1 ) inc = 1; + if (delta < 0) + inc = -inc; + if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780 - delta = -delta; + inc = -inc; - long int cv = inc * (delta / 120 ); + // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should + // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change. + //long int cv = inc * (delta / 120 ); + long cv = inc; bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive; if ( cv > 0 && isInactive) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0