Skip to content

Commit

Permalink
Merge pull request #2439 from OSInside/drop_isolinux
Browse files Browse the repository at this point in the history
Drop isolinux
  • Loading branch information
schaefi authored Jan 28, 2024
2 parents 8424451 + 379ccf2 commit bd6adef
Show file tree
Hide file tree
Showing 71 changed files with 121 additions and 1,695 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,9 @@
<package name="grub"/>
</packages>
<packages type="image" profiles="Live">
<package name="syslinux"/>
<package name="dracut-kiwi-live"/>
</packages>
<packages type="image" profiles="Disk">
<package name="syslinux"/>
<package name="dracut-kiwi-oem-repart"/>
<package name="dracut-kiwi-oem-dump"/>
</packages>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<source path="obs://CentOS:CentOS-8/extras"/>
</repository>
<packages type="image">
<package name="syslinux"/>
<package name="gdisk"/>
<package name="grub2"/>
<package name="kernel"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<source path='obsrepositories:/'/>
</repository>
<packages type="image">
<package name="syslinux"/>
<package name="gdisk"/>
<package name="grub2"/>
<package name="kernel"/>
Expand Down
3 changes: 0 additions & 3 deletions build-tests/x86/debian/test-image-live-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@
<package name="xz-utils"/>
<package name="binutils"/>
<package name="linux-image-amd64"/>
<package name="isolinux"/>
<package name="syslinux"/>
<package name="syslinux-common"/>
<package name="init"/>
<package name="gnupg"/>
<package name="iproute2"/>
Expand Down
3 changes: 0 additions & 3 deletions build-tests/x86/fedora/test-image-live-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@
<package name="NetworkManager"/>
<package name="btrfs-progs"/>
</packages>
<packages type="image" profiles="Live,Disk">
<package name="syslinux"/>
</packages>
<packages type="image" profiles="Live">
<package name="dracut-kiwi-live"/>
</packages>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-disk-simple/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-docker/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<package name="iputils"/>
<package name="tar"/>
<package name="psmisc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="fontconfig"/>
<package name="fonts-config"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-live/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-luks/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-lvm/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/leap/test-image-overlayroot/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
3 changes: 0 additions & 3 deletions build-tests/x86/rawhide/test-image-live-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@
<package name="tzdata"/>
<package name="NetworkManager"/>
</packages>
<packages type="image" profiles="Live,Disk">
<package name="syslinux"/>
</packages>
<packages type="image" profiles="Live">
<package name="dracut-kiwi-live"/>
</packages>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-azure/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<package name="parted"/>
<package name="psmisc"/>
<package name="rsync"/>
<package name="syslinux"/>
<package name="systemd"/>
<package name="systemd-sysvinit"/>
<package name="sudo"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<package name="iputils"/>
<package name="tar"/>
<package name="psmisc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="fontconfig"/>
<package name="fonts-config"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-ec2/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<package name="parted"/>
<package name="psmisc"/>
<package name="rsync"/>
<package name="syslinux"/>
<package name="systemd"/>
<package name="systemd-sysvinit"/>
<package name="sudo"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-gce/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<package name="parted"/>
<package name="psmisc"/>
<package name="rsync"/>
<package name="syslinux"/>
<package name="systemd"/>
<package name="systemd-sysvinit"/>
<package name="sudo"/>
Expand Down
9 changes: 0 additions & 9 deletions build-tests/x86/tumbleweed/test-image-live/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<specification>live iso test build</specification>
</description>
<profiles>
<profile name="BIOS" description="BIOS only Live Boot based on isolinux"/>
<profile name="Standard" description="Standard EFI/BIOS Live Boot"/>
<profile name="Secure" description="SecureBoot/BIOS Live Boot"/>
<profile name="SDBoot" description="EFI Boot via systemd-boot"/>
Expand All @@ -27,11 +26,6 @@
<bootsplash-theme>breeze</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
</preferences>
<preferences profiles="BIOS">
<type image="iso" flags="overlay" firmware="bios" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true" mediacheck="true">
<bootloader name="isolinux" console="serial" timeout="10"/>
</type>
</preferences>
<preferences profiles="SDBoot">
<type image="iso" flags="overlay" firmware="efi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true" mediacheck="false">
<bootloader name="systemd_boot"/>
Expand Down Expand Up @@ -63,9 +57,6 @@
<package name="grub2-i386-pc"/>
<package name="shim"/>
</packages>
<packages type="image" profiles="BIOS">
<package name="syslinux"/>
</packages>
<packages type="image">
<package name="bind-utils"/>
<package name="patterns-openSUSE-base"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-luks/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-lvm/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<package name="grub2"/>
<package name="grub2-i386-pc"/>
<package name="grub2-x86_64-efi"/>
<package name="syslinux"/>
<package name="tar"/>
<package name="dracut"/>
<package name="wicked"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-pxe/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<package name="plymouth"/>
<package name="psmisc"/>
<package name="rsync"/>
<package name="syslinux"/>
<package name="systemd"/>
<package name="systemd-sysvinit"/>
<package name="sudo"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-raid/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<package name="grub2"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-i386-pc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
<package name="fontconfig"/>
Expand Down
1 change: 0 additions & 1 deletion build-tests/x86/tumbleweed/test-image-wsl/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<package name="iputils"/>
<package name="tar"/>
<package name="psmisc"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="fontconfig"/>
<package name="fonts-config"/>
Expand Down
3 changes: 0 additions & 3 deletions build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
<package name="grub2-common"/>
<package name="grub-efi-amd64-bin"/>
<package name="linux-generic"/>
<package name="isolinux"/>
<package name="syslinux"/>
<package name="syslinux-common"/>
<package name="systemd"/>
<package name="dracut"/>
<package name="init"/>
Expand Down
8 changes: 0 additions & 8 deletions doc/source/api/kiwi.bootloader.config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ Submodules
:undoc-members:
:show-inheritance:

`kiwi.bootloader.config.isolinux` Module
----------------------------------------

.. automodule:: kiwi.bootloader.config.isolinux
:members:
:undoc-members:
:show-inheritance:

.. _db_kiwi_bootloader_config_contents:

Module Contents
Expand Down
8 changes: 0 additions & 8 deletions doc/source/api/kiwi.bootloader.template.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ Submodules
:undoc-members:
:show-inheritance:

`kiwi.bootloader.template.isolinux` Module
------------------------------------------

.. automodule:: kiwi.bootloader.template.isolinux
:members:
:undoc-members:
:show-inheritance:

.. _db_kiwi_bootloader_template_content:

Module Contents
Expand Down
10 changes: 0 additions & 10 deletions doc/source/concept_and_workflow/systemdeps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ systemdeps packages:
through some BIOS or firmware.
* Depends on the `-core` kiwi-systemdeps packages.

.. note::

The `iso` type is an exception which might not require the
`-bootloaders` systemdeps. In case of the `firmware` attribute
to be set to `bios`, {kiwi} builds bootable ISO images still
based on isolinux which is provided with the `-iso-media`
systemdeps. However, by default, any {kiwi} created ISO image
is BIOS and EFI capable and based on the grub bootloader which
causes a requirement to the `-bootloaders` systemdeps.

`kiwi-systemdeps-filesystems`:
* Supports building `fs-type`, `oem`, `pxe`,
`kis` and live `iso` image types.
Expand Down
Loading

0 comments on commit bd6adef

Please sign in to comment.