Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-02-22 13:44:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-02-20 14:30:50.555972934 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-02-22 13:44:19.610968223 +0100
@@ -1,0 +2,7 @@
+Mon Feb 20 17:15:25 UTC 2017 - [email protected]
+
+- fix install script to move the correct files (fate#322275)
+- enhance tftpboot-installation package to include all files needed to build
our installation iso
+- 14.302
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.301.tar.xz
New:
----
installation-images-14.302.tar.xz
installation-images-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.GuIt3d/_old 2017-02-22 13:44:20.302869672 +0100
+++ /var/tmp/diff_new_pack.GuIt3d/_new 2017-02-22 13:44:20.302869672 +0100
@@ -1,7 +1,7 @@
#
# spec file for package installation-images
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -60,14 +60,16 @@
%define branding_grub2 SLE
%define branding_gfxboot SLE
%define config_yast_selfupdate 0
-BuildRequires: sle12-desktop-migration
BuildRequires: sles-release
BuildRequires: sles-release-DVD
+%if 0%{?sle_version} != 0130000
+BuildRequires: sle12-desktop-migration
%ifarch x86_64 ppc64le
BuildRequires: sap-installation-wizard
%endif
%endif
%endif
+%endif
BuildRequires: skelcd-control-%branding_skelcd
BuildRequires: systemd-presets-branding-%branding_systemd
@@ -423,10 +425,11 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.301
+Version: 14.302
Release: 0
Provides: installation-images-%theme = %version-%release
Source: %{name}-%{version}.tar.xz
+Source1: %{name}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.301.tar.xz -> installation-images-14.302.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/VERSION
new/installation-images-14.302/VERSION
--- old/installation-images-14.301/VERSION 2017-02-20 11:53:12.000000000
+0100
+++ new/installation-images-14.302/VERSION 2017-02-20 18:14:38.000000000
+0100
@@ -1 +1 @@
-14.301
+14.302
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/changelog
new/installation-images-14.302/changelog
--- old/installation-images-14.301/changelog 2017-02-20 11:53:12.000000000
+0100
+++ new/installation-images-14.302/changelog 2017-02-20 18:14:38.000000000
+0100
@@ -1,3 +1,7 @@
+2017-02-20: 14.302
+ - fix install script to move the correct files (fate #322275)
+ - enhance tftpboot-installation package to include all files needed to
build our installation iso
+
2017-02-20: 14.301
- adjust 'boot from harddisk' to also work on caasp systems (bsc
#1025851)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/data/boot/grub_tftp.cfg
new/installation-images-14.302/data/boot/grub_tftp.cfg
--- old/installation-images-14.301/data/boot/grub_tftp.cfg 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/data/boot/grub_tftp.cfg 2017-02-20
18:14:38.000000000 +0100
@@ -2,7 +2,7 @@
timeout=5
default=1
-locale_dir=$prefix/locale
+locale_dir=$prefix/grub.locale
lang=en_US
menuentry 'Installation' {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/data/boot/pxelinux.cfg
new/installation-images-14.302/data/boot/pxelinux.cfg
--- old/installation-images-14.301/data/boot/pxelinux.cfg 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/data/boot/pxelinux.cfg 2017-02-20
18:14:38.000000000 +0100
@@ -6,7 +6,7 @@
kernel DIR/linux
append initrd=DIR/initrd instsys=tftp://TFTP_SERVER/INSTSYS install=REPO_URL
-display DIR/message
+display message
implicit 1
prompt 1
timeout 50
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.301/data/boot/readme_tftp.x86_64
new/installation-images-14.302/data/boot/readme_tftp.x86_64
--- old/installation-images-14.301/data/boot/readme_tftp.x86_64 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/data/boot/readme_tftp.x86_64 2017-02-20
18:14:38.000000000 +0100
@@ -1,12 +1,17 @@
-There are two boot loader configurations prepared:
+This directory contains the set of files needed to prepare SUSE installation
+media. The files are stored within the 'EFI' and 'boot' directories.
+
+The 'net' directory contains the network config needed to run a tftp
+installation server. Sample configurations are provided for both UEFI and
+legacy BIOS ('PXE').
1. boot via legacy BIOS with pxelinux
- - boot file: pxelinux.0
- - boot loader config file: pxelinux.cfg/default
+ - boot file: net/pxelinux.0
+ - boot loader config file: net/pxelinux.cfg/default
2. boot via UEFI BIOS with grub2
- - boot file: x86_64-efi/bootx64.efi
- - boot loader config file: grub.cfg
+ - boot file: net/x86_64-efi/bootx64.efi
+ - boot loader config file: net/grub.cfg
Edit the boot loader config file to suit your needs:
- replace TFTP_SERVER with your actual tftp server address
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/data/boot/tftp.file_list
new/installation-images-14.302/data/boot/tftp.file_list
--- old/installation-images-14.301/data/boot/tftp.file_list 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/data/boot/tftp.file_list 2017-02-20
18:14:38.000000000 +0100
@@ -1,11 +1,15 @@
tftp_dir = <product_short>-<arch>
+net_dir = <tftp_dir>/net
instsys_dir = boot/<arch>
kernel_dir = <instsys_dir>
+if arch eq 'x86_64' || arch eq 'i386'
+ kernel_dir = <kernel_dir>/loader
+endif
-d <tftp_dir>/<kernel_dir>
+d <net_dir>
x readme_tftp <tftp_dir>/README
-if arch eq 'x86_64'
+if arch eq 'x86_64' || arch eq 'i386'
x readme_tftp.x86_64 <tftp_dir>/README
endif
R s#DIR#<kernel_dir>#g <tftp_dir>/README
@@ -13,45 +17,36 @@
# create pxelinux config
if exists(syslinux)
- d <tftp_dir>/pxelinux.cfg
+ d <net_dir>/pxelinux.cfg
syslinux:
- m /usr/share/syslinux/pxelinux.0 <tftp_dir>
+ m /usr/share/syslinux/pxelinux.0 <net_dir>
- x pxelinux.cfg <tftp_dir>/pxelinux.cfg/default
- R s#DIR#<kernel_dir>#g <tftp_dir>/pxelinux.cfg/default
- R s#INSTSYS#<tftp_dir>/<instsys_dir>/root#g <tftp_dir>/pxelinux.cfg/default
+ x pxelinux.cfg <net_dir>/pxelinux.cfg/default
+ R s#DIR#<kernel_dir>#g <net_dir>/pxelinux.cfg/default
+ R s#INSTSYS#<tftp_dir>/<instsys_dir>/root#g <net_dir>/pxelinux.cfg/default
- x message-pxe <tftp_dir>/<kernel_dir>/message
- R s#product_name#<product_name>#g <tftp_dir>/<kernel_dir>/message
+ x message-pxe <net_dir>/message
+ R s#product_name#<product_name>#g <net_dir>/message
endif
# create grub2 config
if exists(grub2-x86_64-efi)
- efi_dir = <tftp_dir>/x86_64-efi
- locale_dir = <tftp_dir>/locale
- d <efi_dir> <locale_dir>
- grub2-x86_64-efi:
- a usr/lib64/efi/grub.efi <efi_dir>/bootx64.efi
-
- # if we have shim, use it
- if exists(shim)
- e mv <efi_dir>/bootx64.efi <efi_dir>/grub.efi
- shim:
- a /usr/lib64/efi/shim.efi <efi_dir>/bootx64.efi
- a /usr/lib64/efi/MokManager.efi <efi_dir>
- endif
-
- x grub_tftp.cfg <tftp_dir>/grub.cfg
- R s#DIR#<kernel_dir>#g <tftp_dir>/grub.cfg
- R s#INSTSYS#<tftp_dir>/<instsys_dir>/root#g <tftp_dir>/grub.cfg
-
- x grub2_head.po .
- R s/product_name/<product_name>/ grub2_head.po
- e msgfmt -o <locale_dir>/en_US.mo grub2_head.po
- r grub2_head.po
+ efi_dir = <net_dir>/x86_64-efi
+ d <efi_dir>
+ s ../boot <net_dir>
+ s ../EFI/BOOT/locale <net_dir>/grub.locale
+ s ../../EFI/BOOT/MokManager.efi <efi_dir>
+ s ../../EFI/BOOT/bootx64.efi <efi_dir>
+ s ../../EFI/BOOT/grub.efi <efi_dir>
+
+ x grub_tftp.cfg <net_dir>/grub.cfg
+ R s#DIR#<kernel_dir>#g <net_dir>/grub.cfg
+ R s#INSTSYS#<tftp_dir>/<instsys_dir>/root#g <net_dir>/grub.cfg
endif
+d <tftp_dir>/<instsys_dir>
+
include gen/rpm.file_list
skelcd-control-<skelcd_ctrl_theme>:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/install.aarch64
new/installation-images-14.302/install.aarch64
--- old/installation-images-14.301/install.aarch64 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/install.aarch64 2017-02-20
18:14:38.000000000 +0100
@@ -34,6 +34,6 @@
dst=$DESTDIR/srv/tftpboot
mkdir -p $dst
cp -a images/tftp/* $dst
- cp images/boot/linux $dst/*/boot/$ARCH
- cp images/$THEMES/initrd $dst/*/boot/$ARCH
+ cp -a $DESTDIR/CD1/* $dst/*
+ cp -a $DESTDIR/branding/$THEMES/CD1/* $dst/*
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/install.i386
new/installation-images-14.302/install.i386
--- old/installation-images-14.301/install.i386 2017-02-20 11:53:12.000000000
+0100
+++ new/installation-images-14.302/install.i386 2017-02-20 18:14:38.000000000
+0100
@@ -95,7 +95,7 @@
dst=$DESTDIR/srv/tftpboot
mkdir -p $dst
cp -a images/tftp/* $dst
- cp images/boot/loader/linux $dst/*/boot/$ARCH
- cp images/$THEMES/initrd $dst/*/boot/$ARCH
+ cp -a $DESTDIR/CD1/* $dst/*
+ cp -a $DESTDIR/branding/$THEMES/CD1/* $dst/*
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/install.ppc
new/installation-images-14.302/install.ppc
--- old/installation-images-14.301/install.ppc 2017-02-20 11:53:12.000000000
+0100
+++ new/installation-images-14.302/install.ppc 2017-02-20 18:14:38.000000000
+0100
@@ -43,5 +43,6 @@
dst=$DESTDIR/srv/tftpboot
mkdir -p $dst
cp -a images/tftp/* $dst
- cp $DESTDIR/branding/$THEMES/CD1/boot/$ARCH/{linux,initrd} $dst/*/boot/$ARCH
+ cp -a $DESTDIR/CD1/* $dst/*
+ cp -a $DESTDIR/branding/$THEMES/CD1/* $dst/*
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.301/install.s390x
new/installation-images-14.302/install.s390x
--- old/installation-images-14.301/install.s390x 2017-02-20
11:53:12.000000000 +0100
+++ new/installation-images-14.302/install.s390x 2017-02-20
18:14:38.000000000 +0100
@@ -49,5 +49,6 @@
dst=$DESTDIR/srv/tftpboot
mkdir -p $dst
cp -a images/tftp/* $dst
- cp $DESTDIR/branding/$THEMES/CD1/boot/$ARCH/{linux,initrd} $dst/*/boot/$ARCH
+ cp -a $DESTDIR/CD1/* $dst/*
+ cp -a $DESTDIR/branding/$THEMES/CD1/* $dst/*
fi
++++++ installation-images-rpmlintrc ++++++
addFilter("arch-independent-package-contains-binary-or-object ")
