Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2019-07-31 14:26:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Jul 31 14:26:16 2019 rev:73 rq:719570 version:14.431
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2019-05-22 10:52:04.191302368 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.4126/installation-images.changes
2019-07-31 14:26:19.118271626 +0200
@@ -1,0 +2,50 @@
+Thu Jul 18 14:16:03 UTC 2019 - [email protected]
+
+- 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 - [email protected]
+
+- merge gh#openSUSE/installation-images#325
+- allow explicit setting of product name
+- 14.430
+
+-------------------------------------------------------------------
+Thu Jul 11 10:22:14 UTC 2019 - Steffen Winterfeldt <[email protected]>
+
+- add 'Conflicts: rescue-server' to skelcd-installer-*
+
+--------------------------------------------------------------------
+Thu Jul 11 10:11:11 UTC 2019 - [email protected]
+
+- 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 <[email protected]>
+
+- 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 - [email protected]
+
+- 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 <[email protected]>
+
+- Rename the tftpboot subpackage for Kubic to be kubic relevant,
+ not using the generic MicroOS name.
+
+--------------------------------------------------------------------
Old:
----
installation-images-14.427.tar.xz
New:
----
installation-images-14.431.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.DjBOfX/_old 2019-07-31 14:26:19.666271203 +0200
+++ /var/tmp/diff_new_pack.DjBOfX/_new 2019-07-31 14:26:19.666271203 +0200
@@ -117,6 +117,10 @@
%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 @@
%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: 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: Mesa
BuildRequires: Mesa-libEGL1
BuildRequires: Mesa-libGL1
-BuildRequires: SuSEfirewall2
BuildRequires: aaa_base
BuildRequires: aaa_base-extras
BuildRequires: adaptec-firmware
@@ -322,6 +329,7 @@
BuildRequires: ipa-gothic-fonts
BuildRequires: iproute2
BuildRequires: iputils
+BuildRequires: iptables
BuildRequires: iscsiuio
BuildRequires: jfsutils
BuildRequires: joe
@@ -591,7 +599,7 @@
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 @@
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 @@
%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 @@
%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 @@
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 @@
%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
++++++ installation-images-14.427.tar.xz -> installation-images-14.431.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.427/VERSION
new/installation-images-14.431/VERSION
--- old/installation-images-14.427/VERSION 2019-05-21 15:50:52.000000000
+0200
+++ new/installation-images-14.431/VERSION 2019-07-18 16:16:03.000000000
+0200
@@ -1 +1 @@
-14.427
+14.431
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.427/changelog
new/installation-images-14.431/changelog
--- old/installation-images-14.427/changelog 2019-05-21 15:50:52.000000000
+0200
+++ new/installation-images-14.431/changelog 2019-07-18 16:16:03.000000000
+0200
@@ -1,3 +1,23 @@
+2019-07-18: 14.431
+ - 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
+
+2019-07-18: 14.430
+ - merge gh#openSUSE/installation-images#325
+ - allow explicit setting of product name
+
+2019-07-11: 14.429
+ - merge gh#openSUSE/installation-images#322
+ - aarch64: fix kernel and initrd location in grub config
+ (bsc#1141038)
+
+2019-07-05: 14.428
+ - merge gh#openSUSE/installation-images#320
+ - remove SuSEfirewall2 dependency that was introduced in bnc#887406
+
2019-05-21: 14.427
- merge gh#openSUSE/installation-images#314
- set root password for rescue system explicitly (bsc#1134524)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.427/data/boot/grub-aarch64.cfg
new/installation-images-14.431/data/boot/grub-aarch64.cfg
--- old/installation-images-14.427/data/boot/grub-aarch64.cfg 2019-05-21
15:50:52.000000000 +0200
+++ new/installation-images-14.431/data/boot/grub-aarch64.cfg 2019-07-18
16:16:03.000000000 +0200
@@ -68,9 +68,9 @@
menuentry 'Boot Linux System' --class opensuse --class gnu-linux --class gnu
{
set gfxpayload=keep
echo 'Loading kernel ...'
- linux /boot/aarch64/loader/linux splash=silent systemboot=1
+ linux /boot/aarch64/linux splash=silent systemboot=1
echo 'Loading initial ramdisk ...'
- initrd /boot/aarch64/loader/initrd
+ initrd /boot/aarch64/initrd
}
menuentry 'Check Installation Media' --class opensuse --class gnu-linux
--class gnu {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.427/data/root/etc/xorg.conf.template
new/installation-images-14.431/data/root/etc/xorg.conf.template
--- old/installation-images-14.427/data/root/etc/xorg.conf.template
2019-05-21 15:50:52.000000000 +0200
+++ new/installation-images-14.431/data/root/etc/xorg.conf.template
2019-07-18 16:16:03.000000000 +0200
@@ -24,6 +24,7 @@
Identifier "modesetting"
Driver "modesetting"
Option "PreferCloneMode" "true"
+ Option "AccelMethod" "none"
EndSection
Section "Screen"
Identifier "modesetting"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.427/data/root/root.file_list
new/installation-images-14.431/data/root/root.file_list
--- old/installation-images-14.427/data/root/root.file_list 2019-05-21
15:50:52.000000000 +0200
+++ new/installation-images-14.431/data/root/root.file_list 2019-07-18
16:16:03.000000000 +0200
@@ -306,12 +306,6 @@
# hack to make 'repair' option work
# p repair.diff
-# bnc#887406 SuSEfirewall2 configuration needed for AutoYast export
-# both in installation proposal and at the end of installation
-SuSEfirewall2:
- d /etc/sysconfig/SuSEfirewall2.d/services/
- /etc/sysconfig/SuSEfirewall2
-
if arch eq 'ppc' || arch eq 'ppc64'
pdisk:
/sbin/pdisk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.427/etc/config
new/installation-images-14.431/etc/config
--- old/installation-images-14.427/etc/config 2019-05-21 15:50:52.000000000
+0200
+++ new/installation-images-14.431/etc/config 2019-07-18 16:16:03.000000000
+0200
@@ -142,6 +142,7 @@
grub2 = openSUSE
plymouth = openSUSE
systemd = MicroOS
+product_name = openSUSE-Kubic
[Theme MicroOS]
image = 350
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.427/lib/ReadConfig.pm
new/installation-images-14.431/lib/ReadConfig.pm
--- old/installation-images-14.427/lib/ReadConfig.pm 2019-05-21
15:50:52.000000000 +0200
+++ new/installation-images-14.431/lib/ReadConfig.pm 2019-07-18
16:16:03.000000000 +0200
@@ -1329,7 +1329,7 @@
$ConfigData{product_name} = $ConfigData{os}{product_mini} || "openSUSE";
($ConfigData{product_name_nospaces} = $ConfigData{product_name}) =~
s/\s+/-/g;
- ($ConfigData{product_short} = $ConfigData{os}{product_short} || "SUSE") =~
s/\s+/-/g;
+ ($ConfigData{product_short} = $ConfigData{product_name_theme} ||
$ConfigData{os}{product_short} || "SUSE") =~ s/\s+/-/g;
$ConfigData{update_dir} = $ConfigData{os}{update};
$ConfigData{load_image} = $load_image;
