From df2e5dd3562dffd7535137703181554ec9a88876 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Tue, 21 Nov 2023 12:34:00 -0500 Subject: [PATCH] small refactor --- elements/rocky-minimal/README.rst | 9 --------- elements/rocky-minimal/element-deps | 1 - elements/rocky-minimal/element-provides | 1 - .../environment.d/10-rocky-distro-name.bash | 3 --- .../rocky-minimal/environment.d/11-yum-dnf.bash | 2 -- .../test-elements/build-succeeds/README.rst | 1 - .../test-elements/build-succeeds/element-deps | 2 -- elements/rocky-minimal/yum.repos.d/yum.repo | 17 ----------------- 8 files changed, 36 deletions(-) delete mode 100644 elements/rocky-minimal/README.rst delete mode 100644 elements/rocky-minimal/element-deps delete mode 100644 elements/rocky-minimal/element-provides delete mode 100644 elements/rocky-minimal/environment.d/10-rocky-distro-name.bash delete mode 100644 elements/rocky-minimal/environment.d/11-yum-dnf.bash delete mode 100644 elements/rocky-minimal/test-elements/build-succeeds/README.rst delete mode 100644 elements/rocky-minimal/test-elements/build-succeeds/element-deps delete mode 100644 elements/rocky-minimal/yum.repos.d/yum.repo diff --git a/elements/rocky-minimal/README.rst b/elements/rocky-minimal/README.rst deleted file mode 100644 index 93356e2..0000000 --- a/elements/rocky-minimal/README.rst +++ /dev/null @@ -1,9 +0,0 @@ -============== -rocky-minimal -============== - -Create a minimal image based on Rocky. - -This element sets the ``DISTRO_NAME`` var to 'rocky'. The release of -rocky to be installed can be controlled through the ``DIB_RELEASE`` -variable, which defaults the latest supported release. diff --git a/elements/rocky-minimal/element-deps b/elements/rocky-minimal/element-deps deleted file mode 100644 index 752a479..0000000 --- a/elements/rocky-minimal/element-deps +++ /dev/null @@ -1 +0,0 @@ -yum-minimal diff --git a/elements/rocky-minimal/element-provides b/elements/rocky-minimal/element-provides deleted file mode 100644 index a72e049..0000000 --- a/elements/rocky-minimal/element-provides +++ /dev/null @@ -1 +0,0 @@ -operating-system diff --git a/elements/rocky-minimal/environment.d/10-rocky-distro-name.bash b/elements/rocky-minimal/environment.d/10-rocky-distro-name.bash deleted file mode 100644 index fbf1a63..0000000 --- a/elements/rocky-minimal/environment.d/10-rocky-distro-name.bash +++ /dev/null @@ -1,3 +0,0 @@ -export DISTRO_NAME=rocky -export DIB_RELEASE=${DIB_RELEASE:-9} -export EFI_BOOT_DIR="EFI/rocky" diff --git a/elements/rocky-minimal/environment.d/11-yum-dnf.bash b/elements/rocky-minimal/environment.d/11-yum-dnf.bash deleted file mode 100644 index ab2f718..0000000 --- a/elements/rocky-minimal/environment.d/11-yum-dnf.bash +++ /dev/null @@ -1,2 +0,0 @@ -export YUM=dnf -export DNF_VAR_contentdir=stg/rocky diff --git a/elements/rocky-minimal/test-elements/build-succeeds/README.rst b/elements/rocky-minimal/test-elements/build-succeeds/README.rst deleted file mode 100644 index 0a6c77e..0000000 --- a/elements/rocky-minimal/test-elements/build-succeeds/README.rst +++ /dev/null @@ -1 +0,0 @@ -Verify we can build a rocky-minimal image. diff --git a/elements/rocky-minimal/test-elements/build-succeeds/element-deps b/elements/rocky-minimal/test-elements/build-succeeds/element-deps deleted file mode 100644 index 6d1fc8b..0000000 --- a/elements/rocky-minimal/test-elements/build-succeeds/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -block-device-gpt -vm diff --git a/elements/rocky-minimal/yum.repos.d/yum.repo b/elements/rocky-minimal/yum.repos.d/yum.repo deleted file mode 100644 index ac3cc16..0000000 --- a/elements/rocky-minimal/yum.repos.d/yum.repo +++ /dev/null @@ -1,17 +0,0 @@ -[baseos] -name=Rocky Linux $releasever - BaseOS - STG -baseurl=http://dl.rockylinux.org/stg/rocky/$releasever/BaseOS/$basearch/os/ -gpgcheck=1 -enabled=1 -countme=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 - -[appstream] -name=Rocky Linux $releasever - AppStream -baseurl=http://dl.rockylinux.org/stg/rocky/$releasever/AppStream/$basearch/os/ -gpgcheck=1 -enabled=1 -countme=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9