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

kiwi-build: Add support for setting custom bundle formats

Browse Source 
This allows for the Respins SIG to set custom filename formats.

(cherry picked from commit cc22883337e33a556c5313317c12a0660f9a0ed6)
This commit is contained in:
Neal Gompa
2026-02-25 17:11:03 -05:00
parent 1576599e80
commit a3e583adc1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiwi-build
+5 -1
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