From bcc09b35acda45bbb34325462a6badb5f450e403684a04754bc569f62f443806 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 30 Jan 2017 13:30:39 +0000 Subject: [PATCH 1/3] - release 14.297 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=972 --- installation-images-14.296.tar.xz | 3 --- installation-images-14.297.tar.xz | 3 +++ installation-images.changes | 19 +++++++++++++++++++ installation-images.spec | 4 ++-- 4 files changed, 24 insertions(+), 5 deletions(-) delete mode 100644 installation-images-14.296.tar.xz create mode 100644 installation-images-14.297.tar.xz diff --git a/installation-images-14.296.tar.xz b/installation-images-14.296.tar.xz deleted file mode 100644 index 6198947..0000000 --- a/installation-images-14.296.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b784449fa7293eb6d8374d3605893ba0301f182246fa84f1235f4056d19230b -size 168620 diff --git a/installation-images-14.297.tar.xz b/installation-images-14.297.tar.xz new file mode 100644 index 0000000..37f89c0 --- /dev/null +++ b/installation-images-14.297.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06db985c58948538637235bee53555bf8536d7b427f7ccabcde40c42cd4b4851 +size 169956 diff --git a/installation-images.changes b/installation-images.changes index 123305c..ebbfd24 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jan 30 13:49:02 UTC 2017 - snwint@suse.com + +- move grub file into x86_64-efi subdir to avoid issues mentioned in bsc#1022294 +- copy tftp files into final position +- use cracklib-dict-full instead of cracklib-dict-small +- readme for x86_64 +- generic readme for all architectures +- pxelinux startup message +- basic pxelinux config +- basic tftp grub2 config +- build tftp directory +- include sha256 sums of image files in initrd +- load control.xml from instsys location +- add tftp Makefile target +- add some more config settings to $ConfigData +- don't add package list if it's empty +- 14.297 + ------------------------------------------------------------------- Thu Jan 19 11:28:37 UTC 2017 - snwint@suse.com diff --git a/installation-images.spec b/installation-images.spec index 9220e33..b8a9cd6 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -1,7 +1,7 @@ # # spec file for package installation-images # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -415,7 +415,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.296 +Version: 14.297 Release: 0 Provides: installation-images-%theme = %version-%release Source: %{name}-%{version}.tar.xz From aa7add5c588451349f0fb93bdebc6ca79e84fb89a444ccacbdbbcf7dd8951507 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 30 Jan 2017 13:32:31 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=973 --- installation-images.spec | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index b8a9cd6..8784872 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -1,7 +1,7 @@ # # spec file for package installation-images # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ # === sort out branding === %if 0%{?is_opensuse} %define theme openSUSE +%define product_name %{theme}-%{_target_cpu} %define branding_skelcd openSUSE %define branding_systemd openSUSE %define branding_plymouth openSUSE @@ -39,6 +40,7 @@ BuildRequires: xf86-input-libinput %else %if 0%{?is_susecaasp} %define theme CAASP +%define product_name %{theme}-%{_target_cpu} %define branding_skelcd CASP %define branding_systemd CAASP %define branding_plymouth SLE @@ -49,6 +51,7 @@ BuildRequires: caasp-release BuildRequires: caasp-release-DVD %else %define theme SLES +%define product_name %{theme}-%{_target_cpu} %define branding_skelcd SLES %define branding_systemd SLE %define branding_plymouth SLE @@ -56,6 +59,7 @@ BuildRequires: caasp-release-DVD %define branding_gfxboot SLE BuildRequires: sle12-desktop-migration BuildRequires: sles-release +BuildRequires: sles-release-DVD %ifarch x86_64 ppc64le BuildRequires: sap-installation-wizard %endif @@ -94,6 +98,7 @@ BuildRequires: adaptec-firmware BuildRequires: alsa BuildRequires: alsa-utils BuildRequires: arabic-kacst-fonts +BuildRequires: arphic-uming-fonts BuildRequires: audit-libs BuildRequires: bc BuildRequires: bind-libs @@ -108,7 +113,7 @@ BuildRequires: cairo BuildRequires: checkmedia BuildRequires: cifs-utils BuildRequires: cracklib -BuildRequires: cracklib-dict-small +BuildRequires: cracklib-dict-full BuildRequires: cron BuildRequires: cryptsetup BuildRequires: cups-libs @@ -149,6 +154,7 @@ BuildRequires: icewm-lite BuildRequires: icmpinfo BuildRequires: indic-fonts BuildRequires: initviocons +BuildRequires: ipa-gothic-fonts BuildRequires: iproute2 BuildRequires: iputils BuildRequires: iscsiuio @@ -264,6 +270,7 @@ BuildRequires: telnet BuildRequires: telnet-server BuildRequires: termcap BuildRequires: terminfo +BuildRequires: un-fonts BuildRequires: usbutils BuildRequires: util-linux BuildRequires: util-linux-systemd @@ -440,6 +447,18 @@ You can create an initrd for %theme installation. Useful, for example, to set up a UML or XEN environment. +%package -n tftpboot-installation-%{product_name} +AutoReqProv: off +Summary: tftp installation tree +Group: System/Management +BuildArch: noarch +PreReq: /bin/ln + +%description -n tftpboot-installation-%{product_name} +This package contains the kernel, initrd and installation images +to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64. + + %package -n installation-images-debuginfodeps Provides: installation-images-debuginfodeps-%theme = %version-%release Obsoletes: installation-images-debuginfodeps-%theme < %version-%release @@ -533,6 +552,9 @@ rm -rf %{buildroot} %files -n install-initrd -f install-initrd.files +%files -n tftpboot-installation-%{product_name} +/srv/tftp + %files -n installation-images-debuginfodeps %defattr(-,root,root) /usr/share/debuginfodeps From 733b197f8a74fd9b6650a54aa4ed57b304d3ca67c7f80b7aeecffe70ea600f69 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 30 Jan 2017 13:35:42 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=974 --- installation-images.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/installation-images.spec b/installation-images.spec index 8784872..a919b94 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -36,7 +36,9 @@ %define branding_grub2 openSUSE %define branding_gfxboot openSUSE BuildRequires: openSUSE-release +%ifnarch s390x BuildRequires: xf86-input-libinput +%endif %else %if 0%{?is_susecaasp} %define theme CAASP