h21/HoralOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: h21/HoralOS:a877b9421ffd78f805260de64e45d61d07e17357
Branches Tags
h21/HoralOS:horal
...
compare: h21/HoralOS:dfc49a5a10f69941179fdadd96aa6a5984f7c677
Branches Tags
h21/HoralOS:horal
10 Commits
a877b9421f ... dfc49a5a10
Author SHA1 Message Date
Adam Williamson dfc49a5a10 Container-Toolbox: mesa-va-drivers doesn't exist any more 
See https://src.fedoraproject.org/rpms/mesa/c/f747343d109d2b691d3abcf4649cd10ad42d6578?branch=rawhide .

Signed-off-by: Adam Williamson <awilliam@redhat.com>
 2026-04-01 11:00:37 -07:00
Neal Gompa 2eefd303c7 teams/asahi: FEX: Drop mesa-va-drivers 
This package was merged into mesa-dri-drivers in mesa-26.0.0-5.
 2026-04-01 11:00:37 -07:00
Neal Gompa 92b34d1d31 components/boot: Explicitly filter out debug kernels 
The Fedora Respins SIG are seeing debug kernels getting installed,
and despite the inability to reproduce this, it's fairly straightforward
to prevent.

(cherry picked from commit 9a6d1fed510f61ad55f883f5b8a7491f2cc002f1)
 2026-03-16 11:20:26 -04:00
Luya Tshimbalanga 88762a0d1b team/designsuite: Fix bash configuration 2026-03-15 19:35:59 +00:00
Aleksei Bavshin 25932f1e07 teams/sway: add nwg-wrapper back to the live image 
We use it to soften the impact from pure Sway live experience with some
helpful installation instructions.

(cherry picked from commit c93273901e191f99f22609ea2def70b8dcb66faa)
 2026-03-11 09:00:18 -04:00
Tomi Lähteenmäki 07be924499 maintainers: add aarch64 for Phosh 
(cherry picked from commit a90003e5ac59047049852f5ae5e365cbbe124207)
 2026-03-11 09:00:18 -04:00
Neal Gompa a3e583adc1 kiwi-build: Add support for setting custom bundle formats 
This allows for the Respins SIG to set custom filename formats.

(cherry picked from commit cc22883337e33a556c5313317c12a0660f9a0ed6)
 2026-02-25 17:11:03 -05:00
Neal Gompa 1576599e80 kiwi-build, scripts: Drop unnecessary override for OCI artifacts 
The underlying issue that required this was fixed in kiwi-10.2.17.

(cherry picked from commit adbfbc22905593b82f6c5a2f271b2c7f2d53ec28)
 2026-02-25 17:11:03 -05:00
Neal Gompa 749d86442a kiwi-build: Drop no-longer-needed SELinux hack 
This is not needed since the kiwi executables are correctly labeled.

(cherry picked from commit 920caefad7588fbd8897ec5b72e9972e5dd30819)
 2026-02-25 17:11:03 -05:00
Neal Gompa 2240aa868e Reapply "liveinstall: Use kernel-uki-dtbloader kernel on aarch64" 
With anaconda-44.21, this should be properly handled.

This reverts commit 1352186134.
 2026-02-17 06:08:02 -05:00
