Hello community,
here is the log from the commit of package lxc for openSUSE:Factory checked in at 2014-12-01 14:01:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxc (Old)
and /work/SRC/openSUSE:Factory/.lxc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2014-11-20 18:43:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2014-12-01 14:02:05.000000000 +0100
@@ -1,0 +2,13 @@
+Sat Nov 29 20:28:21 UTC 2014 - opensuse_buildservice@ojkastl.de
+
+- changed patch 0002 to work on newer Tumbleweed snapshots, where os-release does not contain 'Harlequin' anymore
+
+-------------------------------------------------------------------
+Wed Nov 26 20:39:13 UTC 2014 - opensuse_buildservice@ojkastl.de
+
+- backported the patches from upstream, so that the opensuse template now accepts releases as arguments, and it is possible to install 12.3, 13.1 or 13.2
+ * 0003-lxc-opensuse-template-now-understands-release-argume.patch
+ * 0004-lxc-opensuse.in-Added-explanation-on-how-to-use-the-.patch
+ * 0005-lxc-opensuse.in-Check-if-given-argument-is-a-valid-r.patch
+
+-------------------------------------------------------------------
New:
----
0003-lxc-opensuse-template-now-understands-release-argume.patch
0004-lxc-opensuse.in-Added-explanation-on-how-to-use-the-.patch
0005-lxc-opensuse.in-Check-if-given-argument-is-a-valid-r.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxc.spec ++++++
--- /var/tmp/diff_new_pack.KIrcQk/_old 2014-12-01 14:02:06.000000000 +0100
+++ /var/tmp/diff_new_pack.KIrcQk/_new 2014-12-01 14:02:06.000000000 +0100
@@ -28,6 +28,9 @@
Source2: lxc-createconfig.in
Patch1: 0001-added-upstream-action-fallback-create-directory-loca.patch
Patch2: 0002-Disable-building-opensuse-containers-on-openSUSE13.2.patch
+Patch4: 0003-lxc-opensuse-template-now-understands-release-argume.patch
+Patch3: 0004-lxc-opensuse.in-Added-explanation-on-how-to-use-the-.patch
+Patch5: 0005-lxc-opensuse.in-Check-if-given-argument-is-a-valid-r.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,6 +81,9 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
chmod 755 configure
++++++ 0001-added-upstream-action-fallback-create-directory-loca.patch ++++++
--- /var/tmp/diff_new_pack.KIrcQk/_old 2014-12-01 14:02:06.000000000 +0100
+++ /var/tmp/diff_new_pack.KIrcQk/_new 2014-12-01 14:02:06.000000000 +0100
@@ -1,19 +1,20 @@
-From f420d885feb1ef84e52cd6bdaccfc63741e19bf8 Mon Sep 17 00:00:00 2001
+From b6ca9c44b351bde22f9503fe1b5200a9eac6a01e Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Mon, 27 Oct 2014 20:59:47 +0100
Subject: [PATCH] added upstream action fallback; create directory
"$localstatedir"/lock/subsys/ when necessary
Signed-off-by: Johannes Kastl
+Signed-off-by: Johannes Kastl
---
- config/init/sysvinit/lxc.in | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ config/init/sysvinit/lxc.in | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in
-index 19c102e..291fa7b 100644
+index 19c102e..6eaf47b 100644
--- a/config/init/sysvinit/lxc.in
+++ b/config/init/sysvinit/lxc.in
-@@ -42,10 +42,24 @@ OPTIONS=
+@@ -45,10 +45,24 @@ STOPOPTS="-a -s"
test ! -r "$sysconfdir"/rc.d/init.d/functions ||
. "$sysconfdir"/rc.d/init.d/functions
@@ -39,5 +40,5 @@
[ -x "$bindir"/lxc-autostart ] || exit 1
--
-2.1.2
+2.1.3
++++++ 0002-Disable-building-opensuse-containers-on-openSUSE13.2.patch ++++++
--- /var/tmp/diff_new_pack.KIrcQk/_old 2014-12-01 14:02:06.000000000 +0100
+++ /var/tmp/diff_new_pack.KIrcQk/_new 2014-12-01 14:02:06.000000000 +0100
@@ -1,8 +1,8 @@
-From 777d55ae5258c99c9fd2a8740fac8ce4d0b02ec8 Mon Sep 17 00:00:00 2001
+From 0ece372b9c6050aff0da41e4a8a264fe3a679aed Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Wed, 19 Nov 2014 11:05:15 +0100
-Subject: [PATCH] Disable building opensuse containers on openSUSE 13.2 due to
- changed build behaviour
+Subject: [PATCH] Disable building opensuse containers on openSUSE 13.2 or
+ Tumbleweed due to changed build behaviour
Signed-off-by: Johannes Kastl
---
@@ -10,7 +10,7 @@
1 file changed, 6 insertions(+)
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
-index 3999df6..ee7233b 100644
+index 3999df6..decf8c5 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -10,6 +10,7 @@
@@ -25,7 +25,7 @@
exit 1
fi
-+if grep -q Harlequin /etc/os-release ; then
++if grep -q Harlequin /etc/os-release || grep -q Tumbleweed /etc/os-release; then
+ echo "Building containers on openSUSE 13.2 or Tumbleweed is broken at the moment. We are working on this problem."
+ exit 1
+fi
++++++ 0003-lxc-opensuse-template-now-understands-release-argume.patch ++++++
From 7bb35556f530033092572b9b75e4efe73df96b94 Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Thu, 6 Nov 2014 16:11:38 +0100
Subject: [PATCH] lxc-opensuse template now understands release arguments
Signed-off-by: Johannes Kastl
---
templates/lxc-opensuse.in | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index decf8c5..3f71ced 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -39,8 +39,6 @@ done
# Make sure the usual locations are in PATH
export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
-DISTRO=12.3
-
configure_opensuse()
{
rootfs=$1
@@ -164,6 +162,12 @@ Support: pwdutils rpcbind sysconfig
Ignore: rpm:suse-build-key,build-key
Ignore: systemd:systemd-presets-branding
EOF
+
+ if [ $DISTRO = "13.2" ]
+ then
+ echo "Support: python3-base" >> $cache/partial-$arch-packages/opensuse.conf
+ fi
+
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
@@ -175,6 +179,9 @@ EOF
done
fi
+ # openSUSE 13.2 has no noarch directory in update
+ [ -d $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch ] || mkdir -p $cache/partial-$arch-packages/var/cache/zypp/packages/update/noarch
+
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
@@ -219,7 +226,7 @@ copy_opensuse()
install_opensuse()
{
- cache="@LOCALSTATEDIR@/cache/lxc/opensuse"
+ cache="@LOCALSTATEDIR@/cache/lxc/opensuse/$DISTRO"
rootfs=$1
mkdir -p @LOCALSTATEDIR@/lock/subsys/
(
@@ -359,7 +366,7 @@ EOF
return 0
}
-options=$(getopt -o hp:n:c -l help,rootfs:,path:,name:,clean -- "$@")
+options=$(getopt -o hp:n:r:c -l help,rootfs:,path:,name:,release:,clean -- "$@")
if [ $? -ne 0 ]; then
usage $(basename $0)
exit 1
@@ -373,6 +380,7 @@ do
-p|--path) path=$2; shift 2;;
--rootfs) rootfs=$2; shift 2;;
-n|--name) name=$2; shift 2;;
+ -r|--release) DISTRO=$2; shift 2;;
-c|--clean) clean=$2; shift 2;;
--) shift 1; break ;;
*) break ;;
@@ -400,6 +408,12 @@ if grep -q Harlequin /etc/os-release || grep -q Tumbleweed /etc/os-release; then
exit 1
fi
+if [ -z "$DISTRO" ]; then
+ echo "No release selected, using openSUSE 12.3"
+ DISTRO=12.3
+fi
+
+
if [ "$(id -u)" != "0" ]; then
echo "This script should be run as 'root'"
exit 1
--
2.1.3
++++++ 0004-lxc-opensuse.in-Added-explanation-on-how-to-use-the-.patch ++++++
From 805826fa5cc282b29289e713fd08554dc36b52f2 Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Wed, 26 Nov 2014 21:33:16 +0100
Subject: [PATCH] lxc-opensuse.in: Added explanation on how to use the template
Signed-off-by: Johannes Kastl
---
templates/lxc-opensuse.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index 3f71ced..e9822b1 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -361,7 +361,9 @@ clean()
usage()
{
cat <
From e1a01d5e7765af21ef26826abd934daddd5a0f42 Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Wed, 26 Nov 2014 21:00:35 +0100
Subject: [PATCH] lxc-opensuse.in: Check if given argument is a valid release
Signed-off-by: Johannes Kastl
---
templates/lxc-opensuse.in | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index e9822b1..d42b75e 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -411,8 +411,29 @@ if grep -q Harlequin /etc/os-release || grep -q Tumbleweed /etc/os-release; then
fi
if [ -z "$DISTRO" ]; then
+ echo ""
echo "No release selected, using openSUSE 12.3"
DISTRO=12.3
+else
+ echo ""
+ case "$DISTRO" in
+ 12.3)
+ echo "Selected openSUSE 12.3"
+ ;;
+
+ 13.1)
+ echo "Selected openSUSE 13.1"
+ ;;
+
+ 13.2)
+ echo "Selected openSUSE 13.2"
+ ;;
+
+ *)
+ echo "You have chosen an invalid release, quitting..."
+ exit 1
+ ;;
+ esac
fi
--
2.1.3
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org