Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2012-01-11 15:37:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc", Maintainer is "jsl...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2011-11-02 12:03:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2012-01-11 15:38:38.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Jan 10 15:41:45 UTC 2012 - fcro...@suse.com + +- Drop lxc-file_caps.patch, it is SLES specific, since openSUSE is + now shipping with file capabilities enabled. + +------------------------------------------------------------------- +Fri Jan 6 15:51:32 UTC 2012 - fcro...@suse.com + +- Update lxc-opensuse-12.1.patch to correctly generate containers + on x86 (bnc#739315). +- Backport some fixes from SLES 11 SP2: + - Add lxc-checkconfig-kernel-3.patch and lxc-file_caps.patch: + fix detection of kernel 3.x and file capabilities (bnc#720845). + - Fix example path in manpages (bnc#723946). + +------------------------------------------------------------------- New: ---- lxc-checkconfig-kernel-3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.0xLKO7/_old 2012-01-11 15:38:39.000000000 +0100 +++ /var/tmp/diff_new_pack.0xLKO7/_new 2012-01-11 15:38:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lxc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,6 +29,8 @@ Source1: README.SUSE # PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 Patch0: lxc-opensuse-12.1.patch +# PATCH-FIX-UPSTREAM lxc-checkconfig-kernel-3.patch bnc#720845 fcro...@suse.com -- correctly detect kernel 3.x +Patch1: lxc-checkconfig-kernel-3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils libcap-devel pkg-config %if 0%{?suse_version} >= 1130 @@ -62,6 +64,7 @@ %prep %setup %patch0 -p1 +%patch1 -p1 %build %configure --disable-examples ++++++ lxc-checkconfig-kernel-3.patch ++++++ >From 5a4d96d1fd95719ddeb462fff45dbbc7cbbee3df Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Thu, 13 Oct 2011 11:26:56 +0200 Subject: [PATCH] handle kernel 3.x in lxc-checkconfig Make sure to correctly detect kernel 3.x for file capabilities. --- src/lxc/lxc-checkconfig.in | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in index 5dcf3a4..c2c64ba 100755 --- a/src/lxc/lxc-checkconfig.in +++ b/src/lxc/lxc-checkconfig.in @@ -83,12 +83,21 @@ echo "--- Misc ---" echo -n "Veth pair device: " && is_enabled CONFIG_VETH echo -n "Macvlan: " && is_enabled CONFIG_MACVLAN echo -n "Vlan: " && is_enabled CONFIG_VLAN_8021Q +KVER_MAJOR=$($GREP '^# Linux' $CONFIG | \ + sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/') +if [[ $KVER_MAJOR == 2 ]]; then KVER_MINOR=$($GREP '^# Linux' $CONFIG | \ - sed -r 's/.*2.6.([0-9]{2}).*/\1/') + sed -r 's/.* 2.6.([0-9]{2}).*/\1/') +else +KVER_MINOR=$($GREP '^# Linux' $CONFIG | \ + sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/') +fi echo -n "File capabilities: " && - [[ ${KVER_MINOR} < 33 ]] && is_enabled CONFIG_SECURITY_FILE_CAPABILITIES || - [[ ${KVER_MINOR} > 32 ]] && $SETCOLOR_SUCCESS && echo -e "enabled" && - $SETCOLOR_NORMAL + ( [[ ${KVER_MAJOR} == 2 && ${KVER_MINOR} < 33 ]] && + is_enabled CONFIG_SECURITY_FILE_CAPABILITIES ) || + ( [[ ( ${KVER_MAJOR} == 2 && ${KVER_MINOR} > 32 ) || + ${KVER_MAJOR} > 2 ]] && $SETCOLOR_SUCCESS && + echo -e "enabled" && $SETCOLOR_NORMAL ) echo echo "Note : Before booting a new kernel, you can check its configuration" -- 1.7.3.4 ++++++ lxc-opensuse-12.1.patch ++++++ --- /var/tmp/diff_new_pack.0xLKO7/_old 2012-01-11 15:38:39.000000000 +0100 +++ /var/tmp/diff_new_pack.0xLKO7/_new 2012-01-11 15:38:39.000000000 +0100 @@ -1,16 +1,18 @@ -From 0619f3b2e1a2d37380c84347ebcf728d05e4915e Mon Sep 17 00:00:00 2001 +From 44ee8a102e3d8052631fbb119f58a55ce678d039 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Tue, 25 Oct 2011 11:25:18 +0200 -Subject: [PATCH] templates: update openSUSE template for openSUSE 12.1 +Subject: [PATCH 1/2] templates: update openSUSE template for openSUSE 12.1 rely on "build" package, to ensure chroot can be created with distribution older than 12.1 + +Signed-off-by: Daniel Lezcano <dlezc...@fr.ibm.com> --- 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 +index 811876a..d30147d 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -25,7 +25,7 @@ @@ -103,8 +105,8 @@ + +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 ++ ++ 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 @@ -135,3 +137,57 @@ -- 1.7.7 + +From 5649fb6c0e372f03621d1fd0f50ecd72fd021563 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat <fcro...@suse.com> +Date: Wed, 4 Jan 2012 15:11:55 +0100 +Subject: [PATCH 2/2] templates: fix openSUSE 12.1 template creation on x86 + platform + +--- + templates/lxc-opensuse.in | 17 +++++++++++++++-- + 1 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in +index d30147d..d62e5f3 100644 +--- a/templates/lxc-opensuse.in ++++ b/templates/lxc-opensuse.in +@@ -156,10 +156,11 @@ download_opensuse() + 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: libbz2-1 libgcc46 libncurses5 pam + Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 + Preinstall: liblzma5 libcap2 libpcre0 + Preinstall: libpopt0 libelf1 liblua5_1 ++Preinstall: netcfg + + RunScripts: aaa_base + +@@ -169,9 +170,21 @@ Support: lxc + Prefer: sysvinit-init + + Ignore: patterns-openSUSE-base:patterns-openSUSE-yast2_install_wf ++Ignore: patterns-openSUSE-base:polkit-defaults-privs ++Ignore: patterns-openSUSE-base:openSUSE-build-key + EOF ++ if [ "$arch" == "i686" ]; then ++ mkdir -p $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/i686/ ++ for i in "$cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/i586/*" ; do ++ ln -s $i $cache/partial-$arch-packages/var/cache/zypp/packages/repo-oss/suse/i686/ ++ done ++ mkdir -p $cache/partial-$arch-packages/var/cache/zypp/packages/update/i686 ++ for i in "$cache/partial-$arch-packages/var/cache/zypp/packages/update/i586/*" ; do ++ ln -s $i $cache/partial-$arch-packages/var/cache/zypp/packages/update/i686/ ++ done ++ fi + +- 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 ++ CLEAN_BUILD=1 BUILD_ARCH="$arch" 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 --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 + chroot $cache/partial-$arch rpm -e patterns-openSUSE-base +-- +1.7.7 + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org