diff --git a/30-build-the-iso-the-first-time.sh b/30-build-the-iso-the-first-time.sh index 16ab13e..72401ab 100755 --- a/30-build-the-iso-the-first-time.sh +++ b/30-build-the-iso-the-first-time.sh @@ -9,7 +9,7 @@ echo "################################################################## " echo # setting of the general parameters - archisoRequiredVersion="archiso 58-1" + archisoRequiredVersion="archiso 64-1" currentFolder=$(pwd) buildFolder="${currentFolder}/build" outFolder="${currentFolder}/out" diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 193941f..9181e88 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -1,7 +1,6 @@ -alsa-utils alacritty +alsa-utils amd-ucode -arch-install-scripts archinstall arch-install-scripts archlinux-keyring @@ -14,10 +13,10 @@ boost-libs brltty broadcom-wl-dkms btrfs-progs -discover cachy-browser cachyos-calamares cachyos-calamares-config +cachyos-grub-theme cachyos-hello cachyos-hooks cachyos-kde-settings @@ -44,6 +43,7 @@ dhclient dhcpcd dialog diffutils +discover dmidecode dmraid dnsmasq @@ -55,6 +55,7 @@ efibootmgr ethtool exfatprogs f2fs-tools +fastfetch fatresize ffmpegthumbnailer file-roller @@ -68,7 +69,6 @@ gpm gptfdisk grsync grub -cachyos-grub-theme gtkmm3 haveged hdparm @@ -151,8 +151,8 @@ packagekit-qt5 partclone parted partimage -paru partitionmanager +paru pcsclite pipewire pipewire-alsa diff --git a/mkarchiso b/mkarchiso new file mode 100755 index 0000000..b683d48 --- /dev/null +++ b/mkarchiso @@ -0,0 +1,1682 @@ +#!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later + +set -e -u + +# Control the environment +umask 0022 +export LC_ALL="C.UTF-8" +[[ -v SOURCE_DATE_EPOCH ]] || printf -v SOURCE_DATE_EPOCH '%(%s)T' -1 +export SOURCE_DATE_EPOCH + +# Set application name from the script's file name +app_name="${0##*/}" + +# Define global variables. All of them will be overwritten later +pkg_list=() +bootstrap_pkg_list=() +quiet="" +work_dir="" +out_dir="" +gpg_key="" +gpg_sender="" +iso_name="" +iso_label="" +iso_publisher="" +iso_application="" +iso_version="" +install_dir="" +arch="" +pacman_conf="" +packages="" +bootstrap_packages="" +pacstrap_dir="" +buildmodes=() +bootmodes=() +airootfs_image_type="" +airootfs_image_tool_options=() +cert_list=() +sign_netboot_artifacts="" +declare -A file_permissions=() +efiboot_files=() +# adapted from GRUB_EARLY_INITRD_LINUX_STOCK in https://git.savannah.gnu.org/cgit/grub.git/tree/util/grub-mkconfig.in +readonly ucodes=('intel-uc.img' 'intel-ucode.img' 'amd-uc.img' 'amd-ucode.img' 'early_ucode.cpio' 'microcode.cpio') + + +# Show an INFO message +# $1: message string +_msg_info() { + local _msg="${1}" + [[ "${quiet}" == "y" ]] || printf '[%s] INFO: %s\n' "${app_name}" "${_msg}" +} + +# Show a WARNING message +# $1: message string +_msg_warning() { + local _msg="${1}" + printf '[%s] WARNING: %s\n' "${app_name}" "${_msg}" >&2 +} + +# Show an ERROR message then exit with status +# $1: message string +# $2: exit code number (with 0 does not exit) +_msg_error() { + local _msg="${1}" + local _error=${2} + printf '[%s] ERROR: %s\n' "${app_name}" "${_msg}" >&2 + if (( _error > 0 )); then + exit "${_error}" + fi +} + +# Show help usage, with an exit status. +# $1: exit status number. +_usage() { + IFS='' read -r -d '' usagetext < + options: + -A Set an application name for the ISO + Default: '${iso_application}' + -C pacman configuration file. + Default: '${pacman_conf}' + -D Set an install_dir. All files will by located here. + Default: '${install_dir}' + NOTE: Max 8 characters, use only [a-z0-9] + -L