Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2019-03-12 09:47:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Tue Mar 12 09:47:03 2019 rev:8 rq:682370 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2019-03-05 12:16:28.093004176 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.28833/kiwi-boot-descriptions.changes
2019-03-12 09:47:05.127613762 +0100
@@ -1,0 +2,12 @@
+Wed Mar 6 15:55:44 UTC 2019 - [email protected]
+
+- custom_boot/functions.sh: add support for PLABEL in config
+
+-------------------------------------------------------------------
+Wed Mar 6 15:54:55 UTC 2019 - [email protected]
+
+- Update spec file:
+ * syslinux is only available on x86*, so requires it only for x86
+ * Run format spec file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.3pL6U2/_old 2019-03-12 09:47:06.339613520 +0100
+++ /var/tmp/diff_new_pack.3pL6U2/_new 2019-03-12 09:47:06.343613519 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-boot-descriptions
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
#
%if 0%{?fedora}
%global debug_package %{nil}
@@ -97,7 +100,7 @@
Release: 0
Url: https://github.com/SUSE/kiwi-descriptions
Summary: KIWI - Custom Boot Descriptions
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: System/Management
Source: %{name}.tar.gz
Source1: kiwi-boot-packages
@@ -140,9 +143,10 @@
Summary: KIWI - buildservice host requirements for docker images
Group: System/Management
Provides: kiwi-image:docker
+Requires: jing
Requires: skopeo
Requires: umoci
-Requires: jing
+
%description -n kiwi-image-docker-requires
Meta package for the buildservice to pull in all required packages
for the build host to build docker images
@@ -158,7 +162,9 @@
%else
Requires: genisoimage
%endif
+%ifarch %{ix86} x86_64
Requires: syslinux
+%endif
%description -n kiwi-image-iso-requires
Meta package for the buildservice to pull in all required packages
for the build host to build live iso images
@@ -167,9 +173,11 @@
Summary: KIWI - buildservice host requirements for oem images
Group: System/Management
Provides: kiwi-image:oem
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+%ifarch %{ix86} x86_64
Requires: syslinux
+%endif
%description -n kiwi-image-oem-requires
Meta package for the buildservice to pull in all required packages
for the build host to build oem disk images
@@ -178,8 +186,9 @@
Summary: KIWI - buildservice host requirements for pxe images
Group: System/Management
Provides: kiwi-image:pxe
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+
%description -n kiwi-image-pxe-requires
Meta package for the buildservice to pull in all required packages
for the build host to build pxe images
@@ -188,8 +197,9 @@
Summary: KIWI - buildservice host requirements for vmx images
Group: System/Management
Provides: kiwi-image:vmx
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+
%description -n kiwi-image-vmx-requires
Meta package for the buildservice to pull in all required packages
for the build host to build simple disk images
@@ -201,6 +211,7 @@
Requires: jing
Requires: tar
Requires: xz
+
%description -n kiwi-image-tbz-requires
Meta package for the buildservice to pull in all required packages
for the build host to build root archive tarball
@@ -213,8 +224,8 @@
Provides: kiwi-filesystem:ext4
Provides: kiwi-filesystem:squashfs
Provides: kiwi-filesystem:xfs
-Requires: jing
Requires: e2fsprogs
+Requires: jing
Requires: xfsprogs
%if 0%{?fedora} || 0%{?rhel}
Requires: btrfs-progs
++++++ kiwi-boot-descriptions.tar.gz ++++++
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-01-07 11:31:31.101736304 +0100
+++ new/custom_boot/functions.sh 2019-03-06 16:49:22.951923641 +0100
@@ -1668,6 +1668,7 @@
insmod ext2
insmod gettext
insmod part_msdos
+insmod part_gpt
insmod chain
insmod png
insmod vbe
@@ -7757,6 +7758,9 @@
local cksize=$(echo $header | cut -f4 -d: | cut -f1 -dk)
local diskhd=$(echo $parted | head -n 3 | tail -n 2 | head -n 1)
local plabel=$(echo $diskhd | cut -f6 -d:)
+ if [ -n "$PLABEL" ]; then
+ plabel=$PLABEL
+ fi
if [[ $plabel =~ gpt ]];then
plabel=gpt
fi
@@ -9332,10 +9336,15 @@
# remove partition table and create a new msdos
# table label if parted is in use
# ----
+ if [ -n "$PLABEL" ]; then
+ plabel=$PLABEL
+ else
+ plabel=msdos
+ fi
local IFS=$IFS_ORIG
dd if=/dev/zero of=$imageDiskDevice bs=512 count=1 >/dev/null
if [ $PARTITIONER = "parted" ];then
- parted -s $imageDiskDevice mklabel msdos
+ parted -s $imageDiskDevice mklabel $plabel
fi
}
#======================================
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 2018-10-16
09:28:14.705811406 +0200
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2019-03-06
16:49:22.951923641 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-boot-descriptions
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
#
%if 0%{?fedora}
%global debug_package %{nil}
@@ -97,7 +100,7 @@
Release: 0
Url: https://github.com/SUSE/kiwi-descriptions
Summary: KIWI - Custom Boot Descriptions
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: System/Management
Source: %{name}.tar.gz
Source1: kiwi-boot-packages
@@ -140,9 +143,10 @@
Summary: KIWI - buildservice host requirements for docker images
Group: System/Management
Provides: kiwi-image:docker
+Requires: jing
Requires: skopeo
Requires: umoci
-Requires: jing
+
%description -n kiwi-image-docker-requires
Meta package for the buildservice to pull in all required packages
for the build host to build docker images
@@ -158,7 +162,9 @@
%else
Requires: genisoimage
%endif
+%ifarch %{ix86} x86_64
Requires: syslinux
+%endif
%description -n kiwi-image-iso-requires
Meta package for the buildservice to pull in all required packages
for the build host to build live iso images
@@ -167,9 +173,11 @@
Summary: KIWI - buildservice host requirements for oem images
Group: System/Management
Provides: kiwi-image:oem
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+%ifarch %{ix86} x86_64
Requires: syslinux
+%endif
%description -n kiwi-image-oem-requires
Meta package for the buildservice to pull in all required packages
for the build host to build oem disk images
@@ -178,8 +186,9 @@
Summary: KIWI - buildservice host requirements for pxe images
Group: System/Management
Provides: kiwi-image:pxe
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+
%description -n kiwi-image-pxe-requires
Meta package for the buildservice to pull in all required packages
for the build host to build pxe images
@@ -188,8 +197,9 @@
Summary: KIWI - buildservice host requirements for vmx images
Group: System/Management
Provides: kiwi-image:vmx
-Requires: kiwi-filesystem-requires
Requires: jing
+Requires: kiwi-filesystem-requires
+
%description -n kiwi-image-vmx-requires
Meta package for the buildservice to pull in all required packages
for the build host to build simple disk images
@@ -201,6 +211,7 @@
Requires: jing
Requires: tar
Requires: xz
+
%description -n kiwi-image-tbz-requires
Meta package for the buildservice to pull in all required packages
for the build host to build root archive tarball
@@ -213,8 +224,8 @@
Provides: kiwi-filesystem:ext4
Provides: kiwi-filesystem:squashfs
Provides: kiwi-filesystem:xfs
-Requires: jing
Requires: e2fsprogs
+Requires: jing
Requires: xfsprogs
%if 0%{?fedora} || 0%{?rhel}
Requires: btrfs-progs
