From 05ed982c563f84223fd178b0e57c4e4beeb43805 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 5 Nov 2024 22:01:42 +0100 Subject: [PATCH] package: Drop conflicting package Signed-off-by: Peter Jung --- archiso/airootfs/etc/edition-tag | 1 + archiso/airootfs/etc/version-tag | 1 + archiso/grub/grub.cfg | 2 +- archiso/packages_desktop.x86_64 | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 archiso/airootfs/etc/edition-tag create mode 100644 archiso/airootfs/etc/version-tag diff --git a/archiso/airootfs/etc/edition-tag b/archiso/airootfs/etc/edition-tag new file mode 100644 index 0000000..e085aba --- /dev/null +++ b/archiso/airootfs/etc/edition-tag @@ -0,0 +1 @@ +desktop diff --git a/archiso/airootfs/etc/version-tag b/archiso/airootfs/etc/version-tag new file mode 100644 index 0000000..53a24b0 --- /dev/null +++ b/archiso/airootfs/etc/version-tag @@ -0,0 +1 @@ +241105 diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index b4261f3..d9688c8 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -1,6 +1,6 @@ # Defining the Version of the ISO. This line could be easy changed by a Script wich do that automatic before creating ISO self. # Default "GIT", because if somebody outside from the DEVs create a ISO, this ISO wouldnt have a specific Version number. -CACHYOS_VERSION="240814" +CACHYOS_VERSION="241105" if [ "${grub_platform}" == 'efi' ]; then bios_or_uefi='(UEFI)!' diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64 index 27a05b0..dd25240 100644 --- a/archiso/packages_desktop.x86_64 +++ b/archiso/packages_desktop.x86_64 @@ -50,7 +50,6 @@ exfatprogs f2fs-tools fakeroot fatresize -gnu-netcat gpart gparted gptfdisk