From ab89d1b77665edf3b892a052625b57579c9188bb Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sat, 19 Nov 2016 22:58:39 +0100 Subject: [PATCH 1/2] Updated to OpenSUSE Leap 42.2 Signed-off-by: Rickard von Essen --- .../autoinst.xml | 2 +- ..._64.json => opensuse-leap-42.2-x86_64.json | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) rename http/{opensuse-leap-42.1 => opensuse-leap-42.2}/autoinst.xml (99%) rename opensuse-leap-42.1-x86_64.json => opensuse-leap-42.2-x86_64.json (87%) diff --git a/http/opensuse-leap-42.1/autoinst.xml b/http/opensuse-leap-42.2/autoinst.xml similarity index 99% rename from http/opensuse-leap-42.1/autoinst.xml rename to http/opensuse-leap-42.2/autoinst.xml index 3b5619238..8bf0c563e 100644 --- a/http/opensuse-leap-42.1/autoinst.xml +++ b/http/opensuse-leap-42.2/autoinst.xml @@ -108,7 +108,7 @@ true true vagrantup.com - opensuse-leap-42.1-x64 + opensuse-leap-42.2-x64 diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.2-x86_64.json similarity index 87% rename from opensuse-leap-42.1-x86_64.json rename to opensuse-leap-42.2-x86_64.json index ffa76abb4..85c9e9fbe 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -4,7 +4,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", " textmode=1", "" ], @@ -46,7 +46,7 @@ "boot_command": [ "", "linux netsetup=dhcp install=cd:/", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", " textmode=1", "" ], @@ -77,7 +77,7 @@ "boot_command": [ "", "linux netsetup=dhcp netdevice=eth0 install=cd:/", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", " textmode=1", "" ], @@ -117,7 +117,7 @@ "boot_command": [ "", "linux netsetup=dhcp netdevice=eth0 install=cd:/", - " lang=en_US.UTF-8 autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", + " lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}", " textmode=1", "" ], @@ -168,16 +168,15 @@ "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh", - "scripts/common/minimize.sh" + "scripts/opensuse/cleanup.sh" ], "type": "shell" } ], "variables": { "arch": "64", - "autoinst_cfg": "opensuse-leap-42.1/autoinst.xml", - "box_basename": "opensuse-leap-42.1", + "autoinst_cfg": "opensuse-leap-42.2/autoinst.xml", + "box_basename": "opensuse-leap-42.2", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "20480", @@ -185,16 +184,16 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "8576e84822cdbe566bf551e28a169fc028229831eba9f07a4c1f84302c5ddb09", + "iso_checksum": "ba5af6b0ac4d42d801de642304eb88ca9fd65a61b6c3ff25724182494f288f00", "iso_checksum_type": "sha256", - "iso_name": "openSUSE-Leap-42.1-DVD-x86_64.iso", + "iso_name": "openSUSE-Leap-42.2-DVD-x86_64.iso", "memory": "768", "metadata": "floppy/dummy_metadata.json", "mirror": "http://suse.mobile-central.org/distribution", - "mirror_directory": "leap/42.1/iso", - "name": "opensuse-leap-42.1", + "mirror_directory": "leap/42.2/iso", + "name": "opensuse-leap-42.2", "no_proxy": "{{env `no_proxy`}}", - "template": "opensuse-leap-42.1-x86_64", + "template": "opensuse-leap-42.2-x86_64", "version": "2.0.TIMESTAMP" } } From 889d8ccc2263b87ba0eb72e12a59cb1701f805ef Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sun, 20 Nov 2016 11:39:59 +0100 Subject: [PATCH 2/2] Adjusted OpenSUSE cleanup script Signed-off-by: Rickard von Essen --- opensuse-leap-42.2-x86_64.json | 3 ++- scripts/opensuse/cleanup.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/opensuse-leap-42.2-x86_64.json b/opensuse-leap-42.2-x86_64.json index 85c9e9fbe..11437d34c 100644 --- a/opensuse-leap-42.2-x86_64.json +++ b/opensuse-leap-42.2-x86_64.json @@ -168,7 +168,8 @@ "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", - "scripts/opensuse/cleanup.sh" + "scripts/opensuse/cleanup.sh", + "scripts/common/minimize.sh" ], "type": "shell" } diff --git a/scripts/opensuse/cleanup.sh b/scripts/opensuse/cleanup.sh index f83c0b645..6d57712bd 100644 --- a/scripts/opensuse/cleanup.sh +++ b/scripts/opensuse/cleanup.sh @@ -1,3 +1,12 @@ #!/bin/bash -eux # These were only needed for building VMware/Virtualbox extensions: -zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel + +version=`grep VERSION= /etc/os-release | cut -f2 -d\" | cut -f1 -d\ ` + +if [[ $version =~ "13" ]]; then + zypper -n rm -u binutils gcc make perl ruby kernel-default-devel kernel-devel +fi + +if [[ $version =~ "4" ]]; then + zypper -n rm -u gcc make kernel-default-devel kernel-devel +fi