From 058116f6093f1ad99aa6d25a3f9ecdb0b1c60d03 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 11 Mar 2024 10:12:58 +0100 Subject: [PATCH 1/5] Added nvchecker conf, also added optdepends to the PKGBUILD as we sometimes have breaking changes - this is a small step in trying to help us track these breaking changes --- PKGBUILD | 134 ++++++++++++++++++++++++++++++++++++++++++++++++- nvchecker.toml | 5 ++ 2 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 nvchecker.toml diff --git a/PKGBUILD b/PKGBUILD index c332d04314..2d0c0a7ccf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: demostanis worlds pkgname=archinstall -pkgver=2.6.0 +pkgver=2.7.2 pkgrel=1 pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) @@ -12,7 +12,6 @@ url="https://github.com/archlinux/archinstall" license=(GPL3) depends=( 'arch-install-scripts' - 'btrfs-progs' 'coreutils' 'cryptsetup' 'e2fsprogs' @@ -24,7 +23,10 @@ depends=( 'python-pyparted' 'python-simple-term-menu' 'systemd' + 'mkinitcpio' 'util-linux' + 'base' + 'base-devel' ) makedepends=( 'python-setuptools' @@ -34,7 +36,135 @@ makedepends=( 'python-wheel' ) optdepends=( + 'linux: Used when linux kernel is selected' + 'linux-lts: Used when linux-lts kernel is selected' + 'linux-zen: Used when linux-zen kernel is selected' + 'linux-hardened: Used when linux-hardened kernel is selected' + 'amd-ucode: Used when AMD microcode dependency is detected' + 'intel-ucode: Used when Intel microcode dependency is detected' + 'btrfs-progs: Used when btrfs is selected as a filesystem' + 'xfsprogs: Used when xfs is selected as a filesystem' + 'f2fs-tools: Used when f2fs is selected as a filesystem' 'python-systemd: Adds journald logging' + 'xorg-server: Adds the base for X11 based desktop profiles' + 'nano: Used in desktop profile to give simple tooling' + 'vim: Used in desktop profile to give simple tooling' + 'openssh: Used in desktop profile to give simple tooling' + 'htop: Used in desktop profile to give simple tooling' + 'wget: Used in desktop profile to give simple tooling' + 'iwd: Used in desktop profile to give simple tooling' + 'wireless_tools: Used in desktop profile to give simple tooling' + 'wpa_supplicant: Used in desktop profile to give simple tooling' + 'smartmontools: Used in desktop profile to give simple tooling' + 'xdg-utils: Used in desktop profile to give simple tooling' + 'tomcat10: Used in server profile when tomcat is selected' + 'openssh: Used in server profile when sshd is selected' + 'postgresql: Used in server profile when postgresql is selected' + 'nginx: Used in server profile when nginx is selected' + 'mariadb: Used in server profile when mariadb is selected' + 'lighttpd: Used in server profile when lighttpd is selected' + 'apache: Used in server profile when httpd is selected' + 'docker: Used in server profile when docker is selected' + 'cockpit: Used in server profile when cockpit is selected' + 'udisks2: Used in server profile when cockpit is selected' + 'packagekit: Used in server profile when cockpit is selected' + 'alacritty: Used when qtile, awesome desktop is selected' + 'xterm: Used when i3, awesome desktop is selected' + 'slock: Used when lxqt, awesome desktop is selected' + 'brltty: Used if accessibility was detected during installation' + 'espeakup: Used if accessibility was detected during installation' + 'alsa-utils: Used if accessibility was detected during installation' + 'xfce4: Used in server profile when xfce4 is selected' + 'xfce4-goodies: Used in server profile when xfce4 is selected' + 'pavucontrol: Used in server profile when xfce4, sway is selected' + 'gvfs: Used in server profile when xfce4 is selected' + 'xarchiver: Used in server profile when xfce4 is selected' + 'sway: Used when sway desktop is selected' + 'swaybg: Used when sway desktop is selected' + 'swaylock: Used when sway desktop is selected' + 'swayidle: Used when sway desktop is selected' + 'waybar: Used when sway desktop is selected' + 'dmenu: Used when sway desktop is selected' + 'brightnessctl: Used when sway desktop is selected' + 'grim: Used when sway desktop is selected' + 'slurp: Used when sway desktop is selected' + 'foot: Used when sway desktop is selected' + 'xorg-xwayland: Used when sway desktop is selected' + 'seatd: Used when sway desktop is selected with seatd' + 'polkit: Used when sway desktop is selected with polkit' + 'dolphin: Used when kde, hyprland desktop is selected' + 'qtile: Used when qtile desktop is selected' + 'mate: Used when mate desktop is selected' + 'mate-extra: Used when mate desktop is selected' + 'lxqt: Used when lxqt desktop is selected' + 'breeze-icons: Used when lxqt desktop is selected' + 'oxygen-icons: Used when lxqt desktop is selected' + 'ttf-freefont: Used when lxqt desktop is selected' + 'leafpad: Used when lxqt desktop is selected' + 'plasma-meta: Used when kde desktop is selected' + 'konsole: Used when kde desktop is selected' + 'kwrite: Used when kde desktop is selected' + 'ark: Used when kde desktop is selected' + 'plasma-workspace: Used when kde desktop is selected' + 'egl-wayland: Used when kde desktop is selected' + 'i3-wm: Used when i3 desktop is selected' + 'i3lock: Used when i3 desktop is selected' + 'i3status: Used when i3 desktop is selected' + 'i3blocks: Used when i3 desktop is selected' + 'lightdm-gtk-greeter: Used when i3 desktop is selected' + 'lightdm: Used when i3 desktop is selected' + 'dmenu: Used when i3 desktop is selected' + 'hyprland: Used when hyprland desktop is selected' + 'dunst: Used when hyprland desktop is selected' + 'kitty: Used when hyprland desktop is selected' + 'wofi: Used when hyprland desktop is selected' + 'xdg-desktop-portal-hyprland: Used when hyprland desktop is selected' + 'qt5-wayland: Used when hyprland desktop is selected' + 'qt6-wayland: Used when hyprland desktop is selected' + 'gnome: Used when gnome desktop is selected' + 'gnome-tweaks: Used when gnome desktop is selected' + 'enlightenment: Used when enlightenment desktop is selected' + 'terminology: Used when enlightenment desktop is selected' + 'deepin: Used when deepin desktop is selected' + 'deepin-terminal: Used when deepin desktop is selected' + 'deepin-editor: Used when deepin desktop is selected' + 'cutefish: Used when cutefish desktop is selected' + 'noto-fonts: Used when cutefish desktop is selected' + 'cinnamon: Used when cinnamon desktop is slected' + 'system-config-printer: Used when cinnamon desktop is slected' + 'gnome-keyring: Used when cinnamon desktop is slected' + 'gnome-terminal: Used when cinnamon desktop is slected' + 'blueberry: Used when cinnamon desktop is slected' + 'metacity: Used when cinnamon desktop is slected' + 'budgie: Used when budgie desktop is slected' + 'arc-gtk-theme: Used when budgie desktop is slected' + 'mate-terminal: Used when budgie desktop is slected' + 'nemo: Used when budgie desktop is slected' + 'papirus-icon-theme: Used when budgie desktop is slected' + 'bspwm: Used when bspwn desktop is selected' + 'sxhkd: Used when bspwn desktop is selected' + 'dmenu: Used when bspwn desktop is selected' + 'xdo: Used when bspwn desktop is selected' + 'rxvt-unicode: Used when bspwn desktop is selected' + 'awesome: Used when awesome desktop is selected' + 'xorg-xinit: Used when awesome desktop is selected' + 'xorg-xrandr: Used when awesome desktop is selected' + 'feh: Used when awesome desktop is selected' + 'terminus-font: Used when awesome desktop is selected' + 'gnu-free-fonts: Used when awesome desktop is selected' + 'ttf-liberation: Used when awesome desktop is selected' + 'xsel: Used when awesome desktop is selected' + 'pipewire: Used when pipewire is selected as an audio server' + 'pipewire-alsa: Used when pipewire is selected as an audio server' + 'pipewire-jack: Used when pipewire is selected as an audio server' + 'pipewire-pulse: Used when pipewire is selected as an audio server' + 'gst-plugin-pipewire: Used when pipewire is selected as an audio server' + 'libpulse: Used when pipewire is selected as an audio server' + 'wireplumber: Used when pipewire is selected as an audio server' + 'pulseaudio: Used when pulseaudio is selected as an audio server' + 'grub: Used in server profile when grub bootloader option is selected' + 'efibootmgr: Used in server profile when efistub bootloader option is selected' + 'limine: Used in server profile when limine bootloader option is selected' ) provides=(python-archinstall archinstall) conflicts=(python-archinstall archinstall-git) diff --git a/nvchecker.toml b/nvchecker.toml new file mode 100644 index 0000000000..02a45f84e2 --- /dev/null +++ b/nvchecker.toml @@ -0,0 +1,5 @@ +[nvchecker] +source = "github" +github = "archlinux/archinstall" +branch = "master" +use_latest_release = true \ No newline at end of file From 410b3da3edb571eadcc3cc1f3b8715b4f7af28b9 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 11 Mar 2024 10:20:05 +0100 Subject: [PATCH 2/5] Comforming to SPDX license identifiers - https://wiki.archlinux.org/title/PKGBUILD#license --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2d0c0a7ccf..328c9d973c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) url="https://github.com/archlinux/archinstall" -license=(GPL3) +license=(GPL-3.0-or-later) depends=( 'arch-install-scripts' 'coreutils' From 99c72c96f5941c3c40960ad0bdac1b2faa5cfb55 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 11 Mar 2024 10:23:04 +0100 Subject: [PATCH 3/5] Added test function that will get populated later --- PKGBUILD | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 328c9d973c..83a4a0d2ae 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -187,21 +187,22 @@ pkgver() { prepare() { cd $pkgname-$pkgver - - # use real directories for examples and profiles, as symlinks do not work - rm -fv $pkgname/{examples,profiles} } build() { cd $pkgname-$pkgver - python -m build --wheel --no-isolation PYTHONDONTWRITEBYTECODE=1 make man -C docs } package() { - cd "$pkgname-$pkgver" - + cd $pkgname-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 docs/_build/man/archinstall.1 -t "$pkgdir/usr/share/man/man1/" } + +check() { + cd $pkgname-$pkgver + # Once we adopt pytest or something similar, + # this is where the test call will live +} \ No newline at end of file From bf02e9a3382f379abe5411a7bd82d3844a8ac30b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 11 Mar 2024 11:00:02 +0100 Subject: [PATCH 4/5] Changed nvchecker to use git source directly, as the 'github' source can hit HTTP limits --- nvchecker.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nvchecker.toml b/nvchecker.toml index 02a45f84e2..c563e04bce 100644 --- a/nvchecker.toml +++ b/nvchecker.toml @@ -1,5 +1,4 @@ [nvchecker] -source = "github" -github = "archlinux/archinstall" -branch = "master" -use_latest_release = true \ No newline at end of file +source = "git" +url = "git@github.com:archlinux/archinstall.git" +branch = "master" \ No newline at end of file From 7af4fe38cf533751b582fb269138c15f99d48301 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 11 Mar 2024 11:08:28 +0100 Subject: [PATCH 5/5] Added version prefix, because we release with v in the name --- nvchecker.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvchecker.toml b/nvchecker.toml index c563e04bce..e723b7acd0 100644 --- a/nvchecker.toml +++ b/nvchecker.toml @@ -1,4 +1,4 @@ [nvchecker] source = "git" -url = "git@github.com:archlinux/archinstall.git" -branch = "master" \ No newline at end of file +git = "https://github.com/archlinux/archinstall" +prefix = "v" \ No newline at end of file