Install MS fonts with rpm; clear plan for jp images

This commit is contained in:
2026-01-20 14:20:48 -05:00
parent 11709b9427
commit 91a9fe4b47
5 changed files with 10 additions and 5 deletions

View File

@@ -62,8 +62,8 @@ base-images:
- RECIPE: - RECIPE:
- base.yml - base.yml
# - base-nvidia.yml # - base-nvidia.yml
- base-cosmic.yml # - base-cosmic.yml
- base-cosmic-nvidia.yml # - base-cosmic-nvidia.yml
- base-kinoite.yml - base-kinoite.yml
- base-kinoite-nvidia.yml - base-kinoite-nvidia.yml
- base-combo.yml - base-combo.yml
@@ -111,6 +111,8 @@ combo-images:
extends: extends:
- .build - .build
stage: build stage: build
variables:
BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
needs: needs:
- job: 'base-images: [base-combo.yml]' - job: 'base-images: [base-combo.yml]'
optional: true optional: true
@@ -123,6 +125,8 @@ combo-nvidia-images:
extends: extends:
- .build - .build
stage: build stage: build
variables:
BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
needs: needs:
- job: 'base-images: [base-combo-nvidia.yml]' - job: 'base-images: [base-combo-nvidia.yml]'
optional: true optional: true

View File

@@ -1,2 +1,3 @@
modules: modules:
- type: signing - type: signing
- from-file: common/ms-fonts.yml

View File

@@ -5,4 +5,6 @@ modules:
- cabextract - cabextract
- xorg-x11-font-utils - xorg-x11-font-utils
- fontconfig - fontconfig
- https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm - type: script
snippets:
- rpm -i --nodigest https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm

View File

@@ -28,7 +28,6 @@ modules:
- type: script - type: script
scripts: scripts:
- install-archipelago.sh - install-archipelago.sh
- from-file: common/ms-fonts.yml
- from-file: common/updates.yml - from-file: common/updates.yml
- from-file: common/spyro2-rando-client.yaml - from-file: common/spyro2-rando-client.yaml
- from-file: common/post-build.yml - from-file: common/post-build.yml

View File

@@ -7,7 +7,6 @@ description: The image of Wunker OS for PG's desktop gaming.
modules: modules:
- from-file: common/common.yml - from-file: common/common.yml
- from-file: common/updates.yml - from-file: common/updates.yml
- from-file: common/ms-fonts.yml
- from-file: common/gaming.yml - from-file: common/gaming.yml
- type: dnf - type: dnf
install: install: