From 610673f5333d5488ad5034057c2f6e9a00fb8499 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 19 Feb 2013 14:26:27 +0000 Subject: [PATCH] integrate-distro.sh: Add support for other versions than 11.4 Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 118 ++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index a36ef1e1..54f8070f 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -3,19 +3,65 @@ # -- defaults # install_dev=/dev/sdb arch=`uname -m` -o_name=suse-11.4 +suse_version=12.2 +o_name=suse-$suse_version cmd=install initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci 8139too sata_nv" -# ata_piix (as opposed to ahci) doesn't seem to support sata-hotplugging -#kernel_version=2.6.37.4 - -kernel_version=2.6.37.6-jng135-default -rpm_kernel_version=2.6.37.6~jng135-4 kernel_flavour=-default -kernel_version=3.2.0 -rpm_kernel_version=3.2.0-1 -kernel_flavour= +case $suse_version in +11.4) + payload_pkgs=" + java-1_6_0-sun.i586 + java-1_6_0-sun-plugin.i586 + + grep + mkinitrd + insserv + cpio + sysconfig + device-mapper + sysvinit + lsof + dhcpcd + kbd + + portmap + xorg-x11-Xnest + xorg-x11-fonts-scalable + xntp + xorg-x11-Xvfb + xorg-x11-fonts-100dpi + xorg-x11-fonts-75dpi + xorg-x11-libxcb + xorg-x11-sdk + xorg-x11-server-glx + xorg-x11-fonts-cyrillic + xorg-x11-fonts-syriac + xorg-x11-man + + jux-run + jux-client-run + feedfsd-run + feedfs-local-run + feedfs-net-run + netscan-run + snmp-manager-run + ftp-server-run + bprof-run + " + + #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= + ;; +12.2) + kernel_version=3.7.8~jng11 + rpm_kernel_version=3.7.8~jng11-1 + ;; +esac umask 0022 @@ -29,9 +75,9 @@ unused_pkgs=" # -- pciutils # used by jux, should be done by grepping /proc-files -# aufs-kmp-default special_pkgs=" aufs + aufs-kmp-default kernel$kernel_flavour-$rpm_kernel_version rpm " @@ -42,30 +88,25 @@ special_pkgs=" payload_pkgs=" + $payload_pkgs kernel memtest86+ - mkinitrd - sysvinit grub syslinux splashy mailx ppp - kbd sensors db-utils - insserv pam_ldap pam_apparmor gnome-keyring-pam - portmap proftpd proftpd-ldap - xntp bind dhcp-server rsyslog @@ -77,43 +118,26 @@ payload_pkgs=" nfs-kernel-server tftp - java-1_6_0-sun.i586 - java-1_6_0-sun-plugin.i586 - unscd nss_ldap fuse mdadm smartmontools - device-mapper insserv suspend - dhcpcd nfs-client openldap2-client samba-client sudo - sysconfig glibc-locale openvpn xorg-x11 xorg-x11-driver-video - xorg-x11-fonts-100dpi - xorg-x11-fonts-75dpi - xorg-x11-fonts-cyrillic - xorg-x11-fonts-scalable - xorg-x11-fonts-syriac xorg-x11-libs - xorg-x11-libxcb - xorg-x11-man - xorg-x11-sdk xorg-x11-server - xorg-x11-server-glx - xorg-x11-Xnest - xorg-x11-Xvfb xorg-x11-Xvnc unclutter @@ -122,17 +146,15 @@ payload_pkgs=" man findutils-locate vim - grep iputils strace - lsof wget lukemftp openssh parted tar zip unzip - rsync cpio + rsync gcc-c++ libtool autoconf automake make cvs @@ -141,16 +163,6 @@ payload_pkgs=" pciutils ytools-run - jux-run - jux-client-run - feedfsd-run - feedfs-local-run - feedfs-net-run - netscan-run - snmp-manager-run - ftp-server-run - bprof-run - " # fetchmsttfonts @@ -372,31 +384,31 @@ unmount_devices() zypper_repos_base() { _cat << EOT | grep -v " #" - |distro-oss ftp://ftp/pub/mirror/suse/distribution/11.4/repo/oss + |distro-oss 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/11.4/repo/non-oss - |update ftp://ftp/pub/mirror/suse/update/11.4 + |distro-non-oss ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss + |update 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/11.4/inst-source - |ftp.jannet.de ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/11.4/inst-source - |ftp.priv.lcl ftp://dspdev:123qweasd@ftp/pub/local/packages/suse/11.4 + |#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 EOT } zypper_repos_special() { _cat << EOT | grep -v "^ *#" - |jengelh ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_11.4 + |jengelh ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version EOT }