From 3ea3f80e40014b360ee276d0910af91fde4064ed Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Thu, 27 Mar 2014 09:26:24 +0000
Subject: [PATCH] integrate-distro.sh: Add support for openSUSE 13.1

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

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index f75edab4..fd03f1ca 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -3,16 +3,17 @@
 # -- defaults
 # install_dev=/dev/sdb
 arch=`uname -m`
-suse_version=12.3
+suse_version=13.1
 o_name=suse-$suse_version
 cmd=install
 cwd=`pwd`
 ssh_auth_sock=/tmp/agent-host.sock
 env_ssh_auth_sock=$SSH_AUTH_SOCK
-initrd_modules=" via-rhine r8169 e1000 e1000e b44 myri10ge forcedeth 8139too sata_nv nfs nfs_acl auth_rpcgss nfsv3 nfsv4 fscache lockd sunrpc sis edd sisfb evdev shpchp sis_agp hwmon aufs ahci libahci usbhid hid uhci_hcd ohci_hcd ehci_hcd usbcore hid-generic"
+initrd_modules=" via-rhine r8169 e1000 e1000e b44 myri10ge forcedeth 8139too sata_nv nfs nfs_acl auth_rpcgss nfsv3 nfsv4 fscache lockd sunrpc sis edd sisfb evdev shpchp sis_agp hwmon ahci libahci usbhid hid uhci_hcd ohci_hcd ehci_hcd usbcore hid-generic"
 config_script=
 
-kernel_flavour=-desktop
+#kernel_flavour=-desktop
+kernel_flavour=
 
 case $suse_version in
 11.4)
@@ -30,6 +31,8 @@ case $suse_version in
 		lsof
 		dhcpcd
 		kbd
+		db-utils
+		insserv
 
 		unscd
 		portmap
@@ -57,15 +60,24 @@ case $suse_version in
 		bprof-run
 	"
 
+	special_pkgs="
+		aufs
+		aufs-kmp$kernel_flavour
+	"
 	#kernel_version=3.7.8~jng11
 	#rpm_kernel_version=3.7.8~jng11-1
-	kernel_version=3.2.0
-	rpm_kernel_version=3.2.0-1
-	kernel_flavour=
+	#kernel_version=3.2.0
+	#rpm_kernel_version=3.2.0-1
 	;;
 12.2)
 	payload_pkgs="
 		unscd
+		db-utils
+		insserv
+	"
+	special_pkgs="
+		aufs
+		aufs-kmp$kernel_flavour
 	"
 	kernel_version=3.7.8-jng11$kernel_flavour
 	rpm_kernel_version=3.7.8~jng11-1
@@ -78,6 +90,74 @@ case $suse_version in
 	payload_pkgs="
 		nscd
 		usbutils
+		db-utils
+		insserv
+	"
+
+	special_pkgs="
+		jux-run
+		jux-client-run
+		feedfsd-run
+		feedfs-local-run
+		feedfs-net-run
+		netscan-run
+		snmp-manager-run
+		ftp-server-run
+		bprof-run
+		aufs
+		aufs-kmp$kernel_flavour
+	"
+	# 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=3.9.9-jng20-1.1$kernel_flavour
+	rpm_kernel_version=3.9.9~jng20-1.1
+
+	kernel_version=3.7.10-jng12$kernel_flavour
+	rpm_kernel_version=3.7.10~jng12-1
+
+	#kernel_version=3.9.9-jng20-1.2$kernel_flavour
+	kernel_version=3.9.9-jng20$kernel_flavour
+	rpm_kernel_version=3.9.9~jng20-1.2
+	;;
+13.1)
+	base_pkgs="
+		aaa_base
+		module-init-tools
+	"
+
+	payload_pkgs="
+		nscd
+		sssd
+		usbutils
+		aufs-util
+		db48-utils
 	"
 
 	special_pkgs="
@@ -120,15 +200,8 @@ case $suse_version in
 		uuid-devel
 	"
 
-	kernel_version=3.9.9-jng20-1.1$kernel_flavour
-	rpm_kernel_version=3.9.9~jng20-1.1
-
-	kernel_version=3.7.10-jng12$kernel_flavour
-	rpm_kernel_version=3.7.10~jng12-1
-
-	#kernel_version=3.9.9-jng20-1.2$kernel_flavour
-	kernel_version=3.9.9-jng20$kernel_flavour
-	rpm_kernel_version=3.9.9~jng20-1.2
+	kernel_version=3.12.7-jux+
+	rpm_kernel_version=3.12.7-jux+
 	;;
 esac
 
@@ -156,8 +229,6 @@ update_pkgs="
 # used by jux, should be done by grepping /proc-files
 special_pkgs="
 	$special_pkgs
-	aufs
-	aufs-kmp$kernel_flavour
 	kernel$kernel_flavour-$rpm_kernel_version
 	rpm
 "
@@ -179,8 +250,6 @@ payload_pkgs="
 
 	sensors
 
-	db-utils
-
 	pam_ldap
 	pam_apparmor
 	gnome-keyring-pam
@@ -203,7 +272,6 @@ payload_pkgs="
 	fuse
 	mdadm
 	smartmontools
-	insserv
 	suspend
 
 	nfs-client