From 504fc65f47096d9031c9eb2e1e553798f5ebe9c4 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 17 Sep 2016 06:26:59 +0000
Subject: [PATCH] integrate-distro.sh: Started to add support for tumbleweed

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/integrate-distro.sh | 100 ++++++++++++++++++++++++++++++------
 1 file changed, 85 insertions(+), 15 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 3bedc03f..a96bc19e 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -3,7 +3,7 @@
 # -- defaults
 # install_dev=/dev/sdb
 arch=`uname -m`
-suse_version=13.1
+suse_version=tumbleweed
 o_name=suse-$suse_version
 cmd=install
 cwd=`pwd`
@@ -17,7 +17,11 @@ kernel_flavour=
 
 case $suse_version in
 11.4)
+	base_pkgs="
+		sysvinit
+	"
 	payload_pkgs="
+		suspend
 		java-1_6_0-sun.i586
 		java-1_6_0-sun-plugin.i586
 
@@ -70,7 +74,11 @@ case $suse_version in
 	#rpm_kernel_version=3.2.0-1
 	;;
 12.2)
+	base_pkgs="
+		sysvinit
+	"
 	payload_pkgs="
+		suspend
 		unscd
 		db-utils
 		insserv
@@ -85,9 +93,11 @@ case $suse_version in
 12.3)
 	base_pkgs="
 		module-init-tools
+		sysvinit
 	"
 
 	payload_pkgs="
+		suspend
 		nscd
 		usbutils
 		db-utils
@@ -150,9 +160,11 @@ case $suse_version in
 	base_pkgs="
 		aaa_base
 		module-init-tools
+		sysvinit
 	"
 
 	payload_pkgs="
+		suspend
 		nscd
 		sssd
 		usbutils
@@ -206,6 +218,66 @@ case $suse_version in
 	kernel_version=3.12.7-jux+
 	rpm_kernel_version=3.12.7-jux+
 	;;
+tumbleweed)
+	base_pkgs="
+		aaa_base
+		module-init-tools
+	"
+
+	payload_pkgs="
+		nscd
+		sssd
+		usbutils
+		aufs-util
+		db48-utils
+		psmisc
+		ntp
+		acpid
+	"
+	special_pkgs="
+		jux-run-1.2.2-119p02
+		jux-client-run
+		feedfsd-run
+		feedfs-local-run
+		feedfs-net-run
+		netscan-run
+		snmp-manager-run
+		ftp-server-run
+		bprof-run
+	"
+
+	# currently unused variable
+	devel_pkgs="
+		ant
+		alsa-devel
+		apache-commons-logging
+		boost-devel
+		createrepo
+		curl-devel
+		ffmpeg-devel
+		fuse-devel
+		glib2-devel
+		glu-devel
+		jakarta-commons-logging
+		java-1_7_0-openjdk-devel
+		libXv-devel
+		libXxf86vm-devel
+		libasound2
+		libcap-devel
+		libffmpeg-devel
+		libsamplerate-devel
+		libsndfile-devel
+		log4j
+		nasm
+		net-snmp
+		openldap2-devel
+		rpmbuild
+		uuid-devel
+	"
+
+	kernel_version=4.8.0_rc6_jux+-1
+	rpm_kernel_version=4.8.0_rc6_jux+-1
+	;;
 esac
 
 umask 0022
@@ -221,7 +293,6 @@ unused_pkgs="
 base_pkgs="
 	$base_pkgs
 	coreutils
-	sysvinit
 "
 
 update_pkgs="
@@ -275,7 +346,6 @@ payload_pkgs="
 	fuse
 	mdadm
 	smartmontools
-	suspend
 
 	nfs-client
 	openldap2-client
@@ -600,32 +670,32 @@ unmount_devices()
 zypper_repos_base()
 {
 	_cat << EOT | grep -v "	#"
-	|distro-oss     ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/oss
+	|distro-oss       0 ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/oss
 EOT
 }
 
 zypper_repos_update()
 {
 	_cat << EOT | grep -v "^ *#"
-	|distro-non-oss ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss
-	|update         ftp://ftp/pub/mirror/suse/update/$suse_version
+	|#distro-non-oss  0 ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss
+	|#update          0 ftp://ftp/pub/mirror/suse/update/$suse_version
 EOT
 }
 
 zypper_repos_payload()
 {
 	_cat << EOT | grep -v "^ *#"
-	|#ftp.jannet.de  ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source
-        |ftp.jannet.de  ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source
-	|ftp.priv.lcl   ftp://dspdev:123qweasd@ftp/pub/local/packages/suse/$suse_version
+	|#ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source
+        |ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source
+	|ftp.priv.lcl     5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version
 EOT
 }
 
 zypper_repos_special()
 {
 	_cat << EOT | grep -v "^ *#"
-	|jengelh        ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
-	|videolan       ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$suse_version
+	|jengelh          0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
+	|videolan         0 ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$suse_version
 EOT
 }
 
@@ -639,9 +709,9 @@ zypper_repos()
 
 setup_zypper_repos()
 {
-	local name uri
-	zypper_repos $@ | while read name uri; do
-		run_chroot zypper $zypper_global_opts ar $uri $name
+	local name prio uri
+	zypper_repos $@ | while read name prio uri; do
+		run_chroot zypper $zypper_global_opts ar -p $prio $uri $name
 	done
 }
 
@@ -649,7 +719,7 @@ host_zypper()
 {
 	local repos="$1"
 	shift
-	local distros=`zypper_repos $repos | awk '{print "--plus-repo " $2 }'`
+	local distros=`zypper_repos $repos | awk '{print "--plus-repo " $3 }'`
 	run -e zypper $zypper_global_opts --root $root $distros $@
 }