Skip to content

Commit

Permalink
update 2024-08-13 18:03
Browse files Browse the repository at this point in the history
  • Loading branch information
bmwiedemann committed Aug 13, 2024
1 parent 28be361 commit 26369ca
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 11 deletions.
15 changes: 8 additions & 7 deletions packages/_/_project/_attribute
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
poo#164658: '20240812'
poo#164919: '20240805'
poo#165006: '20240812'
poo#165201: '20240812'
poo#63397: '20240524'
</value>
</attribute>
Expand Down Expand Up @@ -552,10 +553,10 @@ products:
- 000product:openSUSE-ftp-ftp-x86_64
- 000product:openSUSE-Addon-NonOss-ftp-ftp-x86_64
images:
# - agama-installer-openSUSE:openSUSE:
# - x86_64
# - agama-installer-openSUSE:openSUSE-Playwright:
# - x86_64
- agama-installer-openSUSE:openSUSE:
- x86_64
- agama-installer-openSUSE:openSUSE-Playwright:
- x86_64
- kiwi-images-vagrant:libvirt:
- x86_64
- kiwi-images-vagrant:virtualbox:
Expand Down Expand Up @@ -643,9 +644,9 @@ test_subproject: ToTest
set_snapshot_number: True</value>
</attribute>
<attribute namespace="OSRT" name="ToTestManagerStatus">
<value>failed: '20240812'
published: '20240811'
publishing: '20240811'
<value>failed: ''
published: '20240812'
publishing: '20240812'
testing: '20240812'
</value>
</attribute>
Expand Down
12 changes: 8 additions & 4 deletions packages/_/_project/_config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BuildFlags: genmetaalgo:1
# The prjconf macros have a serial to help work around issues like https://github.com/openSUSE/open-build-service/issues/4088
# On macros having impact on dep chains, update the serial (mainly ruby, python)
# Using a date to indicate when we set the serial
ExpandFlags: macroserial:20240811
ExpandFlags: macroserial:20240813

ExpandFlags: kiwi-nobasepackages
ExpandFlags: docker-nobasepackages
Expand Down 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 !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 !postgresql16-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 !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 !postgresql16-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 !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 !postgresql16-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 @@ -1444,6 +1444,7 @@ Prefer: -clutter-gst-devel
Prefer: %{ffmpeg_pref}-mini-libs
Prefer: %{ffmpeg_pref}-mini-devel
Prefer: %{ffmpeg_pref} %{ffmpeg_pref}-libavcodec-devel %{ffmpeg_pref}-libavformat-devel %{ffmpeg_pref}-libavutil-devel %{ffmpeg_pref}-libswscale-devel %{ffmpeg_pref}-libavdevice-devel %{ffmpeg_pref}-libavfilter-devel
Prefer: -ffmpeg-6-mini-libs
Macros:
%ffmpeg_pref ffmpeg-7
:Macros
Expand Down Expand Up @@ -1868,6 +1869,8 @@ BuildFlags: onlybuild:ffmpeg-5
BuildFlags: onlybuild:ffmpeg-5:ffmpeg-5-mini
BuildFlags: onlybuild:ffmpeg-6
BuildFlags: onlybuild:ffmpeg-6:ffmpeg-6-mini
BuildFlags: onlybuild:ffmpeg-7
BuildFlags: onlybuild:ffmpeg-7:ffmpeg-7-mini
BuildFlags: onlybuild:ffnvcodec
BuildFlags: onlybuild:fftw3:standard
BuildFlags: onlybuild:file
Expand All @@ -1876,6 +1879,7 @@ BuildFlags: onlybuild:fillup
BuildFlags: onlybuild:findutils
BuildFlags: onlybuild:fipscheck
BuildFlags: onlybuild:firewalld
BuildFlags: onlybuild:fish
BuildFlags: onlybuild:flac
BuildFlags: onlybuild:flex
BuildFlags: onlybuild:fltk
Expand Down
6 changes: 6 additions & 0 deletions packages/_/_project/_staging_workflow
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@
<staging_project name="openSUSE:Factory:Staging:adi:57"/>
<staging_project name="openSUSE:Factory:Staging:adi:59"/>
<staging_project name="openSUSE:Factory:Staging:adi:63"/>
<staging_project name="openSUSE:Factory:Staging:adi:1"/>
<staging_project name="openSUSE:Factory:Staging:adi:2"/>
<staging_project name="openSUSE:Factory:Staging:adi:6"/>
<staging_project name="openSUSE:Factory:Staging:adi:7"/>
<staging_project name="openSUSE:Factory:Staging:adi:8"/>
<staging_project name="openSUSE:Factory:Staging:adi:10"/>
</workflow>
1 change: 1 addition & 0 deletions packages/c/coredns-for-k8s1.24
Submodule coredns-for-k8s1.24 added at 006731
1 change: 1 addition & 0 deletions packages/c/coredns-for-k8s1.25
Submodule coredns-for-k8s1.25 added at c5bf43
1 change: 1 addition & 0 deletions packages/c/coredns-for-k8s1.26
Submodule coredns-for-k8s1.26 added at 160394
1 change: 1 addition & 0 deletions packages/e/etcd-for-k8s1.24
Submodule etcd-for-k8s1.24 added at 4463e3
1 change: 1 addition & 0 deletions packages/e/etcd-for-k8s1.25
Submodule etcd-for-k8s1.25 added at 7c17b2
1 change: 1 addition & 0 deletions packages/e/etcd-for-k8s1.26
Submodule etcd-for-k8s1.26 added at 1b1f76
1 change: 1 addition & 0 deletions packages/k/kubernetes1.24
Submodule kubernetes1.24 added at d2ef5a
1 change: 1 addition & 0 deletions packages/k/kubernetes1.25
Submodule kubernetes1.25 added at 36aeb5
1 change: 1 addition & 0 deletions packages/k/kubernetes1.26
Submodule kubernetes1.26 added at 8659b6

0 comments on commit 26369ca

Please sign in to comment.