File 0003-lxc-opensuse-template-now-understands-rele... of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-lxc-opensuse-template-now-understands-release-argume.patch of Package lxc (Revision 3abfc65eb405655df685429e8821b267)

Currently displaying revision 3abfc65eb405655df685429e8821b267 , Show latest

From 7bb35556f530033092572b9b75e4efe73df96b94 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <git@ojkastl.de>
Date: Thu, 6 Nov 2014 16:11:38 +0100
Subject: [PATCH] lxc-opensuse template now understands release arguments

Signed-off-by: Johannes Kastl <git@ojkastl.de>
---
 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

Places

File 0003-lxc-opensuse-template-now-understands-release-argume.patch of Package lxc (Revision 3abfc65eb405655df685429e8821b267)

Places