Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-02-04 15:16:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-24 10:30:18.544706976 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-02-04 17:58:00.733602130 +0100
@@ -1,0 +2,19 @@
+Mon Jan 30 13:49:02 UTC 2017 - snw...@suse.com
+
+- move grub file into x86_64-efi subdir to avoid issues mentioned in
bsc#1022294
+- copy tftp files into final position
+- use cracklib-dict-full instead of cracklib-dict-small
+- readme for x86_64
+- generic readme for all architectures
+- pxelinux startup message
+- basic pxelinux config
+- basic tftp grub2 config
+- build tftp directory
+- include sha256 sums of image files in initrd
+- load control.xml from instsys location
+- add tftp Makefile target
+- add some more config settings to $ConfigData
+- don't add package list if it's empty
+- 14.297
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.296.tar.xz
New:
----
installation-images-14.297.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.cIJbah/_old 2017-02-04 17:58:01.025560383 +0100
+++ /var/tmp/diff_new_pack.cIJbah/_new 2017-02-04 17:58:01.029559811 +0100
@@ -29,16 +29,20 @@
# === sort out branding ===
%if 0%{?is_opensuse}
%define theme openSUSE
+%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd openSUSE
%define branding_systemd openSUSE
%define branding_plymouth openSUSE
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
BuildRequires: openSUSE-release
+%ifnarch s390x
BuildRequires: xf86-input-libinput
+%endif
%else
%if 0%{?is_susecaasp}
%define theme CAASP
+%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd CASP
%define branding_systemd CAASP
%define branding_plymouth SLE
@@ -49,6 +53,7 @@
BuildRequires: caasp-release-DVD
%else
%define theme SLES
+%define product_name %{theme}-%{_target_cpu}
%define branding_skelcd SLES
%define branding_systemd SLE
%define branding_plymouth SLE
@@ -56,6 +61,7 @@
%define branding_gfxboot SLE
BuildRequires: sle12-desktop-migration
BuildRequires: sles-release
+BuildRequires: sles-release-DVD
%ifarch x86_64 ppc64le
BuildRequires: sap-installation-wizard
%endif
@@ -94,6 +100,7 @@
BuildRequires: alsa
BuildRequires: alsa-utils
BuildRequires: arabic-kacst-fonts
+BuildRequires: arphic-uming-fonts
BuildRequires: audit-libs
BuildRequires: bc
BuildRequires: bind-libs
@@ -108,7 +115,7 @@
BuildRequires: checkmedia
BuildRequires: cifs-utils
BuildRequires: cracklib
-BuildRequires: cracklib-dict-small
+BuildRequires: cracklib-dict-full
BuildRequires: cron
BuildRequires: cryptsetup
BuildRequires: cups-libs
@@ -149,6 +156,7 @@
BuildRequires: icmpinfo
BuildRequires: indic-fonts
BuildRequires: initviocons
+BuildRequires: ipa-gothic-fonts
BuildRequires: iproute2
BuildRequires: iputils
BuildRequires: iscsiuio
@@ -264,6 +272,7 @@
BuildRequires: telnet-server
BuildRequires: termcap
BuildRequires: terminfo
+BuildRequires: un-fonts
BuildRequires: usbutils
BuildRequires: util-linux
BuildRequires: util-linux-systemd
@@ -415,7 +424,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.296
+Version: 14.297
Release: 0
Provides: installation-images-%theme = %version-%release
Source: %{name}-%{version}.tar.xz
@@ -440,6 +449,18 @@
up a UML or XEN environment.
+%package -n tftpboot-installation-%{product_name}
+AutoReqProv: off
+Summary: tftp installation tree
+Group: System/Management
+BuildArch: noarch
+PreReq: /bin/ln
+
+%description -n tftpboot-installation-%{product_name}
+This package contains the kernel, initrd and installation images
+to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
+
+
%package -n installation-images-debuginfodeps
Provides: installation-images-debuginfodeps-%theme = %version-%release
Obsoletes: installation-images-debuginfodeps-%theme < %version-%release
@@ -533,6 +554,9 @@
%files -n install-initrd -f install-initrd.files
+%files -n tftpboot-installation-%{product_name}
+/srv/tftp
+
%files -n installation-images-debuginfodeps
%defattr(-,root,root)
/usr/share/debuginfodeps
++++++ installation-images-14.296.tar.xz -> installation-images-14.297.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/Makefile
new/installation-images-14.297/Makefile
--- old/installation-images-14.296/Makefile 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/Makefile 2017-01-30 14:29:43.000000000
+0100
@@ -10,41 +10,43 @@
PREFIX := installation-images-$(VERSION)
BUILD_ID := $(shell [ -f .build_id ] || bin/build_id > .build_id ; cat
.build_id)
-COMMON_TARGETS := rescue root root+rescue bind libstoragemgmt gdb
mini-iso-rmlist
+# build initrd+modules+gefrickel after tftp (it needs the sha256 sums over the
other images)
+COMMON_TARGETS := rescue root root+rescue bind libstoragemgmt gdb
mini-iso-rmlist tftp initrd+modules+gefrickel
+# keep in sync with data/boot/tftp.file_list
COMMON_INSTSYS_PARTS := config rpmlist root common rescue bind libstoragemgmt
gdb
ifneq ($(filter i386, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel boot
boot-themes $(COMMON_TARGETS) zenroot
+ALL_TARGETS := initrd-themes initrd boot boot-themes $(COMMON_TARGETS)
zenroot
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := boot/* initrd
endif
ifneq ($(filter x86_64, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel boot-grub2-efi
boot boot-themes $(COMMON_TARGETS) rescue-server zenroot
+ALL_TARGETS := initrd-themes initrd boot-grub2-efi boot boot-themes
$(COMMON_TARGETS) rescue-server zenroot
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := boot/* initrd efi
endif
ifneq ($(filter ia64, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules boot-efi $(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd boot-efi $(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := initrd efi
endif
ifneq ($(filter s390 s390x, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel
$(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd $(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := initrd
endif
ifneq ($(filter aarch64, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel boot
boot-grub2-efi boot-themes $(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd boot boot-grub2-efi boot-themes
$(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := boot/* initrd efi
endif
ifneq ($(filter ppc ppc64 ppc64le, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel
boot-grub2-powerpc $(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd boot-grub2-powerpc $(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS :=
endif
@@ -57,7 +59,7 @@
.PHONY: all dirs base fbase biostest initrd \
boot boot-efi root rescue root+rescue gdb bind libstoragemgmt clean \
- boot-themes initrd-themes zenroot install \
+ boot-themes initrd-themes zenroot tftp install \
install-initrd mini-iso-rmlist debuginfo cd1 iso
all: $(ALL_TARGETS) VERSION changelog
@@ -102,6 +104,7 @@
theme=$(THEMES) bin/mlist2
rm -rf tmp/initrd/modules tmp/initrd/lib/modules
theme=$(THEMES) mode=add tmpdir=initrd image=modules src=initrd fs=none
bin/mk_image
+ theme=$(THEMES) mode=add tmpdir=initrd image=digests 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}
@@ -115,6 +118,7 @@
# work on a copy to not modify the origial tree
cp -a tmp/initrd tmp/initrd_gefrickel
theme=$(THEMES) mode=add tmpdir=initrd_gefrickel image=modules
src=initrd fs=none bin/mk_image
+ theme=$(THEMES) mode=add tmpdir=initrd_gefrickel image=digests
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}
@@ -147,6 +151,15 @@
boot: base
theme=$(THEMES) image=boot fs=dir bin/mk_image
+tftp: base
+ mkdir -p data/boot/gen
+ rm -f data/boot/gen/rpm.file_list
+ for i in `cat images/rpmlist` ; do \
+ echo -e "$$i:\n X <rpm_file> <tftp_dir>/<instsys_dir>\n" >>
data/boot/gen/rpm.file_list; \
+ done
+ theme=$(THEMES) image=tftp src=boot fs=dir bin/mk_image
+ rm -f images/tftp/{.packages.tftp,content}
+
root: base
theme=$(THEMES) libdeps=root,initrd image=root bin/mk_image
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/VERSION
new/installation-images-14.297/VERSION
--- old/installation-images-14.296/VERSION 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/VERSION 2017-01-30 14:29:43.000000000
+0100
@@ -1 +1 @@
-14.296
+14.297
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/bin/mk_image
new/installation-images-14.297/bin/mk_image
--- old/installation-images-14.296/bin/mk_image 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/bin/mk_image 2017-01-30 14:29:43.000000000
+0100
@@ -78,7 +78,7 @@
AddFiles $tmpdir, "${srcdir}/$fl.file_list", $srcdir, $dangling_links or
die "$Script: failed to setup image";
- if(-f "$tmpdir.rpmlog") {
+ if(-s "$tmpdir.rpmlog") {
SUSystem "chmod 777 $tmpdir";
SUSystem "perl -pe 's/\\[(.*?)\\].*/\$1/' $tmpdir.rpmlog | sort -u
>$tmpdir/.packages.$fl";
SUSystem "cp $tmpdir.rpmlog $tmpdir/.packages.$fl";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/changelog
new/installation-images-14.297/changelog
--- old/installation-images-14.296/changelog 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/changelog 2017-01-30 14:29:43.000000000
+0100
@@ -1,3 +1,19 @@
+2017-01-30: 14.297
+ - move grub file into x86_64-efi subdir to avoid issues mentioned in
bsc #1022294
+ - copy tftp files into final position
+ - use cracklib-dict-full instead of cracklib-dict-small
+ - readme for x86_64
+ - generic readme for all architectures
+ - pxelinux startup message
+ - basic pxelinux config
+ - basic tftp grub2 config
+ - build tftp directory
+ - include sha256 sums of image files in initrd
+ - load control.xml from instsys location
+ - add tftp Makefile target
+ - add some more config settings to $ConfigData
+ - don't add package list if it's empty
+
2017-01-19: 14.296
- remove xf86-video-vmware (bsc #1020649)
- drop glibc-32bit dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/base/base.file_list
new/installation-images-14.297/data/base/base.file_list
--- old/installation-images-14.296/data/base/base.file_list 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/data/base/base.file_list 2017-01-30
14:29:43.000000000 +0100
@@ -54,7 +54,7 @@
ca-certificates-mozilla:
coreutils:
cpio:
-cracklib-dict-small:
+cracklib-dict-full:
cracklib:
device-mapper:
diffutils:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/boot/grub_tftp.cfg
new/installation-images-14.297/data/boot/grub_tftp.cfg
--- old/installation-images-14.296/data/boot/grub_tftp.cfg 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/grub_tftp.cfg 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,15 @@
+gfxmode=auto
+timeout=5
+default=1
+
+locale_dir=$prefix/locale
+lang=en_US
+
+menuentry 'Installation' {
+ set gfxpayload=keep
+ echo 'Loading kernel ...'
+ linuxefi $prefix/DIR/linux instsys=tftp://TFTP_SERVER/INSTSYS
install=REPO_URL
+ echo 'Loading initrd ...'
+ initrdefi $prefix/DIR/initrd
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/boot/message-pxe
new/installation-images-14.297/data/boot/message-pxe
--- old/installation-images-14.296/data/boot/message-pxe 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/message-pxe 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,10 @@
+
+
+product_name
+
+
+To start enter 'linux', followed by boot options, and press <return>.
+
+
+Have a lot of fun...
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/boot/pxelinux.cfg
new/installation-images-14.297/data/boot/pxelinux.cfg
--- old/installation-images-14.296/data/boot/pxelinux.cfg 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/pxelinux.cfg 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,12 @@
+default linux
+
+# install
+label linux
+ ipappend 2
+ kernel DIR/linux
+ append initrd=DIR/initrd instsys=tftp://TFTP_SERVER/INSTSYS install=REPO_URL
+
+display DIR/message
+implicit 1
+prompt 1
+timeout 50
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/boot/readme_tftp
new/installation-images-14.297/data/boot/readme_tftp
--- old/installation-images-14.296/data/boot/readme_tftp 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/readme_tftp 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,16 @@
+There is no boot loader configurations prepared.
+
+To use this directory to start an installation, note:
+
+- kernel is DIR/linux
+
+- initrd is DIR/initrd
+
+- kernel options should contain these two options:
+ instsys=tftp://TFTP_SERVER/INSTSYS
+ install=REPO_URL
+
+- replace TFTP_SERVER with your actual tftp server address
+
+- replace REPO_URL with the URL of the repository you want to install
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.296/data/boot/readme_tftp.x86_64
new/installation-images-14.297/data/boot/readme_tftp.x86_64
--- old/installation-images-14.296/data/boot/readme_tftp.x86_64 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/readme_tftp.x86_64 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,14 @@
+There are two boot loader configurations prepared:
+
+1. boot via legacy BIOS with pxelinux
+ - boot file: pxelinux.0
+ - boot loader config file: pxelinux.cfg/default
+
+2. boot via UEFI BIOS with grub2
+ - boot file: x86_64-efi/bootx64.efi
+ - boot loader config file: grub.cfg
+
+Edit the boot loader config file to suit your needs:
+ - replace TFTP_SERVER with your actual tftp server address
+ - replace REPO_URL with the URL of the repository you want to install
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/boot/tftp.file_list
new/installation-images-14.297/data/boot/tftp.file_list
--- old/installation-images-14.296/data/boot/tftp.file_list 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/boot/tftp.file_list 2017-01-30
14:29:43.000000000 +0100
@@ -0,0 +1,72 @@
+tftp_dir = <product_short>-<arch>
+instsys_dir = boot/<arch>
+kernel_dir = <instsys_dir>
+
+d <tftp_dir>/<kernel_dir>
+
+x readme_tftp <tftp_dir>/README
+if arch eq 'x86_64'
+ x readme_tftp.x86_64 <tftp_dir>/README
+endif
+R s#DIR#<kernel_dir>#g <tftp_dir>/README
+R s#INSTSYS#<tftp_dir>/<instsys_dir>/root#g <tftp_dir>/README
+
+# create pxelinux config
+if exists(syslinux)
+ d <tftp_dir>/pxelinux.cfg
+
+ syslinux:
+ m /usr/share/syslinux/pxelinux.0 <tftp_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 message-pxe <tftp_dir>/<kernel_dir>/message
+ R s#product_name#<product_name>#g <tftp_dir>/<kernel_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
+endif
+
+include gen/rpm.file_list
+
+skelcd-control-<skelcd_ctrl_theme>:
+ m CD1/control.xml <tftp_dir>/<instsys_dir>
+
+:
+
+# keep in sync with Makefile::COMMON_INSTSYS_PARTS
+X <image_path>/config <tftp_dir>/<instsys_dir>
+X <image_path>/root <tftp_dir>/<instsys_dir>
+X <image_path>/common <tftp_dir>/<instsys_dir>
+X <image_path>/rescue <tftp_dir>/<instsys_dir>
+X <image_path>/bind <tftp_dir>/<instsys_dir>
+X <image_path>/libstoragemgmt <tftp_dir>/<instsys_dir>
+X <image_path>/gdb <tftp_dir>/<instsys_dir>
+
+# generate digests in 'content' file style
+e cd <tftp_dir>; sha256sum <instsys_dir>/* | sed -e "s/^/HASH SHA256 /"
>../content
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.296/data/initrd/digests.file_list
new/installation-images-14.297/data/initrd/digests.file_list
--- old/installation-images-14.296/data/initrd/digests.file_list
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.297/data/initrd/digests.file_list
2017-01-30 14:29:43.000000000 +0100
@@ -0,0 +1,5 @@
+# *** assumes tftp tree has been built ***
+
+d etc/linuxrc.d
+
+X <tmp_path>/tftp/content etc/linuxrc.d/01_digests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.296/data/initrd/initrd.file_list
new/installation-images-14.297/data/initrd/initrd.file_list
--- old/installation-images-14.296/data/initrd/initrd.file_list 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/data/initrd/initrd.file_list 2017-01-30
14:29:43.000000000 +0100
@@ -68,7 +68,7 @@
?biosdevname:
cpio:
-cracklib-dict-small:
+cracklib-dict-full: ignore
curl:
device-mapper:
ethtool:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.296/data/rescue/rescue.file_list
new/installation-images-14.297/data/rescue/rescue.file_list
--- old/installation-images-14.296/data/rescue/rescue.file_list 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/data/rescue/rescue.file_list 2017-01-30
14:29:43.000000000 +0100
@@ -84,7 +84,7 @@
cifs-utils:
coreutils:
cpio:
-cracklib-dict-small:
+cracklib-dict-full:
cracklib:
cryptsetup:
?libcryptsetup4-hmac:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/data/root/config
new/installation-images-14.297/data/root/config
--- old/installation-images-14.296/data/root/config 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/data/root/config 2017-01-30
14:29:43.000000000 +0100
@@ -1,5 +1,6 @@
-root: common root cracklib-dict-full.rpm bind
?yast2-trans-<lang>.rpm
+root: common root cracklib-dict-full.rpm bind
?yast2-trans-<lang>.rpm ?configfiles
rescue: common rescue ?cracklib-dict-full.rpm
+configfiles: control.xml?copy=1
yast2-trans-ar.rpm: yast2-trans-ar.rpm
yast2-trans-bn.rpm: yast2-trans-bn.rpm
yast2-trans-gu.rpm: yast2-trans-gu.rpm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/install.aarch64
new/installation-images-14.297/install.aarch64
--- old/installation-images-14.296/install.aarch64 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/install.aarch64 2017-01-30
14:29:43.000000000 +0100
@@ -30,3 +30,10 @@
mkdir -p $DESTDIR/usr/share
cp images/mini-iso-rmlist $DESTDIR/usr/share
+if [ -d images/tftp ] ; then
+ dst=$DESTDIR/srv/tftp
+ mkdir -p $dst
+ cp -a images/tftp/* $dst
+ cp images/boot/linux $dst/*/boot/$ARCH
+ cp images/$THEMES/initrd $dst/*/boot/$ARCH
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/install.i386
new/installation-images-14.297/install.i386
--- old/installation-images-14.296/install.i386 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/install.i386 2017-01-30 14:29:43.000000000
+0100
@@ -72,30 +72,30 @@
cp images/mini-iso-rmlist $DESTDIR/usr/share
if [ -f images/rescue-server ] ; then
- t=openSUSE
- [ -d $DESTDIR/branding/SLES ] && t=SLES
- [ -d $DESTDIR/branding/SLED ] && t=SLED
- [ -d $DESTDIR/branding/CAASP ] && t=CAASP
dst=$DESTDIR/usr/share/rescue-server/boot/x86_64
mkdir -p $dst
cp images/rescue-server $dst
echo "rescue: rescue-server" >$dst/config
- cp -a $DESTDIR/CD1/boot/$ARCH/loader
$DESTDIR/branding/$t/CD1/boot/$ARCH/loader $dst
+ cp -a $DESTDIR/CD1/boot/$ARCH/loader
$DESTDIR/branding/$THEMES/CD1/boot/$ARCH/loader $dst
cp data/boot/syslinux-rescue.cfg $dst/loader/isolinux.cfg
fi
if [ -f images/zenroot ] ; then
- t=openSUSE
- [ -d $DESTDIR/branding/SLES ] && t=SLES
- [ -d $DESTDIR/branding/SLED ] && t=SLED
- [ -d $DESTDIR/branding/CAASP ] && t=CAASP
dst=$DESTDIR/branding/Zen/CD1/boot/x86_64
mkdir -p $dst
cp images/zenroot $dst/root
echo "root: root" >$dst/config
- cp -a $DESTDIR/CD1/boot/$ARCH/loader $DESTDIR/branding/$t/CD1/boot/$ARCH/*
$dst
- [ -d "$DESTDIR/branding/$t/CD1/EFI" ] && cp -a $DESTDIR/branding/$t/CD1/EFI
$DESTDIR/branding/Zen/CD1
+ cp -a $DESTDIR/CD1/boot/$ARCH/loader
$DESTDIR/branding/$THEMES/CD1/boot/$ARCH/* $dst
+ [ -d "$DESTDIR/branding/$THEMES/CD1/EFI" ] && cp -a
$DESTDIR/branding/$THEMES/CD1/EFI $DESTDIR/branding/Zen/CD1
cp data/boot/syslinux-zen.cfg $dst/loader/isolinux.cfg
cp data/boot/message-zen $dst/loader/message
fi
+if [ -d images/tftp ] ; then
+ dst=$DESTDIR/srv/tftp
+ mkdir -p $dst
+ cp -a images/tftp/* $dst
+ cp images/boot/loader/linux $dst/*/boot/$ARCH
+ cp images/$THEMES/initrd $dst/*/boot/$ARCH
+fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/install.ppc
new/installation-images-14.297/install.ppc
--- old/installation-images-14.296/install.ppc 2017-01-19 12:16:46.000000000
+0100
+++ new/installation-images-14.297/install.ppc 2017-01-30 14:29:43.000000000
+0100
@@ -39,3 +39,9 @@
mkdir -p $DESTDIR/usr/share
cp images/mini-iso-rmlist $DESTDIR/usr/share
+if [ -d images/tftp ] ; then
+ dst=$DESTDIR/srv/tftp
+ mkdir -p $dst
+ cp -a images/tftp/* $dst
+ cp $DESTDIR/branding/$THEMES/CD1/boot/$ARCH/{linux,initrd} $dst/*/boot/$ARCH
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/install.s390x
new/installation-images-14.297/install.s390x
--- old/installation-images-14.296/install.s390x 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/install.s390x 2017-01-30
14:29:43.000000000 +0100
@@ -45,3 +45,9 @@
mkdir -p $DESTDIR/usr/share
cp images/mini-iso-rmlist $DESTDIR/usr/share
+if [ -d images/tftp ] ; then
+ dst=$DESTDIR/srv/tftp
+ mkdir -p $dst
+ cp -a images/tftp/* $dst
+ cp $DESTDIR/branding/$THEMES/CD1/boot/$ARCH/{linux,initrd} $dst/*/boot/$ARCH
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.296/lib/ReadConfig.pm
new/installation-images-14.297/lib/ReadConfig.pm
--- old/installation-images-14.296/lib/ReadConfig.pm 2017-01-19
12:16:46.000000000 +0100
+++ new/installation-images-14.297/lib/ReadConfig.pm 2017-01-30
14:29:43.000000000 +0100
@@ -884,6 +884,9 @@
$ConfigData{os}{product_mini} = $product_mini;
+ $ConfigData{os}{product_short} = $config{NAME};
+ $ConfigData{os}{product_short} .= "-$config{VERSION}" if $config{VERSION};
+
# get dist tag for driver updates
my $dist = "\L$config{NAME}";
@@ -1223,6 +1226,9 @@
$i = $dist;
+ $ConfigData{tmp_path} = "${BasePath}tmp";
+ $ConfigData{image_path} = $ImagePath;
+
$ConfigData{cache_dir} = getcwd() . "/${BasePath}cache/$ConfigData{dist}";
$ConfigData{tmp_cache_dir} = getcwd() .
"/${BasePath}tmp/cache/$ConfigData{dist}";
system "mkdir -p $ConfigData{tmp_cache_dir}/.rpms" unless -d
"$ConfigData{tmp_cache_dir}/.rpms";
@@ -1277,6 +1283,8 @@
}
$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{update_dir} = $ConfigData{os}{update};
$ConfigData{load_image} = $load_image;
@@ -1299,7 +1307,7 @@
$kmp = "";
}
- print "--- Building for $ConfigData{product_name} $ConfigData{arch}
[$ConfigData{lib}], theme $ConfigData{theme}\n";
+ print "--- Building for $ConfigData{product_name}
($ConfigData{product_short}) $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};
