Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2020-08-14 13:10:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Fri Aug 14 13:10:31 2020 rev:110 rq:826610 version:16.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2020-08-06 10:38:32.202012350 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.3399/installation-images.changes
2020-08-14 13:10:39.601240619 +0200
@@ -1,0 +2,30 @@
+Fri Aug 14 05:59:27 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#407
+- rename product release package 'SUSE_MicroOS' to 'SUSE-MicroOS'
+- rename 'SUSE_MicroOS' to 'SUSE-MicroOS'
+- 16.7
+
+--------------------------------------------------------------------
+Thu Aug 13 15:00:24 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#406
+- use $releasever in repo URL (bsc#1171018)
+- 16.6
+
+--------------------------------------------------------------------
+Wed Aug 12 11:50:53 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#405
+- rename MicroOSNG to "SUSE MicroOS"
+- 16.5
+
+--------------------------------------------------------------------
+Mon Aug 10 16:24:09 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#401
+- wicked started using /usr/libexec (bsc#1174957)
+- fix nokogiri update-alternatives handling
+- 16.4
+
+--------------------------------------------------------------------
Old:
----
installation-images-16.3.tar.xz
New:
----
installation-images-16.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.tNz4sI/_old 2020-08-14 13:10:40.517240968 +0200
+++ /var/tmp/diff_new_pack.tNz4sI/_new 2020-08-14 13:10:40.521240969 +0200
@@ -57,20 +57,21 @@
%if 0%{?is_opensuse}
%define theme openSUSE
%if 0%{?sle_version}
-%define the_version %(echo %sle_version | sed -Ee
's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/')
+# define the_version %(echo %sle_version | sed -Ee
's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/')
+%define the_version \\$releasever
%if "%{the_version}" == ""
%error "bad version string"
%endif
%ifarch aarch64 ppc64 ppc64le
-%define net_repo
http://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
+%define net_repo
https://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
%else
-%define net_repo
http://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
+%define net_repo
https://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
%endif
%else
%ifarch aarch64 ppc64 ppc64le
-%define net_repo
http://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
+%define net_repo
https://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
%else
-%define net_repo http://download.opensuse.org/tumbleweed/repo/oss
+%define net_repo https://download.opensuse.org/tumbleweed/repo/oss
%endif
%endif
%endif
@@ -85,11 +86,11 @@
%endif
%endif
-%if "%flavor" == "MicroOSNG"
+%if "%flavor" == "SMO"
# build for both Leap and SLE
%if 0%{?sle_version}
%ifnarch %ix86
-%define theme MicroOSNG
+%define theme SMO
%endif
%endif
%endif
@@ -177,16 +178,16 @@
%global product_name openSUSE-Kubic
%endif
-%if "%theme" == "MicroOSNG"
+%if "%theme" == "SMO"
%define with_storage_ng 1
%define with_ssl_hmac 0
-%define branding_skelcd MicroOSNG
-%define branding_systemd SLE
+%define branding_skelcd SMO
+%define branding_systemd SMO
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
%define config_bootmenu_no_upgrade 1
-BuildRequires: MicroOSNG-release
+BuildRequires: SUSE-MicroOS-release
%endif
%if "%theme" == "MicroOS"
@@ -639,7 +640,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 16.3
+Version: 16.7
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-16.3.tar.xz -> installation-images-16.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.3/VERSION
new/installation-images-16.7/VERSION
--- old/installation-images-16.3/VERSION 2020-08-02 18:48:47.000000000
+0200
+++ new/installation-images-16.7/VERSION 2020-08-14 07:59:27.000000000
+0200
@@ -1 +1 @@
-16.3
+16.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.3/changelog
new/installation-images-16.7/changelog
--- old/installation-images-16.3/changelog 2020-08-02 18:48:47.000000000
+0200
+++ new/installation-images-16.7/changelog 2020-08-14 07:59:27.000000000
+0200
@@ -1,3 +1,21 @@
+2020-08-14: 16.7
+ - merge gh#openSUSE/installation-images#407
+ - rename product release package 'SUSE_MicroOS' to 'SUSE-MicroOS'
+ - rename 'SUSE_MicroOS' to 'SUSE-MicroOS'
+
+2020-08-13: 16.6
+ - merge gh#openSUSE/installation-images#406
+ - use $releasever in repo URL (bsc#1171018)
+
+2020-08-12: 16.5
+ - merge gh#openSUSE/installation-images#405
+ - rename MicroOSNG to "SUSE MicroOS"
+
+2020-08-10: 16.4
+ - merge gh#openSUSE/installation-images#401
+ - wicked started using /usr/libexec (bsc#1174957)
+ - fix nokogiri update-alternatives handling
+
2020-08-02: 16.3
- merge gh#openSUSE/installation-images#398
- Update the environment variable reference (doc/configoptions.md)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.3/data/initrd/scripts/early_setup
new/installation-images-16.7/data/initrd/scripts/early_setup
--- old/installation-images-16.3/data/initrd/scripts/early_setup
2020-08-02 18:48:47.000000000 +0200
+++ new/installation-images-16.7/data/initrd/scripts/early_setup
2020-08-14 07:59:27.000000000 +0200
@@ -72,7 +72,10 @@
echo "Starting wicked"
{
/usr/sbin/wickedd $debug_opts
- for i in /usr/lib/wicked/bin/wickedd-* ; do $i $debug_opts ; done
+ # latest wicked moved to /usr/libexec (bsc#1174957), support both locations
+ w_dir=/usr/libexec/wicked
+ [ -d $w_dir ] || w_dir=/usr/lib/wicked
+ for i in $w_dir/bin/wickedd-* ; do $i $debug_opts ; done
/usr/sbin/wickedd-nanny $debug_opts
} 2>/var/log/wickedd.log
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.3/data/root/root.file_list
new/installation-images-16.7/data/root/root.file_list
--- old/installation-images-16.3/data/root/root.file_list 2020-08-02
18:48:47.000000000 +0200
+++ new/installation-images-16.7/data/root/root.file_list 2020-08-14
07:59:27.000000000 +0200
@@ -34,6 +34,11 @@
# avoid update-alternatives
e cd usr/bin ; ln -snf SUSEConnect* SUSEConnect
+TEMPLATE ruby.*-rubygem-nokogiri:
+ /
+ # avoid update-alternatives
+ e cd usr/bin ; find . -type l -name nokogiri\* -exec rm -f \{\} \; ; ln -snf
nokogiri.ruby*-* nokogiri
+
# fix the symlinks for the Ruby debugger if it is present
TEMPLATE ruby.*-rubygem-byebug:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.3/etc/config
new/installation-images-16.7/etc/config
--- old/installation-images-16.3/etc/config 2020-08-02 18:48:47.000000000
+0200
+++ new/installation-images-16.7/etc/config 2020-08-14 07:59:27.000000000
+0200
@@ -144,16 +144,16 @@
systemd = MicroOS
product_name = openSUSE-Kubic
-[Theme MicroOSNG]
+[Theme SMO]
image = 350
patch_zypp_config = 1
-release = MicroOSNG
-skelcd = MicroOSNG
-skelcd_ctrl = MicroOSNG
+release = SUSE-MicroOS
+skelcd = SMO
+skelcd_ctrl = SMO
gfxboot = SLE
grub2 = SLE
plymouth = SLE
-systemd = SLE
+systemd = SMO
[Theme MicroOS]
image = 350
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.3/lib/ReadConfig.pm
new/installation-images-16.7/lib/ReadConfig.pm
--- old/installation-images-16.3/lib/ReadConfig.pm 2020-08-02
18:48:47.000000000 +0200
+++ new/installation-images-16.7/lib/ReadConfig.pm 2020-08-14
07:59:27.000000000 +0200
@@ -914,7 +914,7 @@
# don't accept other names than these
- die "*** unsupported product: $dist ***" if $dist !~
/^(casp|caasp|kubic|microos|microosng|leap|sles|sled|tumbleweed( kubic)?)$/;
+ die "*** unsupported product: $dist ***" if $dist !~
/^(casp|caasp|kubic|microos|suse-microos|leap|sles|sled|tumbleweed( kubic)?)$/;
# Kubic is based on TW
# MicroOS can be based on TW or Leap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.3/obs/installation-images.spec
new/installation-images-16.7/obs/installation-images.spec
--- old/installation-images-16.3/obs/installation-images.spec 2020-08-02
18:48:47.000000000 +0200
+++ new/installation-images-16.7/obs/installation-images.spec 2020-08-14
07:59:27.000000000 +0200
@@ -57,20 +57,21 @@
%if 0%{?is_opensuse}
%define theme openSUSE
%if 0%{?sle_version}
-%define the_version %(echo %sle_version | sed -Ee
's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/')
+# define the_version %(echo %sle_version | sed -Ee
's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/')
+%define the_version \\$releasever
%if "%{the_version}" == ""
%error "bad version string"
%endif
%ifarch aarch64 ppc64 ppc64le
-%define net_repo
http://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
+%define net_repo
https://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
%else
-%define net_repo
http://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
+%define net_repo
https://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
%endif
%else
%ifarch aarch64 ppc64 ppc64le
-%define net_repo
http://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
+%define net_repo
https://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
%else
-%define net_repo http://download.opensuse.org/tumbleweed/repo/oss
+%define net_repo https://download.opensuse.org/tumbleweed/repo/oss
%endif
%endif
%endif
@@ -85,11 +86,11 @@
%endif
%endif
-%if "%flavor" == "MicroOSNG"
+%if "%flavor" == "SMO"
# build for both Leap and SLE
%if 0%{?sle_version}
%ifnarch %ix86
-%define theme MicroOSNG
+%define theme SMO
%endif
%endif
%endif
@@ -177,16 +178,16 @@
%global product_name openSUSE-Kubic
%endif
-%if "%theme" == "MicroOSNG"
+%if "%theme" == "SMO"
%define with_storage_ng 1
%define with_ssl_hmac 0
-%define branding_skelcd MicroOSNG
-%define branding_systemd SLE
+%define branding_skelcd SMO
+%define branding_systemd SMO
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
%define config_bootmenu_no_upgrade 1
-BuildRequires: MicroOSNG-release
+BuildRequires: SUSE-MicroOS-release
%endif
%if "%theme" == "MicroOS"
