Skip to content

Commit

Permalink
update 2024-09-24 01:09
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmwiedemann
bmwiedemann committed Sep 24, 2024
1 parent e637c34 commit 5b91166
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
13 changes: 8 additions & 5 deletions packages/_/_project/_config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed
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 !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql16-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream patterns-base-fips
Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql17-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream patterns-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 !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql16-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream patterns-base-fips
Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql17-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream patterns-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 !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql16-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-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 !postgresql17-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream

# create conflicts for packages installed into the target image
Substitute: kiwi python3-kiwi
Expand Down Expand Up @@ -654,6 +654,9 @@ Prefer: -libcurl-mini4
#have choice for pkgconfig(libsystemd): systemd-devel systemd-devel-32bit
Prefer: -systemd-devel-32bit

#have choice for libXNVCtrl.so.0()(64bit) needed by nodejs-electron: libXNVCtrl0 nvidia-libXNVCtrl
Prefer: -nvidia-libXNVCtrl

#---

%if "%_repository" != "ports"
Expand Down Expand Up @@ -2765,8 +2768,8 @@ BuildFlags: onlybuild:portaudio
BuildFlags: onlybuild:post-build-checks
BuildFlags: onlybuild:postfix
BuildFlags: onlybuild:postgresql
BuildFlags: onlybuild:postgresql16
BuildFlags: onlybuild:postgresql16:mini
BuildFlags: onlybuild:postgresql17
BuildFlags: onlybuild:postgresql17:mini
BuildFlags: onlybuild:potrace
BuildFlags: onlybuild:ppp
BuildFlags: onlybuild:presage
Expand Down
11 changes: 11 additions & 0 deletions packages/_/_project/_staging_workflow
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,15 @@
<staging_project name="openSUSE:Factory:Staging:adi:6"/>
<staging_project name="openSUSE:Factory:Staging:adi:5"/>
<staging_project name="openSUSE:Factory:Staging:adi:7"/>
<staging_project name="openSUSE:Factory:Staging:adi:8"/>
<staging_project name="openSUSE:Factory:Staging:adi:9"/>
<staging_project name="openSUSE:Factory:Staging:adi:10"/>
<staging_project name="openSUSE:Factory:Staging:adi:11"/>
<staging_project name="openSUSE:Factory:Staging:adi:12"/>
<staging_project name="openSUSE:Factory:Staging:adi:13"/>
<staging_project name="openSUSE:Factory:Staging:adi:14"/>
<staging_project name="openSUSE:Factory:Staging:adi:16"/>
<staging_project name="openSUSE:Factory:Staging:adi:18"/>
<staging_project name="openSUSE:Factory:Staging:adi:19"/>
<staging_project name="openSUSE:Factory:Staging:adi:21"/>
</workflow>

0 comments on commit 5b91166

Please sign in to comment.