Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2019-10-28 16:46:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Mon Oct 28 16:46:01 2019 rev:15 rq:742192 version:1.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2019-09-25 01:48:20.097602706 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.2990/kiwi-boot-descriptions.changes
2019-10-28 16:46:04.500678639 +0100
@@ -1,0 +2,9 @@
+Wed Oct 16 14:40:37 UTC 2019 - Marcus Schaefer <[email protected]>
+
+- Fixed ISO Application ID match
+
+ When creating ISO's with xorriso the application ID is stored
+ upper case. The match in this code did not care for this and
+ failed the match.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.WPa3sW/_old 2019-10-28 16:46:05.520679936 +0100
+++ /var/tmp/diff_new_pack.WPa3sW/_new 2019-10-28 16:46:05.524679942 +0100
@@ -155,7 +155,7 @@
Requires: checkmedia
Requires: dosfstools
Requires: jing
-%if 0%{suse_version} >= 1500
+%if 0%{?suse_version} >= 1500
Requires: mkisofs
%else
Requires: genisoimage
++++++ kiwi-boot-descriptions.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/x86_64/oemboot/dump
new/custom_boot/arch/x86_64/oemboot/dump
--- old/custom_boot/arch/x86_64/oemboot/dump 2019-07-17 14:40:41.705222137
+0200
+++ new/custom_boot/arch/x86_64/oemboot/dump 2019-09-30 11:57:03.239050577
+0200
@@ -855,11 +855,12 @@
test -e /usr/bin/mst || cp /usr/bin/tail /usr/bin/mst
(
touch recovery.tar.gz
- tar --numeric-owner -czpf recovery.tar.gz . \
+ tar --numeric-owner \
--exclude "./dev" \
--exclude "./proc" \
--exclude "./sys" \
- --exclude "./recovery.*" &
+ --exclude "./recovery.*" \
+ -czpf recovery.tar.gz . &
rPID=$!
while kill -0 $rPID &>/dev/null;do
rReady=$(stat --format="%s" ./recovery.tar.gz)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/x86_64/oemboot/repart
new/custom_boot/arch/x86_64/oemboot/repart
--- old/custom_boot/arch/x86_64/oemboot/repart 2019-07-17 14:40:41.705222137
+0200
+++ new/custom_boot/arch/x86_64/oemboot/repart 2019-09-30 11:57:03.239050577
+0200
@@ -710,11 +710,12 @@
else
pushd /reco-root
Echo "Creating recovery root tarball..."
- tar --numeric-owner -czpf /reco-save/recovery.tar.gz . \
+ tar --numeric-owner \
--exclude "./dev" \
--exclude "./proc" \
--exclude "./sys" \
- --exclude "./recovery.*"
+ --exclude "./recovery.*" \
+ -czpf /reco-save/recovery.tar.gz .
popd
fi
mkdir /reco-save/boot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.sh
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.sh
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.sh 2019-07-17
14:40:41.709222157 +0200
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#!/bin/bash
-#================
-# FILE : config.sh
-#----------------
-# PROJECT : openSUSE KIWI Image System
-# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
-# :
-# AUTHOR : Marcus Schaefer <[email protected]>
-# :
-# BELONGS TO : Operating System images
-# :
-# DESCRIPTION : configuration script for SUSE based
-# : operating systems
-# :
-# :
-# STATUS : BETA
-#----------------
-#======================================
-# Functions...
-#--------------------------------------
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-#======================================
-# Greeting...
-#--------------------------------------
-echo "Configure image: [$kiwi_iname]..."
-
-#======================================
-# Keep UTF-8 locale
-#--------------------------------------
-baseStripLocales \
- $(for i in $(echo $kiwi_language | tr "," " ");do echo -n "$i.utf8 ";done)
-baseStripTranslations kiwi.mo
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.xml
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.xml
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.xml
2019-07-17 14:40:41.709222157 +0200
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/config.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="6.8" name="initrd-oemboot-suse-leap-15.0">
- <description type="boot">
- <author>Marcus Schaefer</author>
- <contact>[email protected]</contact>
- <specification>boot/initrd image used on OEM VMX disk</specification>
- </description>
- <preferences>
- <type image="cpio" bootprofile="default" bootkernel="std"/>
- <version>2.15.1</version>
- <packagemanager>zypper</packagemanager>
- <rpm-check-signatures>false</rpm-check-signatures>
- </preferences>
- <profiles>
- <profile name="default" description="Booting default setup"/>
- <profile name="custom" description="KERNEL: specified by bootinclude
in system XML"/>
- <profile name="xen" description="Xen drivers and grub2 modules"/>
- <profile name="std" description="KERNEL: Default"/>
- </profiles>
- <drivers>
- <file name="crypto/*"/>
- <file name="drivers/acpi/*"/>
- <file name="drivers/acpi/dock.ko"/>
- <file name="drivers/ata/*"/>
- <file name="drivers/block/brd.ko"/>
- <file name="drivers/block/cciss.ko"/>
- <file name="drivers/block/loop.ko"/>
- <file name="drivers/block/virtio_blk.ko"/>
- <file name="drivers/cdrom/*"/>
- <file name="drivers/char/hw_random/virtio-rng.ko"/>
- <file name="drivers/char/lp.ko"/>
- <file name="drivers/firmware/edd.ko"/>
- <file name="drivers/gpu/drm/*"/>
- <file name="drivers/hid/*"/>
- <file name="drivers/hv/*"/>
- <file name="drivers/hwmon/*"/>
- <file name="drivers/ide/*"/>
- <file name="drivers/input/keyboard/*"/>
- <file name="drivers/input/mouse/*"/>
- <file name="drivers/md/*"/>
- <file name="drivers/message/fusion/*"/>
- <file name="drivers/net/*"/>
- <file name="drivers/nvme/*"/>
- <file name="drivers/nvmem/*"/>
- <file name="drivers/parport/*"/>
- <file name="drivers/scsi/*"/>
- <file name="drivers/staging/hv/*"/>
- <file name="drivers/thermal/*"/>
- <file name="drivers/usb/*"/>
- <file name="drivers/virtio/*"/>
- <file name="fs/binfmt_aout.ko"/>
- <file name="fs/binfmt_misc.ko"/>
- <file name="fs/overlayfs/*"/>
- <file name="fs/btrfs/*"/>
- <file name="fs/exportfs/*"/>
- <file name="fs/ext2/*"/>
- <file name="fs/ext3/*"/>
- <file name="fs/ext4/*"/>
- <file name="fs/fat/*"/>
- <file name="fs/fuse/*"/>
- <file name="fs/hfs/*"/>
- <file name="fs/jbd/*"/>
- <file name="fs/jbd2/*"/>
- <file name="fs/mbcache.ko"/>
- <file name="fs/nls/nls_cp437.ko"/>
- <file name="fs/nls/nls_iso8859-1.ko"/>
- <file name="fs/nls/nls_utf8.ko"/>
- <file name="fs/quota_v1.ko"/>
- <file name="fs/quota_v2.ko"/>
- <file name="fs/squashfs/*"/>
- <file name="fs/udf/*"/>
- <file name="fs/vfat/*"/>
- <file name="fs/xfs/*"/>
- <file name="fs/isofs/*"/>
- <file name="lib/crc-t10dif.ko"/>
- <file name="lib/crc16.ko"/>
- <file name="lib/libcrc32c.ko"/>
- <file name="lib/zlib_deflate/zlib_deflate.ko"/>
- <file name="net/packet/*"/>
- </drivers>
- <drivers profiles="xen">
- <file name="drivers/xen/*"/>
- <file name="drivers/block/xen-blkfront.ko"/>
- <file name="drivers/net/xen-netfront.ko"/>
- <file name="drivers/scsi/xen-scsifront.ko"/>
- <file name="drivers/input/misc/xen-kbdfront.ko"/>
- <file name="drivers/pci/xen-pcifront.ko"/>
- </drivers>
- <repository type="yast2">
- <source path="obs://inherited_from_system_image_description"/>
- </repository>
- <packages type="image" profiles="std">
- <package name="kernel-default"/>
- </packages>
- <packages type="image" profiles="xen">
- <package name="grub2-x86_64-xen" arch="x86_64"/>
- </packages>
- <packages type="image" profiles="custom"/>
- <packages type="bootstrap">
- <package name="udev"/>
- <package name="filesystem"/>
- <package name="glibc-locale"/>
- <package name="ca-certificates"/>
- <package name="openSUSE-release"/>
- </packages>
- <packages type="image">
- <package name="kbd"/>
- <package name="gptfdisk"/>
- <package name="adaptec-firmware"/>
- <package name="atftp"/>
- <package name="bc"/>
- <package name="bind-libs"/>
- <package name="bind-utils"/>
- <package name="btrfsprogs"/>
- <package name="busybox"/>
- <package name="bzip2"/>
- <package name="cryptsetup"/>
- <package name="curl"/>
- <package name="dialog"/>
- <package name="dmraid"/>
- <package name="dosfstools"/>
- <package name="e2fsprogs"/>
- <package name="fbiterm"/>
- <package name="file"/>
- <package name="fribidi"/>
- <package name="mkisofs"/>
- <package name="gettext-runtime"/>
- <package name="grub2"/>
- <package name="grub2-x86_64-efi" arch="x86_64"/>
- <package name="grub2-i386-efi" arch="i686"/>
- <package name="grub2-i386-efi" arch="i586"/>
- <package name="grub2-i386-pc"/>
- <package name="shim" arch="x86_64"/>
- <package name="hwinfo"/>
- <package name="iputils"/>
- <package name="kernel-firmware"/>
- <package name="kexec-tools"/>
- <package name="kiwi-tools"/>
- <package name="kpartx"/>
- <package name="lvm2"/>
- <package name="make"/>
- <package name="mdadm"/>
- <package name="kmod-compat"/>
- <package name="net-tools"/>
- <package name="netcfg"/>
- <package name="parted"/>
- <package name="pciutils"/>
- <package name="plymouth"/>
- <package name="plymouth-scripts"/>
- <package name="squashfs"/>
- <package name="sysconfig"/>
- <package name="sysfsutils"/>
- <package name="syslinux"/>
- <package name="tar"/>
- <package name="util-linux"/>
- <package name="xfsprogs"/>
- <package name="diffutils"/>
- <package name="glibc"/>
- <package name="procps"/>
- <package name="rsync"/>
- <package name="timezone"/>
- <package name="which"/>
- <package name="wicked"/>
- <package name="iproute2"/>
- <package name="psmisc"/>
- <package name="sysvinit-tools"/>
- <package name="xz"/>
- <package name="gawk"/>
- <package name="ifplugd"/>
- </packages>
- <packages type="delete">
- <package name="cracklib-dict-full"/>
- <package name="ca-certificates"/>
- <package name="fillup"/>
- <package name="gdbm"/>
- <package name="info"/>
- <package name="insserv"/>
- <package name="make"/>
- <package name="mingetty"/>
- <package name="Mesa"/>
- <package name="openSUSE-release"/>
- <package name="pam"/>
- <package name="pam-modules"/>
- <package name="perl"/>
- <package name="perl-Bootloader"/>
- <package name="permissions"/>
- <package name="python"/>
- <package name="python-base"/>
- </packages>
-</image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/images.sh
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/images.sh
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/images.sh 2019-07-17
14:40:41.709222157 +0200
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/images.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-#!/bin/sh
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-echo "Configure image: [$kiwi_iname]..."
-
-#==========================================
-# setup build day
-#------------------------------------------
-baseSetupBuildDay
-
-#==========================================
-# remove unneded kernel files
-#------------------------------------------
-suseStripKernel
-
-#==========================================
-# remove unneeded files
-#------------------------------------------
-suseStripInitrd
-
-#==========================================
-# umount
-#------------------------------------------
-baseCleanMount
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/dump
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/dump
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/dump 2019-10-28
16:46:06.516681203 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/dump 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../../dump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/include
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/include
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/include
2019-10-28 16:46:06.484681163 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/include
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../../../../../functions.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/linuxrc
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/linuxrc
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/linuxrc
2019-10-28 16:46:06.548681244 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/linuxrc
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../../linuxrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/preinit
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/preinit
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/preinit
2019-10-28 16:46:06.460681132 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/preinit
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../../preinit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/repart
new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/repart
--- old/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/repart
2019-10-28 16:46:06.424681086 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-leap15.0/root/repart
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../../repart
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.sh
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.sh
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.sh
2018-02-08 11:48:44.505148699 +0100
@@ -0,0 +1,41 @@
+#!/bin/bash
+#================
+# FILE : config.sh
+#----------------
+# PROJECT : openSUSE KIWI Image System
+# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
+# :
+# AUTHOR : Marcus Schaefer <[email protected]>
+# :
+# BELONGS TO : Operating System images
+# :
+# DESCRIPTION : configuration script for SUSE based
+# : operating systems
+# :
+# :
+# STATUS : BETA
+#----------------
+#======================================
+# Functions...
+#--------------------------------------
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+#======================================
+# Greeting...
+#--------------------------------------
+echo "Configure image: [$kiwi_iname]..."
+
+#======================================
+# Keep UTF-8 locale
+#--------------------------------------
+baseStripLocales \
+ $(for i in $(echo $kiwi_language | tr "," " ");do echo -n "$i.utf8 ";done)
+baseStripTranslations kiwi.mo
+
+#======================================
+# Umount kernel filesystems
+#--------------------------------------
+baseCleanMount
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
2019-10-16 16:35:57.965447047 +0200
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<image schemaversion="6.8" name="initrd-oemboot-suse-tumbleweed">
+ <description type="boot">
+ <author>Marcus Schaefer</author>
+ <contact>[email protected]</contact>
+ <specification>boot/initrd image used on OEM VMX disk</specification>
+ </description>
+ <preferences>
+ <type image="cpio" bootprofile="default" bootkernel="std"/>
+ <version>2.15.1</version>
+ <packagemanager>zypper</packagemanager>
+ <rpm-check-signatures>false</rpm-check-signatures>
+ </preferences>
+ <profiles>
+ <profile name="default" description="Booting default setup"/>
+ <profile name="custom" description="KERNEL: specified by bootinclude
in system XML"/>
+ <profile name="xen" description="Xen drivers and grub2 modules"/>
+ <profile name="std" description="KERNEL: Default"/>
+ </profiles>
+ <drivers>
+ <file name="crypto/*"/>
+ <file name="drivers/acpi/*"/>
+ <file name="drivers/acpi/dock.ko"/>
+ <file name="drivers/ata/*"/>
+ <file name="drivers/block/brd.ko"/>
+ <file name="drivers/block/cciss.ko"/>
+ <file name="drivers/block/loop.ko"/>
+ <file name="drivers/block/virtio_blk.ko"/>
+ <file name="drivers/cdrom/*"/>
+ <file name="drivers/char/hw_random/virtio-rng.ko"/>
+ <file name="drivers/char/lp.ko"/>
+ <file name="drivers/firmware/edd.ko"/>
+ <file name="drivers/gpu/drm/*"/>
+ <file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
+ <file name="drivers/hwmon/*"/>
+ <file name="drivers/ide/*"/>
+ <file name="drivers/input/keyboard/*"/>
+ <file name="drivers/input/mouse/*"/>
+ <file name="drivers/md/*"/>
+ <file name="drivers/message/fusion/*"/>
+ <file name="drivers/net/*"/>
+ <file name="drivers/nvme/*"/>
+ <file name="drivers/nvmem/*"/>
+ <file name="drivers/parport/*"/>
+ <file name="drivers/scsi/*"/>
+ <file name="drivers/staging/hv/*"/>
+ <file name="drivers/thermal/*"/>
+ <file name="drivers/usb/*"/>
+ <file name="drivers/virtio/*"/>
+ <file name="fs/binfmt_aout.ko"/>
+ <file name="fs/binfmt_misc.ko"/>
+ <file name="fs/overlayfs/*"/>
+ <file name="fs/btrfs/*"/>
+ <file name="fs/exportfs/*"/>
+ <file name="fs/ext2/*"/>
+ <file name="fs/ext3/*"/>
+ <file name="fs/ext4/*"/>
+ <file name="fs/fat/*"/>
+ <file name="fs/fuse/*"/>
+ <file name="fs/hfs/*"/>
+ <file name="fs/jbd/*"/>
+ <file name="fs/jbd2/*"/>
+ <file name="fs/mbcache.ko"/>
+ <file name="fs/nls/nls_cp437.ko"/>
+ <file name="fs/nls/nls_iso8859-1.ko"/>
+ <file name="fs/nls/nls_utf8.ko"/>
+ <file name="fs/quota_v1.ko"/>
+ <file name="fs/quota_v2.ko"/>
+ <file name="fs/squashfs/*"/>
+ <file name="fs/udf/*"/>
+ <file name="fs/vfat/*"/>
+ <file name="fs/xfs/*"/>
+ <file name="fs/isofs/*"/>
+ <file name="lib/crc-t10dif.ko"/>
+ <file name="lib/crc16.ko"/>
+ <file name="lib/libcrc32c.ko"/>
+ <file name="lib/zlib_deflate/zlib_deflate.ko"/>
+ <file name="net/packet/*"/>
+ </drivers>
+ <drivers profiles="xen">
+ <file name="drivers/xen/*"/>
+ <file name="drivers/block/xen-blkfront.ko"/>
+ <file name="drivers/net/xen-netfront.ko"/>
+ <file name="drivers/scsi/xen-scsifront.ko"/>
+ <file name="drivers/input/misc/xen-kbdfront.ko"/>
+ <file name="drivers/pci/xen-pcifront.ko"/>
+ </drivers>
+ <repository type="yast2">
+ <source path="obs://inherited_from_system_image_description"/>
+ </repository>
+ <packages type="image" profiles="std">
+ <package name="kernel-default"/>
+ </packages>
+ <packages type="image" profiles="xen">
+ <package name="grub2-x86_64-xen" arch="x86_64"/>
+ </packages>
+ <packages type="image" profiles="custom"/>
+ <packages type="bootstrap">
+ <package name="udev"/>
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
+ <package name="ca-certificates"/>
+ <package name="openSUSE-release"/>
+ </packages>
+ <packages type="image">
+ <package name="kbd"/>
+ <package name="gptfdisk"/>
+ <package name="adaptec-firmware"/>
+ <package name="atftp"/>
+ <package name="bc"/>
+ <package name="bind-libs"/>
+ <package name="bind-utils"/>
+ <package name="btrfsprogs"/>
+ <package name="busybox"/>
+ <package name="bzip2"/>
+ <package name="cryptsetup"/>
+ <package name="curl"/>
+ <package name="dialog"/>
+ <package name="dmraid"/>
+ <package name="dosfstools"/>
+ <package name="e2fsprogs"/>
+ <package name="fbiterm"/>
+ <package name="file"/>
+ <package name="fribidi"/>
+ <package name="mkisofs"/>
+ <package name="gettext-runtime"/>
+ <package name="grub2"/>
+ <package name="grub2-x86_64-efi" arch="x86_64"/>
+ <package name="grub2-i386-efi" arch="i686"/>
+ <package name="grub2-i386-efi" arch="i586"/>
+ <package name="grub2-i386-pc"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-firmware"/>
+ <package name="kexec-tools"/>
+ <package name="kiwi-tools"/>
+ <package name="kpartx"/>
+ <package name="lvm2"/>
+ <package name="make"/>
+ <package name="mdadm"/>
+ <package name="kmod-compat"/>
+ <package name="net-tools"/>
+ <package name="netcfg"/>
+ <package name="parted"/>
+ <package name="pciutils"/>
+ <package name="plymouth"/>
+ <package name="plymouth-scripts"/>
+ <package name="squashfs"/>
+ <package name="sysconfig"/>
+ <package name="sysfsutils"/>
+ <package name="syslinux"/>
+ <package name="tar"/>
+ <package name="util-linux"/>
+ <package name="xfsprogs"/>
+ <package name="diffutils"/>
+ <package name="glibc"/>
+ <package name="procps"/>
+ <package name="rsync"/>
+ <package name="timezone"/>
+ <package name="which"/>
+ <package name="wicked"/>
+ <package name="iproute2"/>
+ <package name="psmisc"/>
+ <package name="sysvinit-tools"/>
+ <package name="xz"/>
+ <package name="gawk"/>
+ <package name="ifplugd"/>
+ </packages>
+ <packages type="delete">
+ <package name="cracklib-dict-full"/>
+ <package name="ca-certificates"/>
+ <package name="fillup"/>
+ <package name="gdbm"/>
+ <package name="info"/>
+ <package name="insserv"/>
+ <package name="make"/>
+ <package name="mingetty"/>
+ <package name="Mesa"/>
+ <package name="openSUSE-release"/>
+ <package name="pam"/>
+ <package name="pam-modules"/>
+ <package name="perl"/>
+ <package name="perl-Bootloader"/>
+ <package name="permissions"/>
+ <package name="python"/>
+ <package name="python-base"/>
+ </packages>
+</image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/images.sh
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/images.sh
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/images.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/images.sh
2018-02-08 11:48:44.505148699 +0100
@@ -0,0 +1,27 @@
+#!/bin/sh
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+echo "Configure image: [$kiwi_iname]..."
+
+#==========================================
+# setup build day
+#------------------------------------------
+baseSetupBuildDay
+
+#==========================================
+# remove unneded kernel files
+#------------------------------------------
+suseStripKernel
+
+#==========================================
+# remove unneeded files
+#------------------------------------------
+suseStripInitrd
+
+#==========================================
+# umount
+#------------------------------------------
+baseCleanMount
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/dump
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/dump
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/dump
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/dump
2019-10-28 16:46:07.728682745 +0100
@@ -0,0 +1 @@
+symbolic link to ../../dump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/include
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/include
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/include
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/include
2019-10-28 16:46:07.704682714 +0100
@@ -0,0 +1 @@
+symbolic link to ../../../../../functions.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/linuxrc
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/linuxrc
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/linuxrc
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/linuxrc
2019-10-28 16:46:07.748682770 +0100
@@ -0,0 +1 @@
+symbolic link to ../../linuxrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/preinit
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/preinit
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/preinit
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/preinit
2019-10-28 16:46:07.692682699 +0100
@@ -0,0 +1 @@
+symbolic link to ../../preinit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/repart
new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/repart
--- old/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/repart
1970-01-01 01:00:00.000000000 +0100
+++ new/custom_boot/arch/x86_64/oemboot/suse-tumbleweed/root/repart
2019-10-28 16:46:07.680682684 +0100
@@ -0,0 +1 @@
+symbolic link to ../../repart
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/functions.sh new/custom_boot/functions.sh
--- old/custom_boot/functions.sh 2019-08-21 12:28:55.881976221 +0200
+++ new/custom_boot/functions.sh 2019-10-16 16:35:13.529479872 +0200
@@ -2745,7 +2745,7 @@
continue
fi
mbrVID=$(
- $isoinfo -d -i $i 2>/dev/null|grep "Application id:"|cut -f2
-d:
+ $isoinfo -d -i $i 2>/dev/null|grep "Application id:"|cut -f2
-d:|tr [:upper:] [:lower:]
)
mbrVID=$(echo $mbrVID)
if [ "${mbrVID^^}" = "${mbrIID^^}" ];then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/package/kiwi-boot-descriptions.spec
new/custom_boot/package/kiwi-boot-descriptions.spec
--- old/custom_boot/package/kiwi-boot-descriptions.spec 2019-09-02
10:51:30.594137600 +0200
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2019-09-30
11:57:03.239050577 +0200
@@ -155,7 +155,7 @@
Requires: checkmedia
Requires: dosfstools
Requires: jing
-%if 0%{suse_version} >= 1500
+%if 0%{?suse_version} >= 1500
Requires: mkisofs
%else
Requires: genisoimage
++++++ kiwi-boot-packages ++++++
--- /var/tmp/diff_new_pack.WPa3sW/_old 2019-10-28 16:46:08.336683518 +0100
+++ /var/tmp/diff_new_pack.WPa3sW/_new 2019-10-28 16:46:08.340683524 +0100
@@ -38,14 +38,14 @@
armv6l:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_armv6l_available
armv7hl:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_armv7hl_available
armv7l:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_armv7l_available
-i586:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid
dosfstools e2fsprogs fbiterm file filesystem fribidi gawk gettext-runtime glibc
glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo ifplugd
iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools
kmod-compat kpartx lvm2 make mdadm mkisofs nbd net-tools netcfg nfs-client
openSUSE-release parted pciutils plymouth plymouth-scripts procps psmisc rsync
squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev
util-linux which wicked xfsprogs xz
-i686:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid
dosfstools e2fsprogs fbiterm file filesystem fribidi gawk gettext-runtime glibc
glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo ifplugd
iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools
kmod-compat kpartx lvm2 make mdadm mkisofs nbd net-tools netcfg nfs-client
openSUSE-release parted pciutils plymouth plymouth-scripts procps psmisc rsync
squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev
util-linux which wicked xfsprogs xz
+i586:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs fbiterm
filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg nfs-client
openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar timezone
udev which wicked xfsprogs
+i686:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs fbiterm
filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg nfs-client
openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar timezone
udev which wicked xfsprogs
ppc:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc_available
ppc64:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc64_available
ppc64le:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_ppc64le_available
s390:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_s390_available
s390x:suse-leap15.0:no_boot_descriptions_for_suse-leap15.0_on_s390x_available
-x86_64:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid
dosfstools e2fsprogs fbiterm file filesystem fribidi gawk gettext-runtime glibc
glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen
hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools
kiwi-tools kmod-compat kpartx lvm2 make mdadm mkisofs nbd net-tools netcfg
nfs-client openSUSE-release parted pciutils plymouth plymouth-scripts procps
psmisc rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar
timezone udev util-linux which wicked xfsprogs xz
+x86_64:suse-leap15.0:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs fbiterm
filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg nfs-client
openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar timezone
udev which wicked xfsprogs
aarch64:suse-leap15.1:no_boot_descriptions_for_suse-leap15.1_on_aarch64_available
arm:suse-leap15.1:no_boot_descriptions_for_suse-leap15.1_on_arm_available
armv5el:suse-leap15.1:no_boot_descriptions_for_suse-leap15.1_on_armv5el_available
@@ -70,11 +70,11 @@
armv6l:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_armv6l_available
armv7hl:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_armv7hl_available
armv7l:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_armv7l_available
-i586:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs fbiterm
filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg nfs-client
openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar timezone
udev which wicked xfsprogs
-i686:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs fbiterm
filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg nfs-client
openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar timezone
udev which wicked xfsprogs
+i586:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid
dosfstools e2fsprogs fbiterm file filesystem fribidi gawk gettext-runtime glibc
glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo ifplugd
iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools
kmod-compat kpartx lvm2 make mdadm mkisofs nbd net-tools netcfg nfs-client
openSUSE-release parted pciutils plymouth plymouth-scripts procps psmisc rsync
squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev
util-linux which wicked xfsprogs xz
+i686:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs
busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid
dosfstools e2fsprogs fbiterm file filesystem fribidi gawk gettext-runtime glibc
glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo ifplugd
iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools
kmod-compat kpartx lvm2 make mdadm mkisofs nbd net-tools netcfg nfs-client
openSUSE-release parted pciutils plymouth plymouth-scripts procps psmisc rsync
squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev
util-linux which wicked xfsprogs xz
ppc:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc_available
ppc64:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc64_available
ppc64le:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc64le_available
s390:suse-tumbleweed:atftp bc bind-libs bind-utils btrfsprogs busybox
cryptsetup curl dialog dmraid e2fsprogs fbiterm filesystem gettext-runtime
glibc glibc-locale hwinfo iproute2 iputils kbd kernel-default kiwi-tools lvm2
make mdadm module-init-tools netcfg nfs-client parted plymouth plymouth-scripts
psmisc rsync s390-tools sysvinit-tools tar timezone udev which wicked xfsprogs
s390x:suse-tumbleweed:atftp bc bind-libs bind-utils btrfsprogs busybox
cryptsetup curl dialog dmraid e2fsprogs fbiterm filesystem gettext-runtime
glibc glibc-locale hwinfo iproute2 iputils kbd kernel-default kiwi-tools lvm2
make mdadm module-init-tools netcfg nfs-client parted plymouth plymouth-scripts
psmisc rsync s390-tools sysvinit-tools tar timezone udev which wicked xfsprogs
-x86_64:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils
btrfsprogs busybox ca-certificates cryptsetup curl dialog dmraid e2fsprogs
fbiterm filesystem gettext-runtime glibc-locale hwinfo ifplugd iproute2 iputils
kbd kernel-default kernel-firmware kiwi-tools lvm2 make mdadm nbd netcfg
nfs-client openSUSE-release parted plymouth plymouth-scripts psmisc rsync tar
timezone udev which wicked xfsprogs
+x86_64:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils
btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils
dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk
gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-pc
grub2-x86_64-efi grub2-x86_64-xen hwinfo ifplugd iproute2 iputils kbd
kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2
make mdadm mkisofs nbd net-tools netcfg nfs-client openSUSE-release parted
pciutils plymouth plymouth-scripts procps psmisc rsync shim squashfs sysconfig
sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked
xfsprogs xz
