From 08d4bf49268bd2313df992236f0fa36f8a6ac0d8 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Tue, 23 May 2023 01:36:48 +0200 Subject: [PATCH] don't require the non-existent FIPS pattern use SLE_15 product builder plug-in tune gstreamer settings --- _config | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/_config b/_config index c66b09d..17ca9bc 100644 --- a/_config +++ b/_config @@ -268,17 +268,19 @@ Prefer: kiwi-systemdeps-iso-media Substitute: obs:cli_debug_packages gdb vim strace less rzsz -# Migration to product builder; using the Tumbleweed plugin since 2020-04-28 -Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed +# Using SLE_15 plug-in until ALP-specific one is created +Substitute: kiwi-packagemanager:instsource product-builder-plugin-SLE_15 # use plugin-openSUSE # Substitute: kiwi-packagemanager:instsource product-builder-plugin-openSUSE Substitute: system-packages:kiwi-product product-builder # allow builds using docker tool -Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips +Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini +# FIXME re-add the pattern laterpatterns-base-fips # Podman based image building -Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips +Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini +# FIXME re-add the pattern laterpatterns-base-fips # To build ISO images Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini @@ -1622,6 +1624,16 @@ Macros: # END RUST STUFF +# BEGIN MULTIMEDIA STUFF + +Macros: +%_with_bs2b 1 +:Macros + +%define _with_bs2b 1 + +# END MULTIMEDIA STUFF + # Default to Java 17 Prefer: java-17-openjdk-devel java-17-openjdk java-17-openjdk-headless java-17-openjdk-javadoc Prefer: java-11-openjdk-devel java-11-openjdk java-11-openjdk-headless java-11-openjdk-javadoc