pool/python-kiwi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Bump version: 9.24.60 → 9.24.61

Browse Source 
- dracut: modules.d: 99kiwi-lib: add bash shebangs and dependency
  The scripts in the kiwi-lib module use bash-specific syntax like
  `function`, which causes the script to fail if another shell (like dash
  or busybox) is used to interpret the scripts. Specifically set the shebang
  to use bash as the shell interpreter and add bash as a dependency to the
  dracut module to fix this.
  This resolves the following errors which are printed at boot when
  busybox tries to interpret the scripts:
  /bin/dracut-pre-mount: 3: /lib/kiwi-filesystem-lib.sh: function: not found
  /bin/dracut-pre-mount: 15: /lib/kiwi-filesystem-lib.sh: Syntax error: "}" unexpected
  Signed-off-by: Isaac True <isaac.true@canonical.com>

- Do not depend on dnf for SUSE ALP

- Added appx-util as WSL requires for Fedora/RHEL
  Make sure the kiwi-systemdeps-containers-wsl meta package
  pulls in the required tools for Fedora/RHEL when building
  WSL containers. This is a followup to #2286

- Add cpio to core systemdeps requires list

- Bump version: 9.24.59 → 9.24.60

- Allow to create plain cpio archives
  Allow to create plain cpio archives to serve the idea
  of the mkosi initrd concept