9 changed files with 33 additions and 38 deletions
Expand all files Collapse all files
components/boot.xml
+15 -4
View File
@@ -2,6 +2,7 @@
<profiles> <profiles>
<profile name="BootCore" description="Boot core packages"/> <profile name="BootCore" description="Boot core packages"/>
<profile name="BootCoreUKI" description="Boot core packages for UKI"/> <profile name="BootCoreUKI" description="Boot core packages for UKI"/>
<profile name="BootCoreLive" description="Boot core packages for Live DVDs"/>
<profile name="BootDiskCore" description="Boot disk core configuration"> <profile name="BootDiskCore" description="Boot disk core configuration">
<requires profile="BaseCommon"/> <requires profile="BaseCommon"/>
<requires profile="HardwareCommon"/> <requires profile="HardwareCommon"/>
@@ -81,10 +82,10 @@
</oemconfig> </oemconfig>
</type> </type>
</preferences> </preferences>
<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI"> <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive">
<package name="grubby"/> <package name="grubby"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="BootCore"> <packages type="image" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
<package name="grub2-efi-aa64" arch="aarch64"/> <package name="grub2-efi-aa64" arch="aarch64"/>
<package name="grub2-efi-aa64-modules" arch="aarch64"/> <package name="grub2-efi-aa64-modules" arch="aarch64"/>
<package name="grub2-efi-riscv64" arch="riscv64"/> <package name="grub2-efi-riscv64" arch="riscv64"/>
@@ -101,10 +102,19 @@
<package name="shim-signed-ia32" arch="x86_64"/> <package name="shim-signed-ia32" arch="x86_64"/>
<package name="shim-signed-x64" arch="x86_64"/> <package name="shim-signed-x64" arch="x86_64"/>
<package name="shim-unsigned-riscv64" arch="riscv64"/> <package name="shim-unsigned-riscv64" arch="riscv64"/>
<package name="kernel-core"/>
<package name="systemd-oomd-defaults"/> <package name="systemd-oomd-defaults"/>
<package name="systemd-resolved"/> <package name="systemd-resolved"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="BootCore">
<ignore name="kernel-*debug*"/>
<package name="kernel-core"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="BootCoreLive">
<ignore name="kernel-*debug*"/>
<!-- Use kernel-uki-dtbloader for aarch64 -->
<package name="kernel-core" arch="x86_64,riscv64,ppc64le,s390x"/>
<package name="kernel-uki-dtbloader" arch="aarch64"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI"> <packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
<package name="shim-signed-aa64" arch="aarch64"/> <package name="shim-signed-aa64" arch="aarch64"/>
<package name="shim-signed-ia32" arch="x86_64"/> <package name="shim-signed-ia32" arch="x86_64"/>
@@ -116,13 +126,14 @@
<package name="python3-virt-firmware"/> <package name="python3-virt-firmware"/>
<package name="uki-direct"/> <package name="uki-direct"/>
</packages> </packages>
<packages type="iso" patternType="plusRecommended" profiles="BootCore"> <packages type="iso" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
<package name="grub2-efi-aa64-cdboot" arch="aarch64"/> <package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
<package name="grub2-efi-riscv64-cdboot" arch="riscv64"/> <package name="grub2-efi-riscv64-cdboot" arch="riscv64"/>
<package name="grub2-efi-ia32-cdboot" arch="x86_64"/> <package name="grub2-efi-ia32-cdboot" arch="x86_64"/>
<package name="grub2-efi-x64-cdboot" arch="x86_64"/> <package name="grub2-efi-x64-cdboot" arch="x86_64"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="BootDiskCore"> <packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
<ignore name="kernel-*debug*"/>
<package name="arm-image-installer" arch="aarch64"/> <package name="arm-image-installer" arch="aarch64"/>
<package name="glibc-all-langpacks"/> <package name="glibc-all-langpacks"/>
<package name="kernel"/> <package name="kernel"/>
components/liveinstall.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<profiles> <profiles>
<profile name="LiveInstall" description="Live Install ISO"> <profile name="LiveInstall" description="Live Install ISO">
<requires profile="BaseCommon"/> <requires profile="BaseCommon"/>
<requires profile="BootCore"/> <requires profile="BootCoreLive"/>
</profile> </profile>
</profiles> </profiles>
<preferences profiles="LiveInstall" arch="x86_64"> <preferences profiles="LiveInstall" arch="x86_64">
config.sh
+2 -1
View File
@@ -419,7 +419,7 @@ FOE
chmod a+x /usr/share/applications/fedora-design-team.desktop chmod a+x /usr/share/applications/fedora-design-team.desktop
# Use Powerline in bash # Use Powerline in bash
cat >> $HOME/.bashrc << FOE cat >> /etc/profile.d/powerline-shell.sh << FOE
# Enable powerline daemon # Enable powerline daemon
if [ -f `which powerline-daemon` ]; then if [ -f `which powerline-daemon` ]; then
powerline-daemon -q powerline-daemon -q
@@ -428,6 +428,7 @@ if [ -f `which powerline-daemon` ]; then
. /usr/share/powerline/bash/powerline.sh . /usr/share/powerline/bash/powerline.sh
fi fi
FOE FOE
chmod 644 /etc/profile.d/powerline-shell.sh
# End powerline override # End powerline override
# Override the favorite desktop application in Dash # Override the favorite desktop application in Dash
kiwi-build
+5 -20
View File
@@ -16,7 +16,7 @@ usage() {
exit 255 exit 255
} }
optTemp=$(getopt --options '+k:,f:,i,o:,t:,p:,r:,d,h' --longoptions 'kiwi-description-dir:,kiwi-file:,isolated,output-dir:,image-type:,image-profile:,image-release:,debug,help' --name "$kiwibuildsh" -- "$@") optTemp=$(getopt --options '+k:,f:,i,b:,o:,t:,p:,r:,d,h' --longoptions 'kiwi-description-dir:,kiwi-file:,isolated,kiwi-bundle-format:,output-dir:,image-type:,image-profile:,image-release:,debug,help' --name "$kiwibuildsh" -- "$@")
eval set -- "$optTemp" eval set -- "$optTemp"
unset optTemp unset optTemp
@@ -29,6 +29,7 @@ kiwi_isolated=
# For compatibility with older scripts where these did not exist # For compatibility with older scripts where these did not exist
kiwi_description_dir="./" kiwi_description_dir="./"
kiwi_file="Fedora.kiwi" kiwi_file="Fedora.kiwi"
kiwi_bundle_format=
kiwibuild_extra_args= kiwibuild_extra_args=
while true; do while true; do
@@ -36,6 +37,7 @@ while true; do
-i|--isolated) kiwi_isolated=1; shift ;; -i|--isolated) kiwi_isolated=1; shift ;;
-k|--kiwi-description-dir) kiwi_description_dir="$2" ; shift 2 ;; -k|--kiwi-description-dir) kiwi_description_dir="$2" ; shift 2 ;;
-f|--kiwi-file) kiwi_file="$2" ; shift 2 ;; -f|--kiwi-file) kiwi_file="$2" ; shift 2 ;;
-b|--kiwi-bundle-format) kiwi_bundle_format="$2" ; shift 2 ;;
-o|--output-dir) output_dir="$2" ; shift 2 ;; -o|--output-dir) output_dir="$2" ; shift 2 ;;
-t|--image-type) image_type="$2" ; shift 2 ;; -t|--image-type) image_type="$2" ; shift 2 ;;
-p|--image-profile) image_profile="$2" ; shift 2 ;; -p|--image-profile) image_profile="$2" ; shift 2 ;;
@@ -54,8 +56,10 @@ if [ -z "$output_dir" ] || [ -z "$image_type" ] || [ -z "$image_profile" ] || [
usage usage
fi fi
if [ -z "$kiwi_bundle_format" ]; then
# Set the bundle format after we know the profile # Set the bundle format after we know the profile
kiwi_bundle_format=$("${kiwibuild_scriptdir}/scripts/fedora-kiwi-bundle-format-generator" "${kiwi_file}" "${image_profile}") kiwi_bundle_format=$("${kiwibuild_scriptdir}/scripts/fedora-kiwi-bundle-format-generator" "${kiwi_file}" "${image_profile}")
fi
if [ "$image_type" = "iso" ]; then if [ "$image_type" = "iso" ]; then
# Add parameters for embedded ISO IDs # Add parameters for embedded ISO IDs
@@ -63,18 +67,6 @@ if [ "$image_type" = "iso" ]; then
kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}" kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}"
fi fi
if [ "$image_type" = "oci" ]; then
# Extend for OCI images
kiwi_bundle_format="${kiwi_bundle_format}.%T"
fi
if [ ! ${kiwi_isolated} ] && [ -e "/sys/fs/selinux/enforce" ]; then
# Disable SELinux enforcement during the image build if it's enforcing
selinux_enforcing="$(cat /sys/fs/selinux/enforce)"
if [ "$selinux_enforcing" = "1" ]; then
setenforce 0
fi
fi
set +e set +e
if [ ! ${kiwi_isolated} ]; then if [ ! ${kiwi_isolated} ]; then
@@ -85,13 +77,6 @@ fi
kiwi_status=$? kiwi_status=$?
set -e set -e
if [ ! ${kiwi_isolated} ] && [ -e "/sys/fs/selinux/enforce" ]; then
# Re-enable SELinux enforcement now that image build is done
if [ "$selinux_enforcing" = "1" ]; then
setenforce 1
fi
fi
if [ "${kiwi_status}" = "0" ] && [ -n "$image_release" ]; then if [ "${kiwi_status}" = "0" ] && [ -n "$image_release" ]; then
kiwi-ng ${debug} result bundle --bundle-format="${kiwi_bundle_format}" --target-dir "${output_dir}-build" --bundle-dir "${output_dir}" --id="${image_release}" kiwi-ng ${debug} result bundle --bundle-format="${kiwi_bundle_format}" --target-dir "${output_dir}-build" --bundle-dir "${output_dir}" --id="${image_release}"
fi fi
maintainers.toml
+3
View File
@@ -111,6 +111,9 @@ maintainers = [ "Matthew Kosarek", "Neal Gompa" ]
[spins.phosh.x86_64] [spins.phosh.x86_64]
fas = [ "lihis", "phosh-sig" ] fas = [ "lihis", "phosh-sig" ]
maintainers = [ "Tomi Lähteenmäki", "phosh-sig" ] maintainers = [ "Tomi Lähteenmäki", "phosh-sig" ]
[spins.phosh.aarch64]
fas = [ "lihis", "phosh-sig" ]
maintainers = [ "Tomi Lähteenmäki", "phosh-sig" ]
# Silverblue # Silverblue
[silverblue.x86_64] [silverblue.x86_64]
scripts/fedora-kiwi-bundle-format-generator
+1 -7
View File
@@ -14,7 +14,6 @@ import xml.etree.ElementTree as ET
parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds") parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds")
parser.add_argument("kiwi_file", type=Path, default="Fedora.kiwi", help="kiwi description file") parser.add_argument("kiwi_file", type=Path, default="Fedora.kiwi", help="kiwi description file")
parser.add_argument("image_profile", type=str, help="kiwi image profile") parser.add_argument("image_profile", type=str, help="kiwi image profile")
parser.add_argument("--oci-variant", "-o", action="store_true", help="generate oci variant")
args = parser.parse_args() args = parser.parse_args()
xml_tree = ET.parse(args.kiwi_file) xml_tree = ET.parse(args.kiwi_file)
@@ -23,9 +22,4 @@ image_root = xml_tree.getroot()
image_basename = image_root.attrib["name"] image_basename = image_root.attrib["name"]
image_profile = args.image_profile image_profile = args.image_profile
image_bundle_format = f"{image_basename}-{image_profile}-%v.%I.%A" print(f"{image_basename}-{image_profile}-%v.%I.%A")
if args.oci_variant:
print(f"{image_bundle_format}.%T")
else:
print(image_bundle_format)
teams/asahi.xml
-2
View File
@@ -35,8 +35,6 @@
<package name="mesa-dri-drivers.i686"/> <package name="mesa-dri-drivers.i686"/>
<package name="mesa-vulkan-drivers.x86_64"/> <package name="mesa-vulkan-drivers.x86_64"/>
<package name="mesa-vulkan-drivers.i686"/> <package name="mesa-vulkan-drivers.i686"/>
<package name="mesa-va-drivers.x86_64"/>
<package name="mesa-va-drivers.i686"/>
<package name="mesa-demos.x86_64"/> <package name="mesa-demos.x86_64"/>
<package name="libglvnd-opengl.x86_64"/> <package name="libglvnd-opengl.x86_64"/>
<package name="libglvnd-opengl.i686"/> <package name="libglvnd-opengl.i686"/>
teams/cloud/container.xml
-1
View File
@@ -231,7 +231,6 @@
<package name="man-db"/> <package name="man-db"/>
<package name="man-pages"/> <package name="man-pages"/>
<package name="mesa-dri-drivers"/> <package name="mesa-dri-drivers"/>
<package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x -->
<package name="mesa-vulkan-drivers"/> <package name="mesa-vulkan-drivers"/>
<package name="mtr"/> <package name="mtr"/>
<package name="nss-mdns"/> <package name="nss-mdns"/>
teams/sway.xml
+4
View File
@@ -12,4 +12,8 @@
<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk"> <packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk">
<package name="fedora-release-sway"/> <package name="fedora-release-sway"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="Sway-Live">
<!-- Required to display installation instructions -->
<package name="nwg-wrapper"/>
</packages>
</image> </image>