Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2019-02-04 21:24:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Mon Feb 4 21:24:44 2019 rev:63 rq:670347 version:14.408
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2019-01-15 09:13:07.594416423 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.28833/installation-images.changes
2019-02-04 21:24:46.167605011 +0100
@@ -1,0 +2,44 @@
+Thu Jan 31 12:57:49 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#293
+- Revert "Add bcache-tools package (fate#325346)"
+- Remove optional for initrd
+- Add bcache-tools to rescue system (fate#325346)
+- Add bcache-tools package to rescue system
+- 14.408
+
+--------------------------------------------------------------------
+Wed Jan 30 14:43:21 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#292
+- Add bcache-tools package (fate#325346)
+- 14.407
+
+-------------------------------------------------------------------
+Mon Jan 28 13:37:46 UTC 2019 - [email protected]
+
+- updated skelcd-fallbackrepo package list
+
+-------------------------------------------------------------------
+Mon Jan 28 12:46:20 UTC 2019 - [email protected]
+
+- fix spec to require correct skelcd-fallbackrepo packages
+
+--------------------------------------------------------------------
+Thu Jan 24 14:58:32 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#290
+- adjust to grub2 package changes (fate#326960, bsc#1122992)
+- adjust to nfs-utils package changes (bsc#1122994)
+- avoid perl warnings using BigInt module
+- correct efi and shim dir
+- 14.406
+
+--------------------------------------------------------------------
+Tue Jan 15 09:35:15 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#289
+- Added new linuxrc option: specialproduct (fate#327099)
+- 14.405
+
+--------------------------------------------------------------------
Old:
----
installation-images-14.404.tar.xz
New:
----
installation-images-14.408.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.txoxqQ/_old 2019-02-04 21:24:47.599604656 +0100
+++ /var/tmp/diff_new_pack.txoxqQ/_new 2019-02-04 21:24:47.603604655 +0100
@@ -152,12 +152,18 @@
%define branding_grub2 SLE
%define branding_gfxboot SLE
BuildRequires: skelcd-fallbackrepo-SLES
-%ifarch %ix86
+%ifarch x86_64
BuildRequires: skelcd-fallbackrepo-SLED
BuildRequires: skelcd-fallbackrepo-SLES_SAP
BuildRequires: skelcd-fallbackrepo-SLE_HPC
BuildRequires: skelcd-fallbackrepo-SLE_RT
%endif
+%ifarch ppc64le
+BuildRequires: skelcd-fallbackrepo-SLES_SAP
+%endif
+%ifarch aarch64
+BuildRequires: skelcd-fallbackrepo-SLE_HPC
+%endif
BuildRequires: unified-installer-release
%endif
@@ -552,7 +558,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.404
+Version: 14.408
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.404.tar.xz -> installation-images-14.408.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.404/VERSION
new/installation-images-14.408/VERSION
--- old/installation-images-14.404/VERSION 2019-01-10 11:23:51.000000000
+0100
+++ new/installation-images-14.408/VERSION 2019-01-31 13:57:49.000000000
+0100
@@ -1 +1 @@
-14.404
+14.408
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.404/bin/hdimage
new/installation-images-14.408/bin/hdimage
--- old/installation-images-14.404/bin/hdimage 2019-01-10 11:23:51.000000000
+0100
+++ new/installation-images-14.408/bin/hdimage 2019-01-31 13:57:49.000000000
+0100
@@ -177,6 +177,7 @@
$s = `du --apparent-size -k -s $_ 2>/dev/null`;
$s =~ s/\s.*$//;
$s <<= 1;
+ $self->{fit_size_acc} = 0 if !defined $self->{fit_size_acc};
$self->{fit_size_acc} += $s;
}
}
@@ -227,8 +228,9 @@
$self->size($self->{size} + $self->{fit_size_acc}) if
$self->{fit_size_acc};
- # using '+-' to work around bigint strangeness in perl 5.16 (bnc #766339)
- my $p_size = $self->{size} - $self->partition_ofs + -$self->{extra_size};
+ $self->{extra_size} = 0 if !defined $self->{extra_size};
+
+ my $p_size = $self->{size} - $self->partition_ofs - $self->{extra_size};
return undef if $p_size < 0;
my $c = $self->{c};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.404/changelog
new/installation-images-14.408/changelog
--- old/installation-images-14.404/changelog 2019-01-10 11:23:51.000000000
+0100
+++ new/installation-images-14.408/changelog 2019-01-31 13:57:49.000000000
+0100
@@ -1,3 +1,20 @@
+2019-01-31: 14.408
+ - Add bcache-tools to rescue system (fate #325346)
+ - Remove optional for initrd
+ - Revert "Add bcache-tools package (fate #325346)"
+
+2019-01-30: 14.407
+ - Add bcache-tools package (fate #325346)
+
+2019-01-24: 14.406
+ - correct efi and shim dir
+ - avoid perl warnings using BigInt module
+ - adjust to grub2 package changes (fate #326960, bsc #1122992)
+ - adjust to nfs-utils package changes (bsc #1122994)
+
+2019-01-15: 14.405
+ - Added new linixrc option: specialproduct (fate #327099)
+
2019-01-10: 14.404
- added required tools for network setup (bsc #1121046)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.404/data/boot/grub2-efi.file_list
new/installation-images-14.408/data/boot/grub2-efi.file_list
--- old/installation-images-14.404/data/boot/grub2-efi.file_list
2019-01-10 11:23:51.000000000 +0100
+++ new/installation-images-14.408/data/boot/grub2-efi.file_list
2019-01-31 13:57:49.000000000 +0100
@@ -2,20 +2,36 @@
if arch eq 'x86_64'
grub2-x86_64-efi:
- a usr/lib64/efi/grub.efi EFI/BOOT/bootx64.efi
+ if exists(grub2-x86_64-efi, /usr/share/efi/x86_64/grub.efi)
+ grub_efi = usr/share/efi/x86_64/grub.efi
+ else
+ grub_efi = usr/lib64/efi/grub.efi
+ endif
+ a <grub_efi> EFI/BOOT/bootx64.efi
# if we have shim, use it
if exists(shim)
e mv EFI/BOOT/bootx64.efi EFI/BOOT/grub.efi
- ?shim:
- a /usr/lib64/efi/shim.efi EFI/BOOT/bootx64.efi
- a /usr/lib64/efi/MokManager.efi EFI/BOOT/
+ shim:
+ if exists(shim, /usr/share/efi/x86_64/shim.efi)
+ shim_dir = /usr/share/efi/x86_64
+ else
+ shim_dir = /usr/lib64/efi
+ endif
+ a <shim_dir>/shim.efi EFI/BOOT/bootx64.efi
+ a <shim_dir>/MokManager.efi EFI/BOOT/
endif
x grub.cfg EFI/BOOT
elsif arch eq 'aarch64'
grub2-arm64-efi:
- a usr/lib/efi/grub.efi EFI/BOOT/bootaa64.efi
+ if exists(grub2-arm64-efi, /usr/share/efi/aarch64/grub.efi)
+ grub_efi = usr/share/efi/aarch64/grub.efi
+ else
+ grub_efi = usr/lib/efi/grub.efi
+ endif
+
+ a <grub_efi> EFI/BOOT/bootaa64.efi
x grub-aarch64.cfg EFI/BOOT/grub.cfg
endif
@@ -43,7 +59,7 @@
endif
# Add RPi packages if available
-if exists(raspberrypi-firmware)
+if arch eq 'aarch64' && exists(raspberrypi-firmware)
raspberrypi-firmware:
/
raspberrypi-firmware-config:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.404/data/boot/grub2-powerpc.file_list
new/installation-images-14.408/data/boot/grub2-powerpc.file_list
--- old/installation-images-14.404/data/boot/grub2-powerpc.file_list
2019-01-10 11:23:51.000000000 +0100
+++ new/installation-images-14.408/data/boot/grub2-powerpc.file_list
2019-01-31 13:57:49.000000000 +0100
@@ -1,9 +1,14 @@
d grub2-ieee1275
grub2-powerpc-ieee1275:
+ if exists(grub2-powerpc-ieee1275, /usr/share/grub2/powerpc-ieee1275)
+ grub2_dir = /usr/share/grub2/powerpc-ieee1275
+ else
+ grub2_dir = /usr/lib/grub2/powerpc-ieee1275
+ endif
d grub2-ieee1275/powerpc-ieee1275
- e grub2-mkimage -d /usr/lib/grub2/powerpc-ieee1275 -O powerpc-ieee1275 -o
grub2-ieee1275/core.elf -p "()/boot/<arch>/grub2-ieee1275" iso9660 ext2 ofnet
net tftp http
- f /usr/lib/grub2/powerpc-ieee1275 *.mod grub2-ieee1275/powerpc-ieee1275/
- f /usr/lib/grub2/powerpc-ieee1275 *.lst grub2-ieee1275/powerpc-ieee1275/
+ e grub2-mkimage -d <grub2_dir> -O powerpc-ieee1275 -o
grub2-ieee1275/core.elf -p "()/boot/<arch>/grub2-ieee1275" iso9660 ext2 ofnet
net tftp http
+ f <grub2_dir> *.mod grub2-ieee1275/powerpc-ieee1275/
+ f <grub2_dir> *.lst grub2-ieee1275/powerpc-ieee1275/
x grub-powerpc.cfg grub2-ieee1275/grub.cfg
R s/ARCH/<arch>/ grub2-ieee1275/grub.cfg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.404/data/initrd/initrd.file_list
new/installation-images-14.408/data/initrd/initrd.file_list
--- old/installation-images-14.404/data/initrd/initrd.file_list 2019-01-10
11:23:51.000000000 +0100
+++ new/installation-images-14.408/data/initrd/initrd.file_list 2019-01-31
13:57:49.000000000 +0100
@@ -68,9 +68,9 @@
/usr/lib*/samba/libwinbind-client*.so
endif
-?bcache-tools:
?biosdevname:
?bcm43xx-firmware: nodeps
+bcache-tools:
cpio:
cracklib-dict-full: ignore
curl:
@@ -88,7 +88,6 @@
mdadm:
net-tools:
?net-tools-deprecated:
-nfsidmap:
sed:
?wicked:
?s390-tools-hmcdrvfs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.404/data/initrd/theme.file_list
new/installation-images-14.408/data/initrd/theme.file_list
--- old/installation-images-14.404/data/initrd/theme.file_list 2019-01-10
11:23:51.000000000 +0100
+++ new/installation-images-14.408/data/initrd/theme.file_list 2019-01-31
13:57:49.000000000 +0100
@@ -75,7 +75,7 @@
e echo "KexecReboot: 1" >>linuxrc.config
-e echo "PTOptions: AutoUpgrade,productprofile,addon,XVideo,Screenmode"
>>linuxrc.config
+e echo "PTOptions:
AutoUpgrade,productprofile,addon,XVideo,Screenmode,specialproduct"
>>linuxrc.config
if YAST_SELFUPDATE ne ""
e echo "SelfUpdate: <YAST_SELFUPDATE>" >>linuxrc.config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.404/data/rescue/rescue.file_list
new/installation-images-14.408/data/rescue/rescue.file_list
--- old/installation-images-14.404/data/rescue/rescue.file_list 2019-01-10
11:23:51.000000000 +0100
+++ new/installation-images-14.408/data/rescue/rescue.file_list 2019-01-31
13:57:49.000000000 +0100
@@ -79,6 +79,7 @@
attr:
bash:
bc:
+bcache-tools:
bind-utils:
btrfsprogs:
bzip2:
@@ -129,7 +130,6 @@
net-tools:
?net-tools-deprecated:
netcat-openbsd:
-nfsidmap:
nscd:
ntfsprogs:
open-iscsi:
@@ -375,9 +375,14 @@
r dev/mapper dev/stderr dev/initctl
# remove grub2 *.module files, they're not needed
-r usr/lib/grub2/*/*.module
# ... and strip *.mod files
-S usr/lib/grub2/*/*.mod
+if exists(grub2, /usr/lib/grub2)
+ r usr/lib/grub2/*/*.module
+ S usr/lib/grub2/*/*.mod
+elsif exists(grub2)
+ r usr/share/grub2/*/*.module
+ S usr/share/grub2/*/*.mod
+endif
# we better have one...
e touch etc/sysconfig/kernel
