Accepting request 719570 from system:install:head
submitted by snwint via jenkins OBS-URL: https://build.opensuse.org/request/show/719570 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=73
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
301d5083a7
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3ced0b8a8b37bab9b944c994b82a4d6177f68df1480fa20e67595f93bf997305
|
||||
size 170768
|
||||
3
installation-images-14.431.tar.xz
Normal file
3
installation-images-14.431.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6c9c0ad0cf0b1d976ad4bdcd65a9bb239ce3f916976fb649b4fdef89f7563dbc
|
||||
size 170884
|
||||
@ -1,3 +1,53 @@
|
||||
--------------------------------------------------------------------
|
||||
Thu Jul 18 14:16:03 UTC 2019 - wfeldt@opensuse.org
|
||||
|
||||
- merge gh#openSUSE/installation-images#326
|
||||
- merge branch master
|
||||
- data/root/etc/xorg.conf.template: disable acceleration for
|
||||
modeset driver
|
||||
- xorg.conf.template: disable acceleration for modeset driver
|
||||
- 14.431
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Thu Jul 18 12:43:21 UTC 2019 - wfeldt@opensuse.org
|
||||
|
||||
- merge gh#openSUSE/installation-images#325
|
||||
- allow explicit setting of product name
|
||||
- 14.430
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 11 10:22:14 UTC 2019 - Steffen Winterfeldt <snwint@suse.com>
|
||||
|
||||
- add 'Conflicts: rescue-server' to skelcd-installer-*
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Thu Jul 11 10:11:11 UTC 2019 - wfeldt@opensuse.org
|
||||
|
||||
- merge gh#openSUSE/installation-images#322
|
||||
- aarch64: fix kernel and initrd location in grub config
|
||||
(bsc#1141038)
|
||||
- 14.429
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 5 10:33:30 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Complete the tftpboot subpackage rename for the Kubic flavor:
|
||||
also rename the directory inside tftpboot-installation, matching
|
||||
the package name.
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Fri Jul 5 08:22:04 UTC 2019 - wfeldt@opensuse.org
|
||||
|
||||
- merge gh#openSUSE/installation-images#320
|
||||
- remove SuSEfirewall2 dependency that was introduced in bnc#887406
|
||||
- 14.428
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 29 13:42:33 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Rename the tftpboot subpackage for Kubic to be kubic relevant,
|
||||
not using the generic MicroOS name.
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Tue May 21 13:50:52 UTC 2019 - wfeldt@opensuse.org
|
||||
|
||||
|
||||
@ -117,6 +117,10 @@ ExclusiveArch: do_not_build
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# === set product string (based on required packages) ===
|
||||
|
||||
%global product_name %(bash %_sourcedir/product_name)
|
||||
|
||||
# === define each theme ===
|
||||
|
||||
%if "%{?theme}" == ""
|
||||
@ -146,6 +150,10 @@ BuildRequires: adobe-sourcesanspro-fonts
|
||||
%define config_bootmenu_no_upgrade 1
|
||||
BuildRequires: openSUSE-MicroOS-release
|
||||
BuildRequires: adobe-sourcesanspro-fonts
|
||||
|
||||
# Kubic is based on MicroOS but we don't want this to show
|
||||
# note: keep this in sync with the Kubic settings in etc/config
|
||||
%global product_name openSUSE-Kubic
|
||||
%endif
|
||||
|
||||
%if "%theme" == "MicroOS"
|
||||
@ -216,9 +224,9 @@ BuildRequires: skelcd-fallbackrepo-CAASP
|
||||
BuildRequires: caasp-release
|
||||
%endif
|
||||
|
||||
# === set product string (based on required packages) ===
|
||||
# === product name with architecture appended ===
|
||||
|
||||
%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
|
||||
%global product_name_arch %product_name-%{_target_cpu}
|
||||
|
||||
# === branding specific packages ===
|
||||
|
||||
@ -255,7 +263,6 @@ BuildRequires: libsmbios_c2
|
||||
BuildRequires: Mesa
|
||||
BuildRequires: Mesa-libEGL1
|
||||
BuildRequires: Mesa-libGL1
|
||||
BuildRequires: SuSEfirewall2
|
||||
BuildRequires: aaa_base
|
||||
BuildRequires: aaa_base-extras
|
||||
BuildRequires: adaptec-firmware
|
||||
@ -322,6 +329,7 @@ BuildRequires: insserv-compat
|
||||
BuildRequires: ipa-gothic-fonts
|
||||
BuildRequires: iproute2
|
||||
BuildRequires: iputils
|
||||
BuildRequires: iptables
|
||||
BuildRequires: iscsiuio
|
||||
BuildRequires: jfsutils
|
||||
BuildRequires: joe
|
||||
@ -591,7 +599,7 @@ ExcludeArch: %arm
|
||||
Summary: Installation Image Files for %theme
|
||||
License: GPL-2.0+
|
||||
Group: Metapackages
|
||||
Version: 14.427
|
||||
Version: 14.431
|
||||
Release: 0
|
||||
Provides: installation-images = %version-%release
|
||||
Conflicts: otherproviders(installation-images)
|
||||
@ -620,13 +628,13 @@ 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}
|
||||
%package -n tftpboot-installation-%{product_name_arch}
|
||||
AutoReqProv: off
|
||||
Summary: tftp installation tree
|
||||
Group: System/Management
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n tftpboot-installation-%{product_name}
|
||||
%description -n tftpboot-installation-%{product_name_arch}
|
||||
This package contains the kernel, initrd and installation images
|
||||
to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
|
||||
|
||||
@ -634,6 +642,7 @@ to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
|
||||
%package -n skelcd-installer-%{theme}
|
||||
Provides: skelcd-installer = %version-%release
|
||||
Conflicts: otherproviders(skelcd-installer)
|
||||
Conflicts: rescue-server
|
||||
AutoReqProv: off
|
||||
Summary: installer and related files needed on dvd1
|
||||
Group: Metapackages
|
||||
@ -646,6 +655,7 @@ needed on the first product dvds to start an installation.
|
||||
%package -n skelcd-installer-net-%{theme}
|
||||
Provides: skelcd-installer = %version-%release
|
||||
Conflicts: otherproviders(skelcd-installer)
|
||||
Conflicts: rescue-server
|
||||
AutoReqProv: off
|
||||
Summary: installer and related files needed on network medium
|
||||
Group: Metapackages
|
||||
@ -674,7 +684,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
|
||||
rm -f /usr/lib/build/checks/04-check-filelist
|
||||
|
||||
%build
|
||||
echo building product "'%product_name'"
|
||||
echo building product "'%product_name_arch'"
|
||||
unset MALLOC_CHECK_
|
||||
BUILD_DISTRIBUTION_NAME="%distribution"
|
||||
export BUILD_DISTRIBUTION_NAME
|
||||
@ -781,7 +791,7 @@ rm -rf %{buildroot}
|
||||
|
||||
%files -n install-initrd-%{theme} -f install-initrd.files
|
||||
|
||||
%files -n tftpboot-installation-%{product_name}
|
||||
%files -n tftpboot-installation-%{product_name_arch}
|
||||
%defattr(-,root,root)
|
||||
%dir %attr(0755,tftp,tftp) /usr/share/tftpboot-installation
|
||||
/usr/share/tftpboot-installation
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user