Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2016-02-09 13:31:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2015-12-18 21:53:43.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2016-02-09 13:31:30.000000000 +0100
@@ -1,0 +2,83 @@
+Mon Feb 8 16:15:27 UTC 2016 - [email protected]
+
+- drop the '(SNAPSHOT)' part of displayed Tumbleweed version (bsc#965645)
+- 14.224
+
+-------------------------------------------------------------------
+Wed Feb 3 15:20:50 UTC 2016 - [email protected]
+
+- adjust product/version handling
+- 14.223
+
+-------------------------------------------------------------------
+Fri Jan 29 09:40:19 UTC 2016 - [email protected]
+
+- don't chainload shim for now (bsc#963919)
+- 14.222
+
+-------------------------------------------------------------------
+Thu Jan 28 12:01:37 UTC 2016 - [email protected]
+
+- adjust rubygem handling
+- 14.221
+
+-------------------------------------------------------------------
+Thu Jan 28 10:52:50 UTC 2016 - [email protected]
+
+- fix typo in Makefile
+- 14.220
+
+-------------------------------------------------------------------
+Wed Jan 27 09:25:16 UTC 2016 - [email protected]
+
+- rework product/version handling to use the values from /etc/os-release
+- 14.219
+
+-------------------------------------------------------------------
+Mon Jan 25 09:30:19 UTC 2016 - [email protected]
+
+- filelists: glib looks for mime handler list in mimeapps.list
+- 14.218
+
+-------------------------------------------------------------------
+Fri Jan 22 15:30:17 UTC 2016 - [email protected]
+
+- nvme module has been moved (bsc#963114)
+- 14.217
+
+-------------------------------------------------------------------
+Wed Jan 20 11:55:17 UTC 2016 - [email protected]
+
+- also include VERSION files for ruby gems
+- 14.216
+
+-------------------------------------------------------------------
+Tue Jan 19 09:00:16 UTC 2016 - [email protected]
+
+- squashfs.ko might depend on lz4_decompress (bsc#962493)
+- 14.215
+
+-------------------------------------------------------------------
+Mon Jan 18 11:00:15 UTC 2016 - [email protected]
+
+- ensure /etc/hosts is writable (bsc#961880)
+- 14.214
+
+-------------------------------------------------------------------
+Mon Jan 18 10:35:17 UTC 2016 - [email protected]
+
+- Add IBM vNIC module
+- 14.213
+
+-------------------------------------------------------------------
+Mon Jan 18 10:30:19 UTC 2016 - [email protected]
+
+- noto-sans has been renamed to noto-sans-fonts
+- 14.212
+
+-------------------------------------------------------------------
+Mon Jan 18 09:56:40 UTC 2016 - [email protected]
+
+- Correct name of vmlinuz-xen symlink
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.211.tar.xz
New:
----
installation-images-14.224.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.7855Km/_old 2016-02-09 13:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.7855Km/_new 2016-02-09 13:31:31.000000000 +0100
@@ -43,7 +43,7 @@
%else
BuildRequires: openSUSE-release
BuildRequires: openSUSE-release-mini
-BuildRequires: noto-sans
+BuildRequires: noto-sans-fonts
BuildRequires: google-roboto-fonts
%endif
%ifarch ia64 %ix86 x86_64
@@ -369,7 +369,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.211
+Version: 14.224
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
@@ -451,7 +451,7 @@
%ifarch x86_64
%if %{without xen}
ln -s loader/initrd %{buildroot}/branding/%theme/CD1/boot/x86_64/initrd-xen
-ln -s loader/linux %{buildroot}/CD1/boot/x86_64/vmlinux-xen
+ln -s loader/linux %{buildroot}/CD1/boot/x86_64/vmlinuz-xen
%endif
%endif
# get rid of /usr/lib/rpm/brp-strip-debug
++++++ installation-images-14.211.tar.xz -> installation-images-14.224.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/Makefile
new/installation-images-14.224/Makefile
--- old/installation-images-14.211/Makefile 2015-12-17 11:35:22.000000000
+0100
+++ new/installation-images-14.224/Makefile 2016-02-08 17:13:34.000000000
+0100
@@ -94,38 +94,38 @@
[ -s tmp/initrd/bin/bash ]
modules: base
- image=modules-config src=initrd fs=none bin/mk_image
- bin/mlist1
- bin/mlist2
- image=modules src=initrd fs=none bin/mk_image
+ theme=$(THEMES) image=modules-config src=initrd fs=none bin/mk_image
+ theme=$(THEMES) bin/mlist1
+ theme=$(THEMES) bin/mlist2
+ theme=$(THEMES) image=modules src=initrd fs=none bin/mk_image
mkdir -p images/module-config/$${MOD_CFG:-default}
ls -I module.config tmp/modules/modules | sed -e 's#.*/##'
>images/module-config/$${MOD_CFG:-default}/module.list
cp tmp/modules/modules/module.config
images/module-config/$${MOD_CFG:-default}
initrd+modules: base
- image=modules-config src=initrd fs=none bin/mk_image
- bin/mlist1
- bin/mlist2
+ theme=$(THEMES) image=modules-config src=initrd fs=none bin/mk_image
+ theme=$(THEMES) bin/mlist1
+ theme=$(THEMES) bin/mlist2
rm -rf tmp/initrd/modules tmp/initrd/lib/modules
- mode=add tmpdir=initrd image=modules src=initrd fs=none bin/mk_image
+ theme=$(THEMES) mode=add tmpdir=initrd image=modules src=initrd fs=none
bin/mk_image
mkdir -p images/module-config/$${MOD_CFG:-default}
ls -I module.config tmp/initrd/modules | sed -e 's#.*/##'
>images/module-config/$${MOD_CFG:-default}/module.list
cp tmp/initrd/modules/module.config
images/module-config/$${MOD_CFG:-default}
- mode=keep image=$(THEMES)/$${image:-initrd} tmpdir=initrd fs=cpio.xz
bin/mk_image
+ theme=$(THEMES) mode=keep image=$(THEMES)/$${image:-initrd}
tmpdir=initrd fs=cpio.xz bin/mk_image
initrd+modules+gefrickel: base
- image=modules-config src=initrd fs=none bin/mk_image
- bin/mlist1
- bin/mlist2
+ theme=$(THEMES) image=modules-config src=initrd fs=none bin/mk_image
+ theme=$(THEMES) bin/mlist1
+ theme=$(THEMES) bin/mlist2
rm -rf tmp/initrd/modules tmp/initrd/lib/modules tmp/initrd_gefrickel
# work on a copy to not modify the origial tree
cp -a tmp/initrd tmp/initrd_gefrickel
- mode=add tmpdir=initrd_gefrickel image=modules src=initrd fs=none
bin/mk_image
+ theme=$(THEMES) mode=add tmpdir=initrd_gefrickel image=modules
src=initrd fs=none bin/mk_image
mkdir -p images/module-config/$${MOD_CFG:-default}
ls -I module.config tmp/initrd_gefrickel/modules | sed -e 's#.*/##'
>images/module-config/$${MOD_CFG:-default}/module.list
cp tmp/initrd_gefrickel/modules/module.config
images/module-config/$${MOD_CFG:-default}
./gefrickel tmp/initrd_gefrickel
- mode=keep image=$(THEMES)/$${image:-initrd} tmpdir=initrd_gefrickel
fs=cpio.xz bin/mk_image
+ theme=$(THEMES) mode=keep image=$(THEMES)/$${image:-initrd}
tmpdir=initrd_gefrickel fs=cpio.xz bin/mk_image
kernel: base
image=vmlinuz-$${MOD_CFG:-default} src=initrd filelist=kernel
kernel=kernel-$${MOD_CFG:-default} fs=dir bin/mk_image
@@ -172,13 +172,13 @@
cat data/root/rpmlist tmp/base/yast2-trans-rpm.list >images/rpmlist
gdb: base
- libdeps=root,gdb image=gdb src=root fs=squashfs disjunct=root
bin/mk_image
+ theme=$(THEMES) libdeps=root,gdb image=gdb src=root fs=squashfs
disjunct=root bin/mk_image
bind: base
- libdeps=root,bind image=bind src=root fs=squashfs disjunct=root
bin/mk_image
+ theme=$(THEMES) libdeps=root,bind image=bind src=root fs=squashfs
disjunct=root bin/mk_image
snapper: base
- libdeps=root,snapper image=snapper src=root fs=squashfs disjunct=root
bin/mk_image
+ theme=$(THEMES) libdeps=root,snapper image=snapper src=root fs=squashfs
disjunct=root bin/mk_image
boot-themes: base
for theme in $(THEMES) ; do \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/VERSION
new/installation-images-14.224/VERSION
--- old/installation-images-14.211/VERSION 2015-12-17 11:35:22.000000000
+0100
+++ new/installation-images-14.224/VERSION 2016-02-08 17:13:34.000000000
+0100
@@ -1 +1 @@
-14.211
+14.224
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/changelog
new/installation-images-14.224/changelog
--- old/installation-images-14.211/changelog 2015-12-17 11:35:22.000000000
+0100
+++ new/installation-images-14.224/changelog 2016-02-08 17:13:34.000000000
+0100
@@ -1,3 +1,43 @@
+2016-02-08: 14.224
+ - drop the '(SNAPSHOT)' part of displayed Tumbleweed version (bsc
#965645)
+
+2016-02-03: 14.223
+ - adjust product/version handling
+ - On branch test_20
+
+2016-01-28: 14.222
+ - don't chainload shim for now (bsc #963919)
+
+2016-01-28: 14.221
+ - adjust rubygem handling
+
+2016-01-28: 14.220
+ - fix typo in Makefile
+
+2016-01-26: 14.219
+ - rework product/version handling to use the values from /etc/os-release
+
+2016-01-25: 14.218
+ - filelists: glib looks for mime handler list in mimeapps.list
+
+2016-01-22: 14.217
+ - nvme module has been moved (bsc #963114)
+
+2016-01-20: 14.216
+ - also include VERSION files for ruby gems
+
+2016-01-19: 14.215
+ - squashfs.ko might depend on lz4_decompress (bsc #962493)
+
+2016-01-18: 14.214
+ - ensure /etc/hosts is writable (bsc #961880)
+
+2016-01-04: 14.213
+ - Add IBM vNIC module
+
+2016-01-15: 14.212
+ - noto-sans has been renamed to noto-sans-fonts
+
2015-12-17: 14.211
- adjust module config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/data/boot/grub.cfg
new/installation-images-14.224/data/boot/grub.cfg
--- old/installation-images-14.211/data/boot/grub.cfg 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/boot/grub.cfg 2016-02-08
17:13:34.000000000 +0100
@@ -40,9 +40,9 @@
menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu
--class os {
if search --no-floppy --file /efi/boot/fallback.efi --set ; then
if [ -f /efi/opensuse/shim.efi ] ; then
- chainloader /efi/opensuse/shim.efi
+ chainloader /efi/opensuse/grub.efi
elif [ -f /efi/sles/shim.efi ] ; then
- chainloader /efi/sles/shim.efi
+ chainloader /efi/sles/grub.efi
fi
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/data/boot/mkbootdisk
new/installation-images-14.224/data/boot/mkbootdisk
--- old/installation-images-14.211/data/boot/mkbootdisk 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/boot/mkbootdisk 2016-02-08
17:13:34.000000000 +0100
@@ -11,7 +11,7 @@
use strict 'vars';
use integer;
-%::ConfigData = ( full_product_name => "product_X" );
+%::ConfigData = ( product_name => "product_X" );
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -699,14 +699,14 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
my $boot_msg = "\r
- I'm $::ConfigData{full_product_name} Boot Disk <disk>. I cannot boot. :-(\r
+ I'm $::ConfigData{product_name} Boot Disk <disk>. I cannot boot. :-(\r
\r
Please try Boot Disk 1.\r\n";
# Not more than 1024 chars (1 cluster)! --> Or adjust cluster size!
my $readme =
- "This is $::ConfigData{full_product_name} Boot Disk <disk>.
+ "This is $::ConfigData{product_name} Boot Disk <disk>.
<x_readme>
To access Boot Disk data, you have to join the individual disk images first:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/data/initrd/all_modules
new/installation-images-14.224/data/initrd/all_modules
--- old/installation-images-14.211/data/initrd/all_modules 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/initrd/all_modules 2016-02-08
17:13:34.000000000 +0100
@@ -1423,6 +1423,7 @@
ibmpex aarch64 i586 i686 ppc64 x86_64
ibmphp i586
ibmveth ppc64
+ibmvnic ppc64
ibmvfc ppc64
ibmvscsi ppc64
ibmvstgt ppc64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.211/data/initrd/initrd.file_list
new/installation-images-14.224/data/initrd/initrd.file_list
--- old/installation-images-14.211/data/initrd/initrd.file_list 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/initrd/initrd.file_list 2016-02-08
17:13:34.000000000 +0100
@@ -120,8 +120,10 @@
/usr/share/terminfo/i/ibm3151
netcfg:
- /etc/protocols
+ /etc/hosts
/etc/netgroup
+ /etc/protocols
+ /etc/services
?xf86-input-vmmouse:
/usr/bin/vmmouse_detect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.211/data/rescue/rescue.file_list
new/installation-images-14.224/data/rescue/rescue.file_list
--- old/installation-images-14.211/data/rescue/rescue.file_list 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/rescue/rescue.file_list 2016-02-08
17:13:34.000000000 +0100
@@ -406,3 +406,4 @@
# allowed dangling symlinks
D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list
+D /var/cache/gio-2.0/gnome-mimeapps.list /usr/share/applications/mimeapps.list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/data/root/etc/hosts
new/installation-images-14.224/data/root/etc/hosts
--- old/installation-images-14.211/data/root/etc/hosts 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/root/etc/hosts 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-127.0.0.1 localhost
-::1 localhost ipv6-localhost ipv6-loopback
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/data/root/root.file_list
new/installation-images-14.224/data/root/root.file_list
--- old/installation-images-14.211/data/root/root.file_list 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/root/root.file_list 2016-02-08
17:13:34.000000000 +0100
@@ -39,12 +39,16 @@
d .
TEMPLATE ruby.*-rubygem-.*:
+ /usr/*/ruby/gems/*/gems/*/VERSION
/usr/*/ruby/gems/*/gems/*/lib
/usr/*/ruby/gems/*/specifications
+ /usr/*/ruby/gems/*/extensions
TEMPLATE rubygem-.*:
+ /usr/*/ruby/gems/*/gems/*/VERSION
/usr/*/ruby/gems/*/gems/*/lib
/usr/*/ruby/gems/*/specifications
+ /usr/*/ruby/gems/*/extensions
TEMPLATE skelcd-control-.*:
# just a template that does nothing
@@ -71,6 +75,8 @@
mdadm: ignore
mingetty: ignore
mtools: ignore
+# netcfg is already part of initrd
+netcfg: ignore
nfsidmap: ignore
pam-config: ignore
permissions: ignore
@@ -292,9 +298,6 @@
d /etc/sysconfig/SuSEfirewall2.d/services/
/etc/sysconfig/SuSEfirewall2
-netcfg:
- /etc/{services,protocols}
-
if arch eq 'ppc' || arch eq 'ppc64'
pdisk:
/sbin/pdisk
@@ -539,7 +542,7 @@
?google-roboto-fonts:
-?noto-sans:
+?noto-sans-fonts:
?raleway-fonts:
@@ -714,6 +717,7 @@
D ../../sbin/update-ca-certificates /usr/lib64/p11-kit/p11-kit-extract-trust
D ../../sbin/update-ca-certificates /usr/lib/p11-kit/p11-kit-extract-trust
D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list
+D /var/cache/gio-2.0/gnome-mimeapps.list /usr/share/applications/mimeapps.list
D ../share/cracklib/pw_dict.pwi /usr/lib/cracklib_dict.pwi
D ../share/cracklib/pw_dict.pwd /usr/lib/cracklib_dict.pwd
D ../share/cracklib/pw_dict.hwm /usr/lib/cracklib_dict.hwm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.211/data/root/zenroot.file_list
new/installation-images-14.224/data/root/zenroot.file_list
--- old/installation-images-14.211/data/root/zenroot.file_list 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/data/root/zenroot.file_list 2016-02-08
17:13:34.000000000 +0100
@@ -281,3 +281,4 @@
# allowed dangling symlinks
D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list
+D /var/cache/gio-2.0/gnome-mimeapps.list /usr/share/applications/mimeapps.list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/etc/config
new/installation-images-14.224/etc/config
--- old/installation-images-14.211/etc/config 2015-12-17 11:35:22.000000000
+0100
+++ new/installation-images-14.224/etc/config 2016-02-08 17:13:34.000000000
+0100
@@ -70,10 +70,6 @@
base = openSUSE
splash = openSUSE
yast = openSUSE
-product = openSUSE
-version = 13.2
-sle = 12
-update = /linux/suse/<arch>-<rel>
image = 350
@@ -81,10 +77,6 @@
base = SLE
splash = SLE
yast = SLE
-product = SUSE Linux Enterprise 12 SP1
-version = 13.2
-sle = 12
-update = /linux/suse/<arch>-<sles>
image = 600
@@ -92,10 +84,6 @@
base = SLE
splash = SLE
yast = SLE
-product = SUSE Linux Enterprise 12 SP1
-version = 13.2
-sle = 12
-update = /linux/suse/<arch>-<sled>
image = 600
@@ -103,10 +91,6 @@
base = SLE
splash = SLE
yast = SLE
-product = ZENworks
-version = 13.2
-sle = 12
-update = /linux/suse/<arch>-<sles>
image = 600
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/etc/module.config
new/installation-images-14.224/etc/module.config
--- old/installation-images-14.211/etc/module.config 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/etc/module.config 2016-02-08
17:13:34.000000000 +0100
@@ -174,6 +174,7 @@
kernel/drivers/i2c/.*
kernel/drivers/leds/.*
kernel/drivers/md/.*
+kernel/drivers/nvme/.*
kernel/drivers/platform/.*
kernel/drivers/base/regmap/.*
kernel/drivers/video/.*
@@ -427,6 +428,7 @@
e1000e,"Intel PRO/1000 PCI-E Gigabit"
ehea,"POWER6 ehea"
ibmveth,"POWER5 Virtual Ethernet"
+ibmvnic,"Driver for System i/p vNIC protocol"
igb,"Intel Gigabit Ethernet"
ixgb,"Intel(R) PRO/10GbE"
ixgbe,"Intel(R) 10 Gigabit PCI Express"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/etc/module.list
new/installation-images-14.224/etc/module.list
--- old/installation-images-14.211/etc/module.list 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/etc/module.list 2016-02-08
17:13:34.000000000 +0100
@@ -238,6 +238,7 @@
kernel/drivers/of/
kernel/drivers/tty/serial/jsm/
kernel/drivers/i2c/
+kernel/drivers/nvme/
# kmps
updates/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/etc/os_sample.txt
new/installation-images-14.224/etc/os_sample.txt
--- old/installation-images-14.211/etc/os_sample.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.224/etc/os_sample.txt 2016-02-08
17:13:34.000000000 +0100
@@ -0,0 +1,79 @@
+== opensuse ==
+
+NAME=openSUSE
+VERSION="13.2 (Harlequin)"
+VERSION_ID="13.2"
+PRETTY_NAME="openSUSE 13.2 (Harlequin) (x86_64)"
+ID=opensuse
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:opensuse:13.2"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://opensuse.org/";
+ID_LIKE="suse"
+
+== tumbleweed ==
+
+NAME=openSUSE
+VERSION="Tumbleweed"
+VERSION_ID="20160126"
+PRETTY_NAME="openSUSE Tumbleweed (20160126) (x86_64)"
+ID=opensuse
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:opensuse:20160126"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://www.opensuse.org/";
+ID_LIKE="suse"
+
+== leap ==
+
+NAME="openSUSE Leap"
+VERSION="42.1"
+VERSION_ID="42.1"
+PRETTY_NAME="openSUSE Leap 42.1 (x86_64)"
+ID=opensuse
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:opensuse:42.1"
+BUG_REPORT_URL="https://bugs.opensuse.org";
+HOME_URL="https://opensuse.org/";
+ID_LIKE="suse"
+
+== sles12 ==
+
+NAME="SLES"
+VERSION="12"
+VERSION_ID="12"
+PRETTY_NAME="SUSE Linux Enterprise Server 12"
+ID="sles"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:sles:12"
+
+== sles12 sp1 ==
+
+NAME="SLES"
+VERSION="12-SP1"
+VERSION_ID="12.1"
+PRETTY_NAME="SUSE Linux Enterprise Server 12 SP1"
+ID="sles"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:sles:12:sp1"
+
+== sled12 ==
+
+NAME="SLED"
+VERSION="12"
+VERSION_ID="12"
+PRETTY_NAME="SUSE Linux Enterprise Desktop 12"
+ID="sled"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:sled:12"
+
+== sles12 for sap ==
+
+NAME="SLES_SAP"
+VERSION="12-SP1"
+VERSION_ID="12.1.0.1"
+PRETTY_NAME="SUSE Linux Enterprise for SAP Applications 12 SP1"
+ID="sles_sap"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:sles_sap:12:sp1"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/gefrickel
new/installation-images-14.224/gefrickel
--- old/installation-images-14.211/gefrickel 2015-12-17 11:35:22.000000000
+0100
+++ new/installation-images-14.224/gefrickel 2016-02-08 17:13:34.000000000
+0100
@@ -38,7 +38,7 @@
m_dir=`echo lib/modules/*/initrd`
[ -d "$m_dir" ] || err "no kernel module dir"
mkdir -p "b/$m_dir"
-for i in loop squashfs ; do
+for i in loop squashfs lz4_decompress ; do
[ -f $m_dir/$i.ko ] && mv $m_dir/$i.ko b/$m_dir
done
mkdir -p a/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/lib/MakeFATImage2.pm
new/installation-images-14.224/lib/MakeFATImage2.pm
--- old/installation-images-14.211/lib/MakeFATImage2.pm 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/lib/MakeFATImage2.pm 2016-02-08
17:13:34.000000000 +0100
@@ -13,14 +13,14 @@
my $boot_file = "${BasePath}src/mboot/boot";
my $boot_msg = "\r
-I'm $ConfigData{full_product_name} Boot Disk <disk>. I cannot boot. :-(\r
+I'm $ConfigData{product_name} Boot Disk <disk>. I cannot boot. :-(\r
\r
Please try Boot Disk 1.\r\n";
# Not more than 1024 chars (1 cluster)! --> Or adjust cluster size!
my $readme =
-"This is $ConfigData{full_product_name} Boot Disk <disk>.
+"This is $ConfigData{product_name} Boot Disk <disk>.
<x_readme>
To access Boot Disk data, you have to join the individual disk images first:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.211/lib/ReadConfig.pm
new/installation-images-14.224/lib/ReadConfig.pm
--- old/installation-images-14.211/lib/ReadConfig.pm 2015-12-17
11:35:22.000000000 +0100
+++ new/installation-images-14.224/lib/ReadConfig.pm 2016-02-08
17:13:34.000000000 +0100
@@ -188,7 +188,9 @@
sub resolve_deps_obs;
sub resolve_deps_libsolv;
sub show_package_deps;
+sub get_version_info;
+my ($arch, $realarch, $susearch);
sub DebugInfo
{
@@ -826,6 +828,62 @@
}
+# Read real version/product info from /etc/os-release.
+#
+# This only works _after_ we have setup the 'base' system in tmp/base.
+#
+sub get_version_info
+{
+ my $file = "${BasePath}tmp/base/etc/os-release";
+ my $f;
+ my %config;;
+
+ if(open $f, $file) {
+ while(<$f>) {
+ $config{$1} = $2 if /^([^\s=]+)\s*=\s*\"?(.*?)\"?\s*$/;
+ }
+ }
+ else {
+ return;
+ }
+
+ # build nice product name
+
+ my $product = $config{PRETTY_NAME};
+ $product =~ s/\s*\([^)]*\)$//;
+ $product =~ s/\s+(Server|Desktop)\s+/ /;
+
+ # print "product=\"$product\"\n";
+
+ $ConfigData{os}{product} = $product;
+
+ # the same without anything in parentheses
+
+ my $product_mini = $product;
+ $product_mini =~ s/\s*\(.*//;
+
+ # print "product_mini=\"$product_mini\"\n";
+
+ $ConfigData{os}{product_mini} = $product_mini;
+
+ # get dist tag for driver updates
+
+ my $dist = "\L$config{NAME}";
+ $dist =~ s/^opensuse\s*//;
+ # special enterprise products may have extra text beside SLES or SLED
+ $dist = $1 if $dist =~ /(sles|sled)/;
+ # don't accept other names than these
+ $dist = "" if $dist !~ /^(leap|sles|sled)$/;
+
+ $dist .= $config{VERSION} eq 'Tumbleweed' ? 'tw' : $config{VERSION_ID};
+ $dist =~ s/\..*$// if $dist =~ /^(sles|sled)/;
+
+ # print "dist=\"$dist\"\n";
+
+ $ConfigData{os}{update} = "/linux/suse/$realarch-$dist";
+}
+
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
# initialization part
@@ -890,8 +948,6 @@
# set arch
#
-my ($arch, $realarch, $susearch);
-
$arch = `uname -m`;
chomp $arch;
$arch = "i386" if $arch =~ /^i.86$/;
@@ -1189,20 +1245,8 @@
die "Theme \"$theme\" not supported\n" unless exists $t{$theme};
}
- $product_name = $ConfigData{ini}{"Theme $theme"}{product};
- my $full_product_name = $product_name;
- $full_product_name .= (" " . $ConfigData{ini}{"Theme $theme"}{version}) if
$ConfigData{ini}{"Theme $theme"}{version};
-
- my $suse_release = $ConfigData{ini}{"Theme $theme"}{version};
- my $sle_release = "sle" . $ConfigData{ini}{"Theme $theme"}{sle};
- my $sles_release = "sles" . $ConfigData{ini}{"Theme $theme"}{sle};
- my $sled_release = "sled" . $ConfigData{ini}{"Theme $theme"}{sle};
-
- $update_dir = $ConfigData{ini}{"Theme $theme"}{update};
- $update_dir =~ s/<sles>/$sles_release/g;
- $update_dir =~ s/<sled>/$sled_release/g;
- $update_dir =~ s/<rel>/$suse_release/g;
- $update_dir =~ s/<arch>/$realarch/g;
+ get_version_info();
+
$load_image = $ConfigData{ini}{"Theme $theme"}{image};
$load_image = $load_image * 1024 if $load_image;
@@ -1210,20 +1254,12 @@
$ConfigData{base_theme} = $ConfigData{ini}{"Theme $theme"}{base};
$ConfigData{splash_theme} = $ConfigData{ini}{"Theme $theme"}{splash};
$ConfigData{yast_theme} = $ConfigData{ini}{"Theme $theme"}{yast};
- $ConfigData{product_name} = $product_name;
- $ConfigData{full_product_name} = $full_product_name;
- $ConfigData{update_dir} = $update_dir;
+ $ConfigData{product_name} = $ConfigData{os}{product_mini} || "openSUSE";
+ $ConfigData{update_dir} = $ConfigData{os}{update};
$ConfigData{load_image} = $load_image;
- $ConfigData{suse_release} = $suse_release;
- $ConfigData{sles_release} = $sles_release;
- $ConfigData{sled_release} = $sled_release;
$ConfigData{min_memory} = $ConfigData{ini}{"Theme $theme"}{memory};
- # print STDERR "product_name = $ConfigData{product_name}\n";
- # print STDERR "update_dir = $ConfigData{update_dir}\n";
- # print STDERR "load_image = $ConfigData{load_image}\n";
-
$ConfigData{kernel_mods} = $ConfigData{kernel_ver};
$ConfigData{kernel_mods} =~ s/-(.+?)-/-override-/;
@@ -1241,12 +1277,13 @@
$kmp = "";
}
- print "--- Building for $product_name $suse_release $ConfigData{arch}
($sle_release) [$ConfigData{lib}], theme $ConfigData{theme}\n";
+ print "--- Building for $ConfigData{product_name} $ConfigData{arch}
[$ConfigData{lib}], theme $ConfigData{theme}\n";
print "--- Kernel: $ConfigData{kernel_rpm}$kmp, $ConfigData{kernel_img},
$ConfigData{kernel_ver}\n";
$r = $ConfigData{suse_base};
$r =~ s/\/\*$//;
print "--- Source: $r\n";
+ print "--- Driver Updates: $ConfigData{update_dir}\n";
}
}
