Hello community, here is the log from the commit of package lxc for openSUSE:12.3 checked in at 2013-02-19 16:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/lxc (Old) and /work/SRC/openSUSE:12.3/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/lxc/lxc.changes 2013-01-31 01:26:39.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.lxc.new/lxc.changes 2013-02-19 16:19:04.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 19 10:59:39 UTC 2013 - [email protected] + +- lxc-opensuse-extend-base.patch: lxc-opensuse: extend base + (bnc#804232) +- lxc-opensuse-proper-failure.patch: lxc-opensuse: proper failure +- remove change-hwaddr-on-clone.patch as it was fixed upstream + already + +------------------------------------------------------------------- Old: ---- change-hwaddr-on-clone.patch New: ---- lxc-opensuse-extend-base.patch lxc-opensuse-proper-failure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.H25q4n/_old 2013-02-19 16:19:05.000000000 +0100 +++ /var/tmp/diff_new_pack.H25q4n/_new 2013-02-19 16:19:05.000000000 +0100 @@ -33,8 +33,6 @@ Patch1: lxc-opensuse-tmpfs.patch # PATCH-FIX-UPSTREAM lxc-cgroup-already-running.patch [email protected] -- warn if container is already running Patch2: lxc-cgroup-already-running.patch -# PATCH-FIX-UPSTREAM change-hwaddr-on-clone.patch [email protected] -- update network address when cloning a container -Patch3: change-hwaddr-on-clone.patch # PATCH-FIX-UPSTREAM 0001-Ensure-btrfs-subvolume-is-destroyed-on-error.patch [email protected] -- ensure btrfs subvolume is destroyed on container creation fails Patch4: 0001-Ensure-btrfs-subvolume-is-destroyed-on-error.patch # PATCH-FIX-UPSTREAM lxc-opensuse-12.2.patch @@ -43,6 +41,8 @@ Patch6: pivot-root_shared.patch # PATCH-FIX-UPSTREAM lxc-autodev.patch [email protected] -- Add lxc.autodev Patch7: lxc-autodev.patch +Patch8: lxc-opensuse-extend-base.patch +Patch9: lxc-opensuse-proper-failure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils @@ -86,11 +86,12 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build %configure --disable-examples ++++++ lxc-opensuse-extend-base.patch ++++++ From: Jiri Slaby <[email protected]> Subject: lxc-opensuse: extend base References: bnc#804232 Base no longer provides bash, sed and tar, but we need those. So add them. --- templates/lxc-opensuse.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -116,7 +116,7 @@ download_opensuse() 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 iputils + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar cat > $cache/partial-$arch-packages/opensuse.conf << EOF Preinstall: aaa_base bash coreutils diffutils Preinstall: filesystem fillup glibc grep insserv ++++++ lxc-opensuse-proper-failure.patch ++++++ From: Jiri Slaby <[email protected]> Subject: lxc-opensuse: proper failure Fail if something goes wrong. We used to continue and show one failure after another. --- templates/lxc-opensuse.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -113,10 +113,10 @@ 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 bash iputils sed tar + 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 + 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 cat > $cache/partial-$arch-packages/opensuse.conf << EOF Preinstall: aaa_base bash coreutils diffutils Preinstall: filesystem fillup glibc grep insserv @@ -152,9 +152,9 @@ EOF done fi - CLEAN_BUILD=1 BUILD_ARCH="$arch" BUILD_ROOT="$cache/partial-$arch" BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" PATH="$PATH:/usr/lib/build" /usr/lib/build/init_buildsystem --clean --configdir /usr/lib/build/configs --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 --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/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 + CLEAN_BUILD=1 BUILD_ARCH="$arch" BUILD_ROOT="$cache/partial-$arch" BUILD_DIST="$cache/partial-$arch-packages/opensuse.conf" PATH="$PATH:/usr/lib/build" /usr/lib/build/init_buildsystem --clean --configdir /usr/lib/build/configs --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 --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/$arch --repository $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch || return 1 + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss || return 1 + chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 # really clean the image rm -fr $cache/partial-$arch/{.build,.guessed_dist,.srcfiles*,installed-pkg} rm -fr $cache/partial-$arch/dev -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