- Fix restoration of grub2-install (bsc#1210948)

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=228
This commit is contained in:
Marcus Schäfer 2023-05-24 07:43:40 +00:00 committed by Git OBS Bridge
parent 081ce3f88a
commit 2326e78b43
4 changed files with 228 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PKGBUILD
View File

@ -3,7 +3,7 @@
pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
arch=(x86_64)
pkgver=9.24.59
pkgver=9.24.61
pkgrel=0
pkgdesc="KIWI - Appliance Builder Next Generation"
url="https://github.com/SUSE/kiwi/tarball/master"
@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep)
provides=(kiwi-ng kiwi)
source=("${pkgname}.tar.gz")
changelog="${pkgname}.changes"
md5sums=('bb262c3b88fb73ffca368aa98474fbb1')
md5sums=('a7b7c58ce0e508475ba595fe72ee135b')
build() {

195
python-kiwi.changes
View File

@ -1,8 +1,157 @@
-------------------------------------------------------------------
Wed May 24 09:38:40 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Bump version: 9.24.60 → 9.24.61
-------------------------------------------------------------------
Tue May 23 18:32:58 CEST 2023 - Isaac True <isaac.true@canonical.com>
- dracut: modules.d: 99kiwi-lib: add bash shebangs and dependency
The scripts in the kiwi-lib module use bash-specific syntax like
`function`, which causes the script to fail if another shell (like dash
or busybox) is used to interpret the scripts. Specifically set the shebang
to use bash as the shell interpreter and add bash as a dependency to the
dracut module to fix this.
This resolves the following errors which are printed at boot when
busybox tries to interpret the scripts:
/bin/dracut-pre-mount: 3: /lib/kiwi-filesystem-lib.sh: function: not found
/bin/dracut-pre-mount: 15: /lib/kiwi-filesystem-lib.sh: Syntax error: "}" unexpected
Signed-off-by: Isaac True <isaac.true@canonical.com>
-------------------------------------------------------------------
Mon May 22 15:13:26 CEST 2023 - Jiri Srain <jsrain@suse.com>
- Do not depend on dnf for SUSE ALP
-------------------------------------------------------------------
Tue May 16 10:04:13 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Added appx-util as WSL requires for Fedora/RHEL
Make sure the kiwi-systemdeps-containers-wsl meta package
pulls in the required tools for Fedora/RHEL when building
WSL containers. This is a followup to #2286
-------------------------------------------------------------------
Tue May 16 10:00:11 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Add cpio to core systemdeps requires list
-------------------------------------------------------------------
Sat May 06 20:40:11 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Bump version: 9.24.59 → 9.24.60
-------------------------------------------------------------------
Thu May 04 12:32:27 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Allow to create plain cpio archives
Allow to create plain cpio archives to serve the idea
of the mkosi initrd concept
-------------------------------------------------------------------
Fri Apr 28 11:25:45 CEST 2023 - Fabian Vogt <fvogt@suse.de>
- Fix restoration of grub2-install (bsc#1210948)
It checked for grub2-install.orig in the host, not the buildroot. This
meant that it left /usr/sbin/grub2-install as a noop.
-------------------------------------------------------------------
Fri Apr 28 09:44:59 CEST 2023 - David Cassany <dcassany@suse.com>
- Use cross arch macros to interpret uint64_t
This commit adds inttypes.h to make use of PRIu64 style
macros in order to properly translate uint64_t across
different architectures. More specific this allows the
code to compile for ix86.
Signed-off-by: David Cassany <dcassany@suse.com>
-------------------------------------------------------------------
Mon Apr 24 23:48:34 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Delete score card
Too flaky, broken most of the time and I'm not sure
how much value it adds to the project overall
-------------------------------------------------------------------
Mon Apr 24 23:46:43 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Fix score card action
-------------------------------------------------------------------
Mon Apr 24 23:28:44 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Update TW build tests
plymouth-plugin-script must be explicitly added now
-------------------------------------------------------------------
Mon Apr 24 23:17:48 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Revert "Add zstd and xzio to grub image"
This reverts commit af8c702db0a60ed4abeba8686d4e8475c410c58d.
The grub modules does not exist in all grub installations.
A different implementation is required
-------------------------------------------------------------------
Mon Apr 24 22:59:24 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Update TW integration tests
change theme from bgrt to breeze. TW has deleted bgrt
-------------------------------------------------------------------
Mon Apr 24 22:43:18 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Fixed writing URIs including ASCII encoding
-------------------------------------------------------------------
Fri Apr 21 21:32:21 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Split container systemdeps in OCI and WSL
-------------------------------------------------------------------
Thu Apr 20 14:46:59 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Update kiwi-systemdeps-containers requires list
Do not strictly require fb-util-for-appx. In order to create
WSL containers fb-util-for-appx is a requirement but usually
users create OCI containers and WSL containers are still a
niche case. Thus it's ok to reduce the requirement into a
recommends. This Fixes #2284
-------------------------------------------------------------------
Thu Apr 20 10:28:09 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Encode remote URLs
Special characters in a URL e.g the @ sign needs to be encoded
as part of a remote URL.
-------------------------------------------------------------------
Thu Apr 13 18:33:10 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Bump version: 9.24.58 → 9.24.59
-------------------------------------------------------------------
Thu Apr 13 18:12:16 CEST 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Add zstd and xzio to grub image
If kiwi builds its own grub image, make sure the compression
algorithms zstd and xz are supported
-------------------------------------------------------------------
Wed Apr 12 16:37:48 CEST 2023 - David Cassany <dcassany@suse.com>
@ -25,6 +174,41 @@ Wed Apr 12 11:06:57 CEST 2023 - David Cassany <dcassany@suse.com>
Signed-off-by: David Cassany <dcassany@suse.com>
-------------------------------------------------------------------
Tue Apr 04 19:53:19 CEST 2023 - Jan Löser <loeser@atix.de>
- Add potential shim binary for Ubuntu
Looks like `shim*.efi` is gone in latest `shim-signed` package. The
package now contains `shimx64.efi.signed.latest` and
`shimx64.efi.signed.previous` binaries, let's take latest.
shim-signed_1.40.9+15.7-0ubuntu1_amd64/usr/lib/shim/:
total 4688
drwxr-xr-x. 3 root root 209 Jan 31 12:57 .
drwxr-xr-x. 3 root root 18 Jan 31 12:57 ..
-rw-r--r--. 1 root root 108 Jan 31 12:57 BOOTX64.CSV
-rwxr-xr-x. 1 root root 1622 Jan 31 12:57 is-not-revoked
drwxr-xr-x. 2 root root 25 Jan 31 12:57 mok
-rw-r--r--. 1 root root 950891 Jan 31 12:57 shimx64.efi
-rw-r--r--. 1 root root 962400 Jan 31 12:57 shimx64.efi.dualsigned
-rw-r--r--. 1 root root 960472 Jan 31 12:57 shimx64.efi.signed.latest
-rw-r--r--. 1 root root 955656 Jan 31 12:57 shimx64.efi.signed.previous
-rw-r--r--. 1 root root 88296 Jan 27 20:09 fbx64.efi
-rw-r--r--. 1 root root 860824 Jan 27 20:09 mmx64.efi
shim-signed_1.40.7+15.4-0ubuntu9_amd64/usr/lib/shim/:
total 3728
drwxr-xr-x. 3 root root 145 Aug 13 2021 .
drwxr-xr-x. 3 root root 18 Aug 13 2021 ..
-rw-r--r--. 1 root root 108 Aug 13 2021 BOOTX64.CSV
-rw-r--r--. 1 root root 85672 Aug 13 2021 fbx64.efi
-rw-r--r--. 1 root root 856232 Aug 13 2021 mmx64.efi
drwxr-xr-x. 2 root root 25 Aug 13 2021 mok
-rw-r--r--. 1 root root 947143 Aug 13 2021 shimx64.efi
-rw-r--r--. 1 root root 957576 Aug 13 2021 shimx64.efi.dualsigned
-rw-r--r--. 1 root root 955656 Aug 13 2021 shimx64.efi.signed
-------------------------------------------------------------------
Mon Apr 03 13:24:36 CEST 2023 - David Cassany <dcassany@suse.com>
@ -102,6 +286,17 @@ Thu Mar 16 15:55:56 CET 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
setting to the C standard 17 caused build errors for me on
distributions that uses C standard 11/12.
-------------------------------------------------------------------
Wed Mar 15 09:31:01 CET 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Add selinux integration test for Leap
SUSE systems supports both, apparmor and selinux, whereas
apparmor is the default. As selinux requires to create security
labels during build time of an image, this integration test
checks if the labeling works for SUSE based OS'es.
This Fixes #2244
-------------------------------------------------------------------
Tue Mar 14 16:26:06 CET 2023 - Marcus Schäfer <marcus.schaefer@gmail.com>

38
python-kiwi.spec
View File

@ -43,7 +43,7 @@
%endif
Name: python-kiwi
Version: 9.24.59
Version: 9.24.61
Provides: kiwi-schema = 7.5
Release: 0
Url: https://github.com/OSInside/kiwi
@ -96,11 +96,11 @@ Recommends: debootstrap
Recommends: dpkg
%endif
# package managers required by distro
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1650
Provides: kiwi-packagemanager:microdnf
Requires: microdnf
%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1550
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1650
Requires: dnf
Provides: kiwi-packagemanager:dnf
Provides: kiwi-packagemanager:yum
@ -119,6 +119,7 @@ Requires: kiwi-tools
Requires: mtools
Requires: rsync
Requires: tar >= 1.2.7
Requires: cpio
Requires: lsof
Requires: openssl
@ -127,19 +128,15 @@ This metapackage installs the necessary system dependencies
to run KIWI.
%package -n kiwi-systemdeps-containers
Summary: KIWI - host requirements for container images
Summary: KIWI - host requirements for OCI container images
Group: %{sysgroup}
Provides: kiwi-image-docker-requires = %{version}-%{release}
Obsoletes: kiwi-image-docker-requires < %{version}-%{release}
Provides: kiwi-image-wsl-requires = %{version}-%{release}
Obsoletes: kiwi-image-wsl-requires < %{version}-%{release}
%if "%{_vendor}" != "debbuild"
Provides: kiwi-image:docker
Provides: kiwi-image:appx
%endif
%if 0%{?suse_version}
Requires: umoci
Requires: fb-util-for-appx
%else
Requires: buildah
%endif
@ -147,7 +144,26 @@ Requires: skopeo
%description -n kiwi-systemdeps-containers
Host setup helper to pull in all packages required/useful on
the build host to build container images e.g docker, wsl
the build host to build OCI container images
%package -n kiwi-systemdeps-containers-wsl
Summary: KIWI - host requirements for WSL container images
Group: %{sysgroup}
Provides: kiwi-image-wsl-requires = %{version}-%{release}
Obsoletes: kiwi-image-wsl-requires < %{version}-%{release}
%if "%{_vendor}" != "debbuild"
Provides: kiwi-image:appx
%endif
%if 0%{?suse_version}
Requires: fb-util-for-appx
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: appx-util
%endif
%description -n kiwi-systemdeps-containers-wsl
Host setup helper to pull in all packages required/useful on
the build host to build WSL container images
%package -n kiwi-systemdeps-iso-media
Summary: KIWI - host requirements for live and install iso images
@ -317,6 +333,7 @@ Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
# None of the container build tools are available in Debian/Ubuntu
Requires: kiwi-systemdeps-containers = %{version}-%{release}
Requires: kiwi-systemdeps-containers-wsl = %{version}-%{release}
%endif
Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
Requires: kiwi-systemdeps-disk-images = %{version}-%{release}
@ -658,6 +675,9 @@ fi
%files -n kiwi-systemdeps-containers
# Empty metapackage
%files -n kiwi-systemdeps-containers-wsl
# Empty metapackage
%files -n kiwi-systemdeps-iso-media
# Empty metapackage

4
python-kiwi.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86ed1ea7dd264aced49208eb4c95e829afc3c70e59a645eef25dc53b7c324e22
size 2231728
oid sha256:4b2bf2a68809dca62714375b4c0a02b85e3bc4cef83e1f316b5d44951ba57012
size 2236892