November 2011 - openSUSE Commits - openSUSE Mailing Lists

commit man-pages-it for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package man-pages-it for openSUSE:Factory checked in at 2011-11-02 12:05:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages-it (Old) and /work/SRC/openSUSE:Factory/.man-pages-it.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages-it", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages-it/man-pages-it.changes 2011-09-23 02:12:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man-pages-it.new/man-pages-it.changes 2011-11-02 12:05:19.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Oct 31 14:31:39 UTC 2011 - pgajdos(a)suse.com + +- updated to 3.15: + * new pages: + abc2abc.1 + abc2ly.1 + abc2ps.1 + +------------------------------------------------------------------- Old: ---- man-pages-it-2.80.tar.bz2 New: ---- manpages3.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages-it.spec ++++++ --- /var/tmp/diff_new_pack.E8fetn/_old 2011-11-02 12:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.E8fetn/_new 2011-11-02 12:05:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package man-pages-it (Version 2.80) +# spec file for package man-pages-it # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -29,11 +29,11 @@ BuildRequires: fdupes %endif AutoReqProv: off -Version: 2.80 +Version: 3.15 Release: 2 Summary: LDP Man Pages (Italian) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: man-pages-it-%{version}.tar.bz2 +Source: manpages%{version}.tar.bz2 Source1: man-pages-it-rpmlintrc BuildArch: noarch -- 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.1
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package lxc for openSUSE:12.1 checked in at 2011-11-02 12:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/lxc (Old) and /work/SRC/openSUSE:12.1/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/lxc/lxc.changes 2011-10-24 13:06:18.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.lxc.new/lxc.changes 2011-11-02 12:03:57.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Oct 25 11:35:10 UTC 2011 - fcrozat(a)suse.com + +- Add console to opensuse securetty, since we are in a container. + +------------------------------------------------------------------- +Tue Oct 25 09:32:01 UTC 2011 - fcrozat(a)suse.com + +- Add lxc-opensuse-12.1.patch: create openSUSE 12.1 containers now +- Add Recommends on build package, which is used by opensuse + template. +- Update README.SUSE to current status for cgroups mountpoint + +------------------------------------------------------------------- New: ---- lxc-opensuse-12.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.mZTRcI/_old 2011-11-02 12:03:57.000000000 +0100 +++ /var/tmp/diff_new_pack.mZTRcI/_new 2011-11-02 12:03:57.000000000 +0100 @@ -27,6 +27,8 @@ License: LGPLv2+ Source: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz Source1: README.SUSE +# PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 +Patch0: lxc-opensuse-12.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils libcap-devel pkg-config %if 0%{?suse_version} >= 1130 @@ -35,6 +37,8 @@ BuildRequires: linux-kernel-headers %endif Requires: /sbin/setcap +# needed to create openSUSE containers using template +Recommends: build %description It provides commands to create and manage containers. It contains a @@ -57,6 +61,7 @@ %prep %setup +%patch0 -p1 %build %configure --disable-examples ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.mZTRcI/_old 2011-11-02 12:03:57.000000000 +0100 +++ /var/tmp/diff_new_pack.mZTRcI/_new 2011-11-02 12:03:57.000000000 +0100 @@ -1,4 +1,9 @@ -To mount the control group file system during boot run +To mount the control group file system on openSUSE 11.3, SLE 11 SP1 and older, +perform the following: mkdir /cgroup and add the following line to /etc/fstab: cgroup /cgroup cgroup nofail 0 0 + +On openSUSE 11.4, SLE 11 SP2 and newer, you can just run: +/sbin/insserv boot.cgroup +and /sys/fs/cgroup will be mounted for cgroup automatically. ++++++ lxc-opensuse-12.1.patch ++++++ >From 0619f3b2e1a2d37380c84347ebcf728d05e4915e Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Tue, 25 Oct 2011 11:25:18 +0200 Subject: [PATCH] templates: update openSUSE template for openSUSE 12.1 rely on "build" package, to ensure chroot can be created with distribution older than 12.1 --- templates/lxc-opensuse.in | 75 ++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 27 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in index 811876a..0f11740 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -25,7 +25,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -DISTRO=11.4 +DISTRO=12.1 configure_opensuse() { @@ -106,28 +106,11 @@ cons:2345:respawn:/sbin/mingetty --noclear console screen c1:2345:respawn:/sbin/mingetty --noclear tty1 screen EOF - # patch boot script, no longer needed in openSUSE 12.1 / SLE11-SP2 - patch --quiet -d $rootfs/etc/init.d/ << EOF ---- boot.orig 2011-05-26 16:03:07.000000000 +0200 -+++ boot 2011-05-26 16:03:19.000000000 +0200 -@@ -98,12 +98,12 @@ - echo "***************************************************************" - /sbin/halt -f - fi -- echo -n "Mounting devtmpfs at /dev" -- mount -n -t devtmpfs -o mode=0755 devtmpfs /dev -- rc_status -v -r -+# echo -n "Mounting devtmpfs at /dev" -+# mount -n -t devtmpfs -o mode=0755 devtmpfs /dev -+# rc_status -v -r - fi - --cp -axT --remove-destination /lib/udev/devices /dev -+#cp -axT --remove-destination /lib/udev/devices /dev - - if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then - mount -n -t debugfs debugfs /sys/kernel/debug > /dev/null 2>&1 + # set /dev/console as securetty + cat << EOF >> $rootfs/etc/securetty +console EOF + cat <<EOF >> $rootfs/etc/sysconfig/boot # disable root fsck ROOTFS_FSCK="0" @@ -136,7 +119,7 @@ EOF # remove pointless services in a container - insserv -r -f -p $rootfs/etc/init.d boot.udev boot.udev_retry boot.md boot.lvm boot.loadmodules boot.device-mapper boot.clock boot.swap boot.klog + chroot $rootfs /sbin/insserv -r -f boot.udev boot.loadmodules boot.device-mapper boot.clock boot.swap boot.klog kbd echo "Please change root-password !" echo "root:root" | chroot $rootfs chpasswd @@ -149,6 +132,12 @@ download_opensuse() cache=$1 arch=$2 + if [ ! -x /usr/bin/build ]; then + echo "Could not create openSUSE template :" + echo "you need to install \"build\" package" + return 1 + fi + # check the mini opensuse was not already downloaded mkdir -p "$cache/partial-$arch" @@ -159,18 +148,50 @@ 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 + zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update + zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base sysvinit-init + cat > $cache/partial-$arch-packages/opensuse.conf << EOF +Preinstall: aaa_base bash coreutils diffutils +Preinstall: filesystem fillup glibc grep insserv libacl1 libattr1 +Preinstall: libbz2-1 libgcc46 libxcrypt libncurses5 pam +Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 +Preinstall: liblzma5 libcap2 libpcre0 +Preinstall: libpopt0 libelf1 liblua5_1 + +RunScripts: aaa_base + +Support: zypper +Support: patterns-openSUSE-base +Support: lxc +Prefer: sysvinit-init + +Ignore: patterns-openSUSE-base:patterns-openSUSE-yast2_install_wf +EOF + + CLEAN_BUILD=1 BUILD_ROOT="$cache/partial-$arch" BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" /usr/lib/build/init_buildsystem --clean --cachedir $cache/partial-$arch-cache --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/noarch + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update + chroot $cache/partial-$arch rpm -e patterns-openSUSE-base + umount $cache/partial-$arch/proc +# really clean the image + rm -fr $cache/partial-$arch/{.build,.guessed_dist,.srcfiles*,installed-pkg} + rm -fr $cache/partial-$arch/dev +# make sure we have a minimal /dev mkdir -p "$cache/partial-$arch/dev" mknod -m 666 $cache/partial-$arch/dev/null c 1 3 mknod -m 666 $cache/partial-$arch/dev/zero c 1 5 - zypper --quiet --root $cache/partial-$arch --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss - zypper --quiet --root $cache/partial-$arch --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update - zypper --quiet --root $cache/partial-$arch --non-interactive --gpg-auto-import-keys in --auto-agree-with-licenses -t pattern base - zypper --quiet --root $cache/partial-$arch --non-interactive --gpg-auto-import-keys in +lxc -kbd -patterns-openSUSE-base +# create mtab symlink + rm -f $cache/partial-$arch/etc/mtab + ln -sf /proc/self/mounts $cache/partial-$arch/etc/mtab if [ $? -ne 0 ]; then echo "Failed to download the rootfs, aborting." return 1 fi + rm -fr "$cache/partial-$arch-packages" mv "$1/partial-$arch" "$1/rootfs-$arch" echo "Download complete." -- 1.7.7 -- 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 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2011-11-02 12:03:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-09-23 02:12:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2011-11-02 12:03:51.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Oct 25 11:35:10 UTC 2011 - fcrozat(a)suse.com + +- Add console to opensuse securetty, since we are in a container. + +------------------------------------------------------------------- +Tue Oct 25 09:32:01 UTC 2011 - fcrozat(a)suse.com + +- Add lxc-opensuse-12.1.patch: create openSUSE 12.1 containers now +- Add Recommends on build package, which is used by opensuse + template. +- Update README.SUSE to current status for cgroups mountpoint + +------------------------------------------------------------------- New: ---- lxc-opensuse-12.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.dMFCUH/_old 2011-11-02 12:03:52.000000000 +0100 +++ /var/tmp/diff_new_pack.dMFCUH/_new 2011-11-02 12:03:52.000000000 +0100 @@ -27,6 +27,8 @@ License: LGPLv2+ Source: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz Source1: README.SUSE +# PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 +Patch0: lxc-opensuse-12.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils libcap-devel pkg-config %if 0%{?suse_version} >= 1130 @@ -35,6 +37,8 @@ BuildRequires: linux-kernel-headers %endif Requires: /sbin/setcap +# needed to create openSUSE containers using template +Recommends: build %description It provides commands to create and manage containers. It contains a @@ -57,6 +61,7 @@ %prep %setup +%patch0 -p1 %build %configure --disable-examples ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.dMFCUH/_old 2011-11-02 12:03:52.000000000 +0100 +++ /var/tmp/diff_new_pack.dMFCUH/_new 2011-11-02 12:03:52.000000000 +0100 @@ -1,4 +1,9 @@ -To mount the control group file system during boot run +To mount the control group file system on openSUSE 11.3, SLE 11 SP1 and older, +perform the following: mkdir /cgroup and add the following line to /etc/fstab: cgroup /cgroup cgroup nofail 0 0 + +On openSUSE 11.4, SLE 11 SP2 and newer, you can just run: +/sbin/insserv boot.cgroup +and /sys/fs/cgroup will be mounted for cgroup automatically. ++++++ lxc-opensuse-12.1.patch ++++++ >From 0619f3b2e1a2d37380c84347ebcf728d05e4915e Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Tue, 25 Oct 2011 11:25:18 +0200 Subject: [PATCH] templates: update openSUSE template for openSUSE 12.1 rely on "build" package, to ensure chroot can be created with distribution older than 12.1 --- templates/lxc-opensuse.in | 75 ++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 27 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in index 811876a..0f11740 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -25,7 +25,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -DISTRO=11.4 +DISTRO=12.1 configure_opensuse() { @@ -106,28 +106,11 @@ cons:2345:respawn:/sbin/mingetty --noclear console screen c1:2345:respawn:/sbin/mingetty --noclear tty1 screen EOF - # patch boot script, no longer needed in openSUSE 12.1 / SLE11-SP2 - patch --quiet -d $rootfs/etc/init.d/ << EOF ---- boot.orig 2011-05-26 16:03:07.000000000 +0200 -+++ boot 2011-05-26 16:03:19.000000000 +0200 -@@ -98,12 +98,12 @@ - echo "***************************************************************" - /sbin/halt -f - fi -- echo -n "Mounting devtmpfs at /dev" -- mount -n -t devtmpfs -o mode=0755 devtmpfs /dev -- rc_status -v -r -+# echo -n "Mounting devtmpfs at /dev" -+# mount -n -t devtmpfs -o mode=0755 devtmpfs /dev -+# rc_status -v -r - fi - --cp -axT --remove-destination /lib/udev/devices /dev -+#cp -axT --remove-destination /lib/udev/devices /dev - - if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then - mount -n -t debugfs debugfs /sys/kernel/debug > /dev/null 2>&1 + # set /dev/console as securetty + cat << EOF >> $rootfs/etc/securetty +console EOF + cat <<EOF >> $rootfs/etc/sysconfig/boot # disable root fsck ROOTFS_FSCK="0" @@ -136,7 +119,7 @@ EOF # remove pointless services in a container - insserv -r -f -p $rootfs/etc/init.d boot.udev boot.udev_retry boot.md boot.lvm boot.loadmodules boot.device-mapper boot.clock boot.swap boot.klog + chroot $rootfs /sbin/insserv -r -f boot.udev boot.loadmodules boot.device-mapper boot.clock boot.swap boot.klog kbd echo "Please change root-password !" echo "root:root" | chroot $rootfs chpasswd @@ -149,6 +132,12 @@ download_opensuse() cache=$1 arch=$2 + if [ ! -x /usr/bin/build ]; then + echo "Could not create openSUSE template :" + echo "you need to install \"build\" package" + return 1 + fi + # check the mini opensuse was not already downloaded mkdir -p "$cache/partial-$arch" @@ -159,18 +148,50 @@ 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 + zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update + zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base sysvinit-init + cat > $cache/partial-$arch-packages/opensuse.conf << EOF +Preinstall: aaa_base bash coreutils diffutils +Preinstall: filesystem fillup glibc grep insserv libacl1 libattr1 +Preinstall: libbz2-1 libgcc46 libxcrypt libncurses5 pam +Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 +Preinstall: liblzma5 libcap2 libpcre0 +Preinstall: libpopt0 libelf1 liblua5_1 + +RunScripts: aaa_base + +Support: zypper +Support: patterns-openSUSE-base +Support: lxc +Prefer: sysvinit-init + +Ignore: patterns-openSUSE-base:patterns-openSUSE-yast2_install_wf +EOF + + CLEAN_BUILD=1 BUILD_ROOT="$cache/partial-$arch" BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" /usr/lib/build/init_buildsystem --clean --cachedir $cache/partial-$arch-cache --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/noarch + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update + chroot $cache/partial-$arch rpm -e patterns-openSUSE-base + umount $cache/partial-$arch/proc +# really clean the image + rm -fr $cache/partial-$arch/{.build,.guessed_dist,.srcfiles*,installed-pkg} + rm -fr $cache/partial-$arch/dev +# make sure we have a minimal /dev mkdir -p "$cache/partial-$arch/dev" mknod -m 666 $cache/partial-$arch/dev/null c 1 3 mknod -m 666 $cache/partial-$arch/dev/zero c 1 5 - zypper --quiet --root $cache/partial-$arch --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss - zypper --quiet --root $cache/partial-$arch --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update - zypper --quiet --root $cache/partial-$arch --non-interactive --gpg-auto-import-keys in --auto-agree-with-licenses -t pattern base - zypper --quiet --root $cache/partial-$arch --non-interactive --gpg-auto-import-keys in +lxc -kbd -patterns-openSUSE-base +# create mtab symlink + rm -f $cache/partial-$arch/etc/mtab + ln -sf /proc/self/mounts $cache/partial-$arch/etc/mtab if [ $? -ne 0 ]; then echo "Failed to download the rootfs, aborting." return 1 fi + rm -fr "$cache/partial-$arch-packages" mv "$1/partial-$arch" "$1/rootfs-$arch" echo "Download complete." -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit llvm for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package llvm for openSUSE:Factory checked in at 2011-11-02 12:02:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/llvm (Old) and /work/SRC/openSUSE:Factory/.llvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "llvm", Maintainer is "MHopf(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/llvm/llvm.changes 2011-10-29 08:00:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.llvm.new/llvm.changes 2011-11-02 12:02:04.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 1 11:31:57 UTC 2011 - idonmez(a)suse.com + +- Update r143456 from llvm-3.0 branch + * llvm/clang 3.0rc2 + +------------------------------------------------------------------- Old: ---- llvm-2.9.99.svn20111025.tar.bz2 llvm-pr9614-part1.patch llvm-pr9614-part2.patch New: ---- llvm-2.9.99.svn20111101.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ llvm.spec ++++++ --- /var/tmp/diff_new_pack.DBUnXs/_old 2011-11-02 12:02:06.000000000 +0100 +++ /var/tmp/diff_new_pack.DBUnXs/_new 2011-11-02 12:02:06.000000000 +0100 @@ -26,7 +26,7 @@ %endif Name: llvm -Version: 2.9.99.svn20111025 +Version: 2.9.99.svn20111101 Release: 1 License: NCSA Summary: Low Level Virtual Machine @@ -40,9 +40,6 @@ Patch2: clang-cmake-lib.patch # PATCH-FIX-OPENSUSE assume-opensuse.patch idoenmez(a)suse.de -- Always enable openSUSE/SUSE features Patch3: assume-opensuse.patch -# PATCH-FIX-UPSTREAM llvm-pr9614-part1.patch idoenmez(a)suse.de -- Fix LLVM PR9614 -Patch4: llvm-pr9614-part1.patch -Patch5: llvm-pr9614-part2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -135,11 +132,6 @@ %patch2 %patch3 -pushd tools/clang -%patch4 -p2 -%patch5 -p2 -popd - sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp %build ++++++ llvm-2.9.99.svn20111025.tar.bz2 -> llvm-2.9.99.svn20111101.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/llvm/llvm-2.9.99.svn20111025.tar.bz2 /work/SRC/openSUSE:Factory/.llvm.new/llvm-2.9.99.svn20111101.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:12.1
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package lightdm for openSUSE:12.1 checked in at 2011-11-02 12:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/lightdm (Old) and /work/SRC/openSUSE:12.1/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1/lightdm/lightdm.changes 2011-10-29 00:23:44.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.lightdm.new/lightdm.changes 2011-11-02 12:00:09.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Oct 30 19:05:10 UTC 2011 - gber(a)opensuse.org + +- added dependency on gnome-themes-accessibility to + lightdm-gtk-greeter in order to make it high contrast + accessibility option work + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.5SQbsu/_old 2011-11-02 12:00:10.000000000 +0100 +++ /var/tmp/diff_new_pack.5SQbsu/_new 2011-11-02 12:00:10.000000000 +0100 @@ -125,6 +125,7 @@ Group: System/X11/Displaymanagers Requires(post): update-alternatives Requires(postun):update-alternatives +Recommends: gnome-themes-accessibility Requires: %{name} = %{version} Requires: %{gobject_lib} = %{version} Requires: %{name}-gtk-greeter-branding = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2011-11-02 11:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2011-10-28 19:57:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2011-11-02 12:00:00.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Oct 30 19:05:10 UTC 2011 - gber(a)opensuse.org + +- added dependency on gnome-themes-accessibility to + lightdm-gtk-greeter in order to make it high contrast + accessibility option work + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.lUk4ue/_old 2011-11-02 12:00:01.000000000 +0100 +++ /var/tmp/diff_new_pack.lUk4ue/_new 2011-11-02 12:00:01.000000000 +0100 @@ -125,6 +125,7 @@ Group: System/X11/Displaymanagers Requires(post): update-alternatives Requires(postun):update-alternatives +Recommends: gnome-themes-accessibility Requires: %{name} = %{version} Requires: %{gobject_lib} = %{version} Requires: %{name}-gtk-greeter-branding = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:12.1
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package libstorage for openSUSE:12.1 checked in at 2011-11-02 11:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/libstorage (Old) and /work/SRC/openSUSE:12.1/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/libstorage/libstorage.changes 2011-10-28 17:10:48.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.libstorage.new/libstorage.changes 2011-11-02 11:59:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 31 18:38:21 CET 2011 - fehr(a)suse.de + +- 2.21.13 +- improve detection of /home partition (bnc#727362) + +------------------------------------------------------------------- Old: ---- libstorage-2.21.12.tar.bz2 New: ---- libstorage-2.21.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.r3Krny/_old 2011-11-02 11:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.r3Krny/_new 2011-11-02 11:59:16.000000000 +0100 @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.21.12 +Version: 2.21.13 Release: 0 License: GPL Group: System/Libraries ++++++ libstorage-2.21.12.tar.bz2 -> libstorage-2.21.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/VERSION new/libstorage-2.21.13/VERSION --- old/libstorage-2.21.12/VERSION 2011-10-27 13:35:05.000000000 +0200 +++ new/libstorage-2.21.13/VERSION 2011-10-31 18:46:39.000000000 +0100 @@ -1 +1 @@ -2.21.12 +2.21.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/storage/FreeInfo.cc new/libstorage-2.21.13/storage/FreeInfo.cc --- old/libstorage-2.21.12/storage/FreeInfo.cc 2010-07-29 15:47:00.000000000 +0200 +++ new/libstorage-2.21.13/storage/FreeInfo.cc 2011-10-31 18:18:22.000000000 +0100 @@ -123,7 +123,7 @@ const list<string> dirs = glob(mp + "/*", GLOB_NOSORT | GLOB_ONLYDIR); for (list<string>::const_iterator dir = dirs.begin(); dir != dirs.end(); ++dir) { - if (*dir != "root" && checkDir(*dir)) + if ( !boost::ends_with(*dir,"/root") && checkDir(*dir)) { for (unsigned int i = 0; i < lengthof(files); ++i) { @@ -230,6 +230,28 @@ content_info.homes = numHomes(mp); + if( content_info.homes==0 && !vol.getLabel().empty() ) + { + string lab = boost::to_lower_copy(vol.getLabel()); + y2mil( "label:" << vol.getLabel() << " lab:" << lab ); + if( boost::starts_with( lab, "home" )) + content_info.homes = 1; + } + if( content_info.homes==0 && + (vol.getFs()==EXT2 || vol.getFs()==EXT3 || vol.getFs()==EXT4 )) + { + SystemCmd c( "/sbin/tune2fs -l " + vol.mountDevice() + " | grep '^Last mounted on:'" ); + if( c.retcode()==0 && c.numLines()>0 ) + { + string line = c.getLine(0); + line = line.substr( line.find( ':' )+1 ); + y2mil( "line:" << c.getLine(0) << " lin:" << line ); + line = extractNthWord( 0, line ); + y2mil( "dir:" << line ); + if( line == "/home" ) + content_info.homes = 1; + } + } y2mil("device:" << vol.device() << " " << content_info); return content_info; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2011-11-02 11:59:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2011-10-27 19:36:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2011-11-02 11:59:10.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 31 18:38:21 CET 2011 - fehr(a)suse.de + +- 2.21.13 +- improve detection of /home partition (bnc#727362) + +------------------------------------------------------------------- Old: ---- libstorage-2.21.12.tar.bz2 New: ---- libstorage-2.21.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.dzsXSC/_old 2011-11-02 11:59:11.000000000 +0100 +++ /var/tmp/diff_new_pack.dzsXSC/_new 2011-11-02 11:59:11.000000000 +0100 @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.21.12 +Version: 2.21.13 Release: 0 License: GPL Group: System/Libraries ++++++ libstorage-2.21.12.tar.bz2 -> libstorage-2.21.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/VERSION new/libstorage-2.21.13/VERSION --- old/libstorage-2.21.12/VERSION 2011-10-27 13:35:05.000000000 +0200 +++ new/libstorage-2.21.13/VERSION 2011-10-31 18:46:39.000000000 +0100 @@ -1 +1 @@ -2.21.12 +2.21.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/storage/FreeInfo.cc new/libstorage-2.21.13/storage/FreeInfo.cc --- old/libstorage-2.21.12/storage/FreeInfo.cc 2010-07-29 15:47:00.000000000 +0200 +++ new/libstorage-2.21.13/storage/FreeInfo.cc 2011-10-31 18:18:22.000000000 +0100 @@ -123,7 +123,7 @@ const list<string> dirs = glob(mp + "/*", GLOB_NOSORT | GLOB_ONLYDIR); for (list<string>::const_iterator dir = dirs.begin(); dir != dirs.end(); ++dir) { - if (*dir != "root" && checkDir(*dir)) + if ( !boost::ends_with(*dir,"/root") && checkDir(*dir)) { for (unsigned int i = 0; i < lengthof(files); ++i) { @@ -230,6 +230,28 @@ content_info.homes = numHomes(mp); + if( content_info.homes==0 && !vol.getLabel().empty() ) + { + string lab = boost::to_lower_copy(vol.getLabel()); + y2mil( "label:" << vol.getLabel() << " lab:" << lab ); + if( boost::starts_with( lab, "home" )) + content_info.homes = 1; + } + if( content_info.homes==0 && + (vol.getFs()==EXT2 || vol.getFs()==EXT3 || vol.getFs()==EXT4 )) + { + SystemCmd c( "/sbin/tune2fs -l " + vol.mountDevice() + " | grep '^Last mounted on:'" ); + if( c.retcode()==0 && c.numLines()>0 ) + { + string line = c.getLine(0); + line = line.substr( line.find( ':' )+1 ); + y2mil( "line:" << c.getLine(0) << " lin:" << line ); + line = extractNthWord( 0, line ); + y2mil( "dir:" << line ); + if( line == "/home" ) + content_info.homes = 1; + } + } y2mil("device:" << vol.device() << " " << content_info); return content_info; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit leechcraft for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2011-11-02 11:58:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leechcraft", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2011-11-02 11:58:11.000000000 +0100 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Sun Oct 23 12:25:06 UTC 2011 - nlminhtl(a)gmail.com + +- 0.4.90 release + +------------------------------------------------------------------- +Fri Jul 21 21:15:59 UTC 2011 - nlminhtl(a)gmail.com + +- 0.4.85 version release + +------------------------------------------------------------------- +Mon Jul 4 11:49:59 UTC 2011 - nlminhtl(a)gmail.com + +- 0.4.80 version release + +------------------------------------------------------------------- +Thu Jun 30 11:47:27 UTC 2011 - nlminhtl(a)gmail.com + +- package name fixed + New: ---- _service azoth_qtmultimedia.patch dbusmanager.patch find_qxmpp.patch leechcraft.changes leechcraft.desktop leechcraft.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft.spec ++++++ ++++ 1075 lines (skipped) ++++++ _service ++++++ <services> <service name="download_files"/></services>++++++ azoth_qtmultimedia.patch ++++++ --- src/plugins/azoth/CMakeLists.txt 2011-09-13 12:38:57.000000000 +0300 +++ src/plugins/azoth/CMakeLists.txt 2011-10-23 15:00:38.561719376 +0300 @@ -33,14 +33,8 @@ OPTION (ENABLE_QTMULTIMEDIA_KLUDGE "Enable kludges for finding QtMultimedia" OFF) IF ((${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.8 AND ${CMAKE_PATCH_VERSION} LESS 4) OR ENABLE_QTMULTIMEDIA_KLUDGE) - IF (${QT_VERSION_MINOR} EQUAL 6) - INCLUDE_DIRECTORIES (/usr/include/qt4/QtMultimedia) - SET (QTMULTIMEDIA_KLUDGE "QtMultimedia") - ELSE (${QT_VERSION_MINOR} EQUAL 6) - INCLUDE_DIRECTORIES (/usr/include/QtMultimediaKit) - INCLUDE_DIRECTORIES (/usr/include/QtMobility) - SET (QTMULTIMEDIA_KLUDGE "QtMultimediaKit") - ENDIF (${QT_VERSION_MINOR} EQUAL 6) + INCLUDE_DIRECTORIES (/usr/include/QtMultimedia) + SET (QTMULTIMEDIA_KLUDGE "QtMultimedia") ENDIF ((${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.8 AND ${CMAKE_PATCH_VERSION} LESS 4) OR ENABLE_QTMULTIMEDIA_KLUDGE) OPTION (ENABLE_CRYPT "Enable QCA2-based support for PGP" ON) ++++++ dbusmanager.patch ++++++ --- src/plugins/dbusmanager/CMakeLists.txt 2011-07-22 17:05:39.000000000 +0300 +++ src/plugins/dbusmanager/CMakeLists.txt 2011-07-23 14:29:46.250689822 +0300 @@ -15,9 +15,9 @@ FIND_PACKAGE (LeechCraft REQUIRED) ENDIF (NOT QT_USE_FILE) -IF (NOT (QT_QTDBUS_FOUND AND UNIX)) +IF (NOT QT_QTDBUS_FOUND OR UNIX) MESSAGE (ERROR "DBusManager could not be built") -ENDIF (NOT (QT_QTDBUS_FOUND AND UNIX)) +ENDIF (NOT QT_QTDBUS_FOUND OR UNIX) SET (QT_USE_QTDBUS TRUE) INCLUDE (${QT_USE_FILE}) ++++++ find_qxmpp.patch ++++++ --- src/plugins/azoth/plugins/xoox/CMakeLists.txt 2011-07-22 17:05:39.000000000 +0300 +++ src/plugins/azoth/plugins/xoox/CMakeLists.txt 2011-08-02 13:18:39.313793312 +0300 @@ -1,14 +1,14 @@ SET (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -FIND_PACKAGE (QXmpp REQUIRED) FIND_PACKAGE (Speex REQUIRED) INCLUDE_DIRECTORIES (${AZOTH_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${QXMPP_INCLUDE_DIR} + /usr/include/qxmpp ${QCA2_INCLUDE_DIR} - ) + ) + SET (XOOX_SRCS xoox.cpp glooxprotocol.cpp @@ -152,7 +152,7 @@ TARGET_LINK_LIBRARIES (leechcraft_azoth_xoox ${QT_LIBRARIES} ${LEECHCRAFT_LIBRARIES} - ${QXMPP_LIBRARIES} + libqxmpp.so ${SPEEX_LIBRARIES} ${QCA2_LIBRARIES} ) ++++++ leechcraft.desktop ++++++ [Desktop Entry] Type=Application Name=LeechCraft GenericName=Internet client GenericName[ru]=Интернет-клиент Icon=leechcraft_main Exec=leechcraft Categories=Network;FileTransfer;News;P2P;IRCClient;Qt; Terminal=false X-StandardInstall=true -- 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 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '11

02 Nov '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2011-11-02 11:57:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-10-28 19:49:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-11-02 11:57:09.000000000 +0100 @@ -1,0 +2,42 @@ +Mon Oct 31 10:24:10 CET 2011 - ms(a)suse.de + +- v4.98.12 released + +------------------------------------------------------------------- +Mon Oct 31 09:52:52 CET 2011 - ms(a)suse.de + +- s390 netboot: +* make sure the VTOC table is created prior to any fdasd call +* make sure searchBusIDBootDevice is called to set the device + in $DISK online by a custom DEVICE_INIT command + +------------------------------------------------------------------- +Mon Oct 31 09:52:22 CET 2011 - ms(a)suse.de + +- added support for custom s390 device init command in the + searchBusIDBootDevice function. This is required if the s390 + client was not booted by an ipl command but e.g. via zPXE + +------------------------------------------------------------------- +Sun Oct 30 20:37:49 CET 2011 - ms(a)suse.de + +- fixed migration code: +* fixed creation of URL list from zypper information +* write current schema version (5.3) XML +* fixed creation of KIWISatSolver objects + +------------------------------------------------------------------- +Sat Oct 29 22:42:36 CEST 2011 - ms(a)suse.de + +- added support for Microsoft Hyper-V machine image format + <type ... format="vpc"/>. This requires a qemu version + which supports the vpc format conversion (fate# 309765) + +------------------------------------------------------------------- +Sat Oct 29 22:34:28 CEST 2011 - ms(a)suse.de + +- fixed migration module to work again. Added 11.4 and 12.1 paths + and make sure the global object pointer is there when it is + accessed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.avnjQ1/_old 2011-11-02 11:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.avnjQ1/_new 2011-11-02 11:57:11.000000000 +0100 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.98.11 +Version: 4.98.12 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/.revision 2011-10-31 10:14:36.000000000 +0100 @@ -1 +1 @@ -09f7ec7b6a79943153207fd6ed51275a7441ab1f +98a56eb39d341590b41e83b10693cbe34472d7af diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-10-31 10:14:36.000000000 +0100 @@ -1336,7 +1336,7 @@ print " kiwi --installstick <initrd>\n"; print " [ --installstick-system <vmx-system-image> ]\n"; print "Image format conversion:\n"; - print " kiwi --convert <systemImage> [ --format <vmdk|ovf|qcow2> ]\n"; + print " kiwi --convert <systemImage> [ --format <vmdk|ovf|qcow2|..> ]\n"; print "Helper Tools:\n"; print " kiwi --createpassword\n"; print " kiwi --createhash <image-path>\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2011-10-28 13:59:39.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-10-31 10:25:04.000000000 +0100 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.98.11"; + $data{Version} = "4.98.12"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2011-10-31 10:14:36.000000000 +0100 @@ -155,6 +155,9 @@ if ($format eq "vmdk") { $kiwi -> info ("Starting raw => $format conversion\n"); return $this -> createVMDK(); + } elsif ($format eq "vpc") { + $kiwi -> info ("Starting raw => $format conversion\n"); + return $this -> createVPC(); } elsif ($format eq "ovf") { $kiwi -> info ("Starting raw => $format conversion\n"); return $this -> createOVF(); @@ -319,28 +322,19 @@ } #========================================== +# createVPC +#------------------------------------------ +sub createVPC { + my $this = shift; + return $this -> createVMDK(); +} + +#========================================== # createQCOW2 #------------------------------------------ sub createQCOW2 { my $this = shift; - my $kiwi = $this->{kiwi}; - my $format = $this->{format}; - my $source = $this->{image}; - my $target = $source; - my $status; - my $result; - $kiwi -> info ("Creating $format image..."); - $target =~ s/\.raw$/\.$format/; - $status = qxx ("qemu-img convert -f raw $source -O $format $target 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> failed (); - $kiwi -> error ("Couldn't create $format image: $status"); - $kiwi -> failed (); - return undef; - } - $kiwi -> done (); - return $target; + return $this -> createVMDK(); } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-10-28 13:59:39.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-31 10:14:36.000000000 +0100 @@ -3411,6 +3411,17 @@ local wwpn local slun #====================================== + # check for custom device init command + #-------------------------------------- + if [ ! -z "$DEVICE_INIT" ];then + if ! eval $DEVICE_INIT;then + export biosBootDevice="Failed to call: $DEVICE_INIT" + return 1 + fi + export biosBootDevice=$DISK + return 0 + fi + #====================================== # determine device type: dasd or zfcp #-------------------------------------- if [ -z "$ipl_type" ];then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.pm new/kiwi/modules/KIWIMigrate.pm --- old/kiwi/modules/KIWIMigrate.pm 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.pm 2011-10-31 10:14:36.000000000 +0100 @@ -84,6 +84,7 @@ $kiwi -> failed (); return undef; } + $this->{gdata} = $main::global -> getGlobals(); my $product = $this -> getOperatingSystemVersion(); if (! defined $product) { $kiwi -> failed (); @@ -226,7 +227,6 @@ $this->{product} = $product; $this->{mount} = []; $this->{autoyastCloneList} = \@autoyastCloneList; - $this->{gdata} = $main::global -> getGlobals(); return $this; } @@ -691,6 +691,7 @@ return undef; } foreach my $repo (@list) { + $repo =~ s/^\s+//g; if ($repo =~ /^\d.*\|(.*)\|.*\|(.*)\|.*\|(.*)\|(.*)\|(.*)\|/) { my $enabled = $2; my $source = $5; @@ -811,7 +812,7 @@ #========================================== # <description> #------------------------------------------ - print FD '<image schemaversion="4.8" '; + print FD '<image schemaversion="5.3" '; print FD 'name="suse-migration-'.$product.'">'."\n"; print FD "\t".'<description type="system">'."\n"; print FD "\t\t".'<author>***AUTHOR***</author>'."\n"; @@ -824,8 +825,7 @@ print FD "\t".'<preferences>'."\n"; print FD "\t\t".'<type image="oem" boot="oemboot/suse-'.$product.'"'; print FD ' filesystem="ext3" installiso="true">'."\n"; - print FD "\t\t\t".'<oemconfig>'."\n"; - print FD "\t\t\t".'</oemconfig>'."\n"; + print FD "\t\t\t".'<oemconfig/>'."\n"; print FD "\t\t".'</type>'."\n"; print FD "\t\t".'<version>1.1.1</version>'."\n"; print FD "\t\t".'<packagemanager>zypper</packagemanager>'."\n"; @@ -856,9 +856,10 @@ #========================================== # <packages> #------------------------------------------ - print FD "\t".'<packages type="image">'."\n"; + print FD "\t".'<packages type="bootstrap">'."\n"; if (defined $pats) { foreach my $pattern (sort @{$pats}) { + $pattern =~ s/^pattern://; print FD "\t\t".'<opensusePattern name="'.$pattern.'"/>'."\n"; } } @@ -868,15 +869,6 @@ } } print FD "\t".'</packages>'."\n"; - #========================================== - # <packages type="bootstrap"> - #------------------------------------------ - print FD "\t".'<packages type="bootstrap">'."\n"; - print FD "\t\t".'<package name="filesystem"/>'."\n"; - print FD "\t\t".'<package name="glibc-locale"/>'."\n"; - print FD "\t\t".'<package name="cracklib-dict-full"/>'."\n"; - print FD "\t\t".'<package name="openssl-certs"/>'."\n"; - print FD "\t".'</packages>'."\n"; print FD '</image>'."\n"; close FD; return $this; @@ -1119,15 +1111,15 @@ my $name = $1; $name =~ s/^ +//g; $name =~ s/ +$//g; - $pathash{"$name"} = "$name"; + $pathash{"pattern:$name"} = "$name"; } } @patlist = keys %pathash; } $this->{patterns} = \@patlist; my $psolve = new KIWISatSolver ( - $kiwi,\@patlist,\@urllist,undef,undef,undef, - "silent","plusRecommended" + $kiwi,\@patlist,\@urllist,"solve-patterns", + undef,undef,undef,"plusRecommended" ); my @result = (); if (! defined $psolve) { @@ -1180,8 +1172,8 @@ my $repo = $psolve -> getRepo(); my $pool = $psolve -> getPool(); my $xsolve = new KIWISatSolver ( - $kiwi,\@result,\@urllist,"solve-packages",$repo,$pool, - "silent","plusRecommended" + $kiwi,\@result,\@urllist,"solve-packages", + $repo,$pool,undef,"plusRecommended" ); if (! defined $xsolve) { $kiwi -> error ("Failed to solve packages"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.txt new/kiwi/modules/KIWIMigrate.txt --- old/kiwi/modules/KIWIMigrate.txt 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.txt 2011-10-31 10:14:36.000000000 +0100 @@ -11,3 +11,5 @@ openSUSE-11.1=suse-11.1 openSUSE-11.2=suse-11.2 openSUSE-11.3=suse-11.3 +openSUSE-11.4=suse-11.4 +openSUSE-12.1=suse-12.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2011-10-31 10:14:36.000000000 +0100 @@ -1490,7 +1490,7 @@ k.type.format.attribute = ## Specifies the format of the virtual disk. attribute format { - "ec2" | "ovf" | "qcow2" | "vmdk" + "ec2" | "ovf" | "qcow2" | "vmdk" | "vpc" } k.type.fsnocheck.attribute = ## Turn off periodic filesystem checks on ext2/3/4. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2011-10-31 10:14:36.000000000 +0100 @@ -2013,6 +2013,7 @@ <value>ovf</value> <value>qcow2</value> <value>vmdk</value> + <value>vpc</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-28 13:59:35.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-31 10:14:36.000000000 +0100 @@ -60,6 +60,19 @@ initialize #====================================== +# recreateVTOCTable +#-------------------------------------- +function recreateVTOCTable { + # /.../ + # re-create VTOC re-using existing partition sizes + # ---- + Echo "Recreate VTOC table [ $imageDiskDevice ]" + createPartitionerInput u y w + callPartitioner $input + rm -f $input +} + +#====================================== # Beautify Startup #-------------------------------------- echo "Loading KIWI PXE Boot-System..." @@ -266,6 +279,7 @@ #====================================== # 12) Check for diskful station #-------------------------------------- +searchBusIDBootDevice if [ $LOCAL_BOOT = "no" ];then checkDevice=$DISK if [ -z "$checkDevice" ];then @@ -355,6 +369,7 @@ # Standard table #-------------------------------------- cleanPartitionTable + recreateVTOCTable createPartitionerInput $(pxePartitionInput) callPartitioner $input else @@ -394,6 +409,7 @@ imageDiskDevice=$raid_dev rm -f $input cleanPartitionTable + recreateVTOCTable createPartitionerInput $(pxeRaidPartitionInput) callPartitioner $input done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0