From 2adb7b58e755d7ed8b8e8ee1501664b4a1e88ae3 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Tue, 19 Mar 2024 15:36:54 -0700
Subject: [PATCH] Revert "Add t2linux config"

This reverts commit 4b79f539c328b132f5593da0ccffe138ff37e651.
---
 README.md                  | 43 +++++++++++++++++++++++++++++++-------
 components/boot.xml        |  8 ++-----
 components/liveinstall.xml |  2 +-
 components/t2linux.xml     | 12 -----------
 config.xml                 |  8 +++----
 repositories/t2linux.xml   |  7 -------
 6 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 components/t2linux.xml
 delete mode 100644 repositories/t2linux.xml

diff --git a/README.md b/README.md
index dd1d2ad..a36c6fb 100644
--- a/README.md
+++ b/README.md
@@ -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/>.
diff --git a/components/boot.xml b/components/boot.xml
index 3515bff..a57398f 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -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"/>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index c53fba7..ca7106d 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -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>
diff --git a/components/t2linux.xml b/components/t2linux.xml
deleted file mode 100644
index 985345d..0000000
--- a/components/t2linux.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<image>
-  <profiles>
-    <profile name="t2linux" description="t2linux support packages"/>
-  </profiles>
-  <packages type="image" patternType="plusRecommended">
-    <package name="t2linux-config"/>
-    <package name="copr-sharpenedblade-t2linux-release"/>
-  </packages>
-  <packages type="bootstrap" patternType="plusRecommended">
-    <package name="copr-sharpenedblade-t2linux-release"/>
-  </packages>
-</image>
diff --git a/config.xml b/config.xml
index 03b8bbe..08d6ef6 100644
--- a/config.xml
+++ b/config.xml
@@ -2,9 +2,9 @@
 
 <image schemaversion="7.4" name="Fedora">
 	<description type="system">
-		<author>Fedora Project Contributors and the t2linux project</author>
-		<contact>sharpenedblade@proton.me</contact>
-		<specification>t2linux Fedora</specification>
+		<author>Fedora Project Contributors</author>
+		<contact>devel@lists.fedoraproject.org</contact>
+		<specification>Fedora Linux</specification>
 	</description>
 	<preferences>
 		<version>40</version>
@@ -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"/>
@@ -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"/>
diff --git a/repositories/t2linux.xml b/repositories/t2linux.xml
deleted file mode 100644
index f839d63..0000000
--- a/repositories/t2linux.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<image>
-  <repository type="rpm-md" alias="copr_copr.fedorainfracloud.org_sharpenedblade_t2linux" sourcetype="baseurl" priority="80">
-    <source path="https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/fedora-$releasever-$basearch/">
-      <signing key="https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/pubkey.gpg"/>
-    </source>
-  </repository>
-</image>