Skip to content

Commit

Permalink
Revert "Add t2linux config"
Browse files Browse the repository at this point in the history
This reverts commit 4b79f53.
  • Loading branch information
sharpenedblade committed Mar 19, 2024
1 parent 89ae4de commit 2adb7b5
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 39 deletions.
43 changes: 35 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,43 @@
# t2linux-fedora-iso
# fedora-kiwi-descriptions

This repo has kiwi image descriptions for t2linux Fedora ISOs.
This project is used to manage the Fedora KIWI image descriptions used in composing Fedora release images.

Combine the split ISOs with `cat name_of_iso_here.iso.* > full.iso`.
The `rawhide` branch is used for Fedora Rawhide images and each release branch is used by that release.

## Building the ISOs
All changes should be made via the PR workflow.

Clone this repo then run:
## Image variants

Please look at [`VARIANTS`](/VARIANTS.md) for details on the available
configurations that can be built.

## Image build quickstart

Set up your development environment and run the image build (substitute `<image_type>` and `<image_profile>` for the appropriate settings):

```bash
podman run --rm --privileged -v $PWD:/repo ghcr.io/t2linux/fedora-dev /repo/build.sh
# Install kiwi
[]$ sudo dnf --assumeyes install kiwi
# Run the image build
[]$ sudo ./kiwi-build --image-type=<image_type> --image-profile=<image_profile> --output-dir ./outdir
```

## Disclaimer
This project is not officially provided or supported by the Fedora Project. The official Fedora software is available at [https://fedoraproject.org/](https://fedoraproject.org/). This project is not related to Fedora in any way.
## CI information

This project is tested using the [Software Factory Zuul CI instance](https://fedora.softwarefactory-project.io/zuul/project/pagure.io/fedora-kiwi-descriptions)
using the [Test Management Tool](https://tmt.readthedocs.io/).

## Licensing

This is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, under version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
8 changes: 2 additions & 6 deletions components/boot.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<image>
<profiles>
<profile name="BootCore" description="Boot core packages">
<requires profile="t2linux"/>
</profile>
<profile name="BootCoreUKI" description="Boot core packages for UKI">
<requires profile="t2linux"/>
</profile>
<profile name="BootCore" description="Boot core packages"/>
<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
</profiles>
<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
<package name="grubby"/>
Expand Down
2 changes: 1 addition & 1 deletion components/liveinstall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</profile>
</profiles>
<preferences profiles="LiveInstall">
<type image="iso" publisher="t2linux" volid="t2linux_Fedora" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb intel_iommu=on iommu=pt mem_sleep=s2idle" mediacheck="false">
<type image="iso" publisher="Fedora Project" volid="Fedora_Linux" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
<bootloader name="grub2" grub_template="grub.cfg.iso-template" console="console" timeout="10"/>
</type>
</preferences>
Expand Down
12 changes: 0 additions & 12 deletions components/t2linux.xml

This file was deleted.

8 changes: 3 additions & 5 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<image schemaversion="7.4" name="Fedora">
<description type="system">
<author>Fedora Project Contributors and the t2linux project</author>
<contact>[email protected]</contact>
<specification>t2linux Fedora</specification>
<author>Fedora Project Contributors</author>
<contact>[email protected]</contact>
<specification>Fedora Linux</specification>
</description>
<preferences>
<version>40</version>
Expand All @@ -15,7 +15,6 @@
<release-version>40</release-version>
</preferences>
<include from="this://./repositories/core.xml"/>
<include from="this://./repositories/t2linux.xml"/>
<include from="this://./components/boot.xml"/>
<include from="this://./components/desktops/common.xml"/>
<include from="this://./components/desktops/gnome.xml"/>
Expand All @@ -32,7 +31,6 @@
<include from="this://./components/desktops/budgie.xml"/>
<include from="this://./components/liveinstall.xml"/>
<include from="this://./components/users.xml"/>
<include from="this://./components/t2linux.xml"/>
<include from="this://./teams/cloud/cloud.xml"/>
<include from="this://./teams/cloud/container.xml"/>
<include from="this://./teams/cloud/vagrant.xml"/>
Expand Down
7 changes: 0 additions & 7 deletions repositories/t2linux.xml

This file was deleted.

0 comments on commit 2adb7b5

Please sign in to comment.