diff --git a/kiwi-builder-image/README b/kiwi-builder-image/README index b74c156..2f101cb 100644 --- a/kiwi-builder-image/README +++ b/kiwi-builder-image/README @@ -2,7 +2,7 @@ Kiwi SDK Image Instructions ########################### -Please ensure that you're running this on a registered SLE Micro 6.0 system, and make sure that SELinux is disabled: +Please ensure that you're running this on a registered SUSE Linux Micro 6.1 system, and make sure that SELinux is disabled: # setenforce 0 @@ -46,10 +46,10 @@ To build an image that supports a large block/sectorsize (4096), use the "-b" fl All output will be in the local $(pwd)/output directory, for example: # ls -1 output/ -SLE-Micro.x86_64-6.0.changes -SLE-Micro.x86_64-6.0.packages -SLE-Micro.x86_64-6.0.raw -SLE-Micro.x86_64-6.0.verified +SLE-Micro.x86_64-6.1.changes +SLE-Micro.x86_64-6.1.packages +SLE-Micro.x86_64-6.1.raw +SLE-Micro.x86_64-6.1.verified build kiwi.result kiwi.result.json diff --git a/kiwi-builder-image/SL-Micro.kiwi b/kiwi-builder-image/SL-Micro.kiwi index 76a4290..f0a8a70 100644 --- a/kiwi-builder-image/SL-Micro.kiwi +++ b/kiwi-builder-image/SL-Micro.kiwi @@ -33,6 +33,12 @@ + + + + + + @@ -63,6 +69,21 @@ + + + + + + + + + + + + + + + @@ -140,6 +161,15 @@ + + + + + + + + + @@ -164,6 +194,14 @@ + + + + + + + + @@ -184,10 +222,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 6.0 + 6.1 zypper SLE SLE @@ -198,7 +273,7 @@ initrd_system="dracut" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -211,7 +286,7 @@ luks_pbkdf="pbkdf2" > - @@ -230,7 +305,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -241,7 +316,7 @@ initrd_system="dracut" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -266,7 +341,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -276,11 +351,12 @@ image="oem" initrd_system="dracut" installiso="true" + installpxe="true" filesystem="btrfs" installboot="install" install_continue_on_timeout="false" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -304,8 +380,8 @@ - - 6.0 + + 6.1 zypper SLE SLE @@ -320,11 +396,11 @@ install_continue_on_timeout="false" fsmountoptions="noatime" firmware="uefi" - kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" devicepersistency="by-uuid" btrfs_root_is_snapshot="true" - efipartsize="128" + efipartsize="128" editbootinstall="editbootinstall_rpi.sh" btrfs_root_is_readonly_snapshot="true" btrfs_quota_groups="false" @@ -344,8 +420,8 @@ - - 6.0 + + 6.1 zypper SLE SLE @@ -355,12 +431,13 @@ image="oem" initrd_system="dracut" installiso="true" + installpxe="true" filesystem="btrfs" installboot="install" install_continue_on_timeout="false" firmware="uefi" - efipartsize="128" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + efipartsize="128" + kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -385,22 +462,22 @@ - 6.0 + 6.1 zypper SLE SLE true en_US - + - 6.0 + 6.1 zypper SLE SLE @@ -434,9 +511,9 @@ filesystem="btrfs" bootpartition="true" bootpartsize="300" - bootfilesystem="ext2" + bootfilesystem="ext4" initrd_system="dracut" - kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet" + kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1" devicepersistency="by-uuid" target_blocksize="4096" btrfs_root_is_snapshot="true" @@ -461,7 +538,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -472,9 +549,9 @@ filesystem="btrfs" bootpartition="true" bootpartsize="300" - bootfilesystem="ext2" + bootfilesystem="ext4" initrd_system="dracut" - kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet" + kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1" devicepersistency="by-uuid" btrfs_root_is_snapshot="true" btrfs_root_is_readonly_snapshot="true" @@ -495,9 +572,47 @@ + + 6.1 + zypper + SLE + SLE + true + en_US + + + true + + + + + + + + + + + + + 5 + + - 6.0 + 6.1 zypper SLE SLE @@ -532,7 +647,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -543,7 +658,7 @@ format="qcow2" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -567,9 +682,9 @@ 32 - + - 6.0 + 6.1 zypper SLE SLE @@ -580,8 +695,8 @@ format="qcow2" filesystem="btrfs" firmware="uefi" - efipartsize="128" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu" + efipartsize="128" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -592,7 +707,7 @@ - + @@ -603,6 +718,161 @@ + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + + + + + @@ -616,7 +886,7 @@ - + @@ -628,7 +898,6 @@ - @@ -647,9 +916,7 @@ - - - + @@ -703,7 +970,7 @@ - @@ -713,7 +980,8 @@ - + + @@ -721,46 +989,44 @@ --> - + - + - - + + - - + + - + + + + + - + - - - - + @@ -774,4 +1040,14 @@ + + + + + + + + + + diff --git a/kiwi-builder-image/SL-Micro.kiwi.4096 b/kiwi-builder-image/SL-Micro.kiwi.4096 index 33d84b0..4222f9e 100644 --- a/kiwi-builder-image/SL-Micro.kiwi.4096 +++ b/kiwi-builder-image/SL-Micro.kiwi.4096 @@ -33,6 +33,12 @@ + + + + + + @@ -63,6 +69,21 @@ + + + + + + + + + + + + + + + @@ -140,6 +161,15 @@ + + + + + + + + + @@ -164,6 +194,14 @@ + + + + + + + + @@ -184,10 +222,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 6.0 + 6.1 zypper SLE SLE @@ -198,7 +273,7 @@ initrd_system="dracut" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -213,7 +288,7 @@ efipartsize="200" > - @@ -232,7 +307,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -243,7 +318,7 @@ initrd_system="dracut" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -270,7 +345,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -280,11 +355,12 @@ image="oem" initrd_system="dracut" installiso="true" + installpxe="true" filesystem="btrfs" installboot="install" install_continue_on_timeout="false" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -310,8 +386,8 @@ - - 6.0 + + 6.1 zypper SLE SLE @@ -326,7 +402,7 @@ install_continue_on_timeout="false" fsmountoptions="noatime" firmware="uefi" - kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" devicepersistency="by-uuid" btrfs_root_is_snapshot="true" @@ -350,8 +426,8 @@ - - 6.0 + + 6.1 zypper SLE SLE @@ -361,12 +437,13 @@ image="oem" initrd_system="dracut" installiso="true" + installpxe="true" filesystem="btrfs" installboot="install" install_continue_on_timeout="false" firmware="uefi" efipartsize="128" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0" + kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -391,22 +468,22 @@ - 6.0 + 6.1 zypper SLE SLE true en_US - + - 6.0 + 6.1 zypper SLE SLE @@ -440,9 +517,9 @@ filesystem="btrfs" bootpartition="true" bootpartsize="300" - bootfilesystem="ext2" + bootfilesystem="ext4" initrd_system="dracut" - kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet" + kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1" devicepersistency="by-uuid" target_blocksize="4096" btrfs_root_is_snapshot="true" @@ -467,7 +544,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -478,9 +555,9 @@ filesystem="btrfs" bootpartition="true" bootpartsize="300" - bootfilesystem="ext2" + bootfilesystem="ext4" initrd_system="dracut" - kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet" + kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1" devicepersistency="by-uuid" btrfs_root_is_snapshot="true" btrfs_root_is_readonly_snapshot="true" @@ -501,9 +578,47 @@ + + 6.1 + zypper + SLE + SLE + true + en_US + + + true + + + + + + + + + + + + + 5 + + - 6.0 + 6.1 zypper SLE SLE @@ -538,7 +653,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -549,7 +664,7 @@ format="qcow2" filesystem="btrfs" firmware="uefi" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -577,7 +692,7 @@ - 6.0 + 6.1 zypper SLE SLE @@ -589,7 +704,7 @@ filesystem="btrfs" firmware="uefi" efipartsize="128" - kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu" + kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu" bootpartition="false" bootkernel="custom" devicepersistency="by-uuid" @@ -600,7 +715,7 @@ - + @@ -611,6 +726,161 @@ + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + + + + 6.1 + zypper + SLE + SLE + true + en_US + + + + + + + + + + + + + + + + + + + + + + + @@ -655,8 +925,6 @@ - - @@ -720,7 +988,8 @@ - + + @@ -728,46 +997,44 @@ --> - + - + - + + --> - - + + - + + + + + - + - - - - + @@ -781,4 +1048,14 @@ - \ No newline at end of file + + + + + + + + + + + diff --git a/kiwi-builder-image/build-image.sh b/kiwi-builder-image/build-image.sh index b0df0ba..5873380 100644 --- a/kiwi-builder-image/build-image.sh +++ b/kiwi-builder-image/build-image.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -27,9 +27,9 @@ LARGEBLOCK=false # Print usage usage(){ cat <<-EOF - ============================== - SLE Micro 6.0 Kiwi SDK Builder - ============================== + ===================================== + SUSE Linux Micro 6.1 Kiwi SDK Builder + ===================================== Usage: ${0} [-p ] [-b] diff --git a/kiwi-builder-image/config.sh b/kiwi-builder-image/config.sh index 3214755..cc9f1b0 100644 --- a/kiwi-builder-image/config.sh +++ b/kiwi-builder-image/config.sh @@ -35,14 +35,6 @@ mkdir /var/lib/misc/reconfig_system #-------------------------------------- echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..." -#====================================== -# This is a workaround - someone, -# somewhere needs to load the xts crypto -# module, otherwise luksOpen will fail while -# creating the image. -#-------------------------------------- -modprobe xts || true - #====================================== # add missing fonts #-------------------------------------- @@ -139,9 +131,6 @@ for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do rpm --import $i || true done -# Temporary workaround for bsc#1212187 -echo "techpreview.ZYPP_MEDIANETWORK=1" >> /etc/zypp/zypp.conf - #====================================== # Enable kubelet if installed #-------------------------------------- @@ -170,8 +159,18 @@ if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then sed -i'' 's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g' /etc/snapper/configs/root fi -# Enable jeos-firstboot if installed, disabled by combustion/ignition -if rpm -q --whatprovides jeos-firstboot >/dev/null; then +# Enable multipathd for MP images +if [ "${kiwi_oemmultipath_scan-false}" = 'true' ]; then + systemctl enable multipathd.service +fi + +# On those s390 targets the console is not capable of running jeos-firstboot, +# use systemd-firstboot as minimal alternative. +if [[ "$kiwi_profiles" =~ s390-(dasd|fba|fcp) ]]; then + systemctl enable systemd-firstboot + # Enable prompting for the root password + echo 'root:!unprovisioned' | chpasswd -e +elif rpm -q --whatprovides jeos-firstboot >/dev/null; then mkdir -p /var/lib/YaST2 touch /var/lib/YaST2/reconfig_system systemctl enable jeos-firstboot.service @@ -281,7 +280,7 @@ if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then options smsc95xx turbo_mode=N EOF - cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF + cat > /etc/sysctl.d/50-rpi3.conf <<-EOF # Avoid running out of DMA pages for smsc95xx (bsc#1012449) vm.min_free_kbytes = 2048 EOF