add mkinitcpio-openswap for CAL luks support

Makefile

@@ -3,9 +3,9 @@ Version=0.4
 PREFIX = /usr/local
 SYSCONFDIR = /etc
 
-SHARED = \
+BASE = \
 	$(wildcard base/Packages-*) \
-	$(wildcard base/*.example)
+	base/profile.conf
 
 INFO = \
 	repo_info
@@ -39,7 +39,7 @@ install_base:
 	install -m0644 ${INFO} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
-	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
+	install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
 	install -m0644 ${LIVE_ETC} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
@@ -65,7 +65,7 @@ install_profiles:
 
 uninstall_base:
 	for f in ${INFO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/$$f; done
-	for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
+	for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
 	for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
 	for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
 	for f in ${LIVE_ETC_PAM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d/$$f; done

base/Packages-Live

@@ -1,22 +1,8 @@
-calamares
 mkinitcpio-nfs-utils
 nbd
 >openrc artix-live-openrc
 squashfs-tools
 artix-live-portable-efi
-partitionmanager
 virtualbox-guest-modules-artix
 virtualbox-guest-utils
-open-vm-tools
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
+

base/Packages-Root

@@ -41,7 +41,7 @@ lsb-release
 man-db
 man-pages
 memtest86+
-mkinitcpio
+mkinitcpio-openswap
 nano
 ntfs-3g
 >openrc acpid-openrc

base/netgroups/netgroups-openrc.yaml

@@ -1,325 +0,0 @@
-- name: "system"
-  description: "system"
-  hidden: false
-  selected: false
-  critical: false
-  subgroups:
-  - name: "base"
-    description: "Command line interface"
-    hidden: true
-    selected: true
-    critical: false
-    packages:
-        - bash
-        - bzip2
-        - coreutils
-        - cronie-openrc
-        - cryptsetup-openrc
-        - dbus-openrc
-        - device-mapper-openrc
-        - dhcpcd-openrc
-        - diffutils
-        - e2fsprogs
-        - elogind-openrc
-        - eudev-openrc
-        - file
-        - filesystem
-        - findutils
-        - gawk
-        - gcc-libs
-        - gettext
-        - glibc-openrc
-        - grep
-        - gzip
-        - inetutils-openrc
-        - iproute2
-        - iputils
-        - jfsutils
-        - json-c
-        - less
-        - licenses
-        - logrotate
-        - lsb-release
-        - lvm2-openrc
-        - man-db
-        - man-pages
-        - mdadm-openrc
-        - mkinitcpio
-        - nano
-        - netifrc
-        - openrc-settingsd
-        - opensysusers
-        - opentmpfiles
-        - pacman
-        - pciutils
-        - pcmciautils
-        - perl
-        - procps-ng
-        - psmisc
-        - reiserfsprogs
-        - sed
-        - shadow
-        - s-nail
-        - sudo
-        - sysfsutils
-        - syslog-ng-openrc
-        - tar
-        - texinfo
-        - usbutils
-        - util-linux
-        - vi
-        - which
-        - xfsprogs
-  - name: "kernel"
-    description: "Kernel packages"
-    hidden: true
-    selected: true
-    critical: false
-    packages:
-        - linux-lts
-  - name: "boot"
-    description: "Bootloader packages"
-    hidden: true
-    selected: true
-    critical: false
-    packages:
-        - grub
-        - os-prober
-        - memtest86+
-        - efibootmgr
-        - dosfstools
-  - name: "network"
-    description: "Network packages"
-    hidden: false
-    selected: true
-    critical: false
-    packages:
-        - networkmanager-openrc
-        - avahi-openrc
-        - ntp-openrc
-        - bluez-openrc
-        - openssh-openrc
-        - modemmanager
-        - nfs-utils-openrc
-        - wpa_supplicant-openrc
-  - name: "base-devel"
-    description: "Development packages assumed installed for making packages"
-    hidden: false
-    selected: false
-    critical: false
-    packages:
-        - autoconf
-        - automake
-        - binutils
-        - bison
-        - fakeroot
-        - flex
-        - gcc
-        - groff
-        - libtool
-        - m4
-        - make
-        - patch
-        - pkg-config
-  - name: "firmware"
-    description: "Firmware"
-    hidden: false
-    selected: false
-    critical: false
-    packages:
-        - bluez-firmware
-        - alsa-firmware
-        - b43-fwcutter
-        - ipw2100-fw
-        - ipw2200-fw
-        - zd1211-firmware
-  - name: 'filesystems'
-    description: 'Extra Filesystems'
-    selected: false
-    hidden: false
-    critical: false
-    packages:
-        - btrfs-progs
-        - ecryptfs-utils
-        - exfat-utils
-        - f2fs-tools
-        - ntfs-3g
-        - dmraid
-  - name: "apps"
-    description: "Utilities packages"
-    selected: false
-    hidden: false
-    critical: false
-    packages:
-        - artools-base
-        - acpi
-        - haveged-openrc
-        - powertop
-        - dmidecode
-        - inxi
-        - acpid-openrc
-        - rsync-openrc
-
-- name: "Xorg"
-  description: "Xorg server"
-  hidden: false
-  selected: false
-  critical: false
-  subgroups:
-  - name: "Xorg base"
-    description: "Xorg server"
-    hidden: false
-    selected: false
-    critical: false
-    packages:
-        - xorg-server
-  - name: "Xorg drivers"
-    description: "Xorg server"
-    hidden: false
-    selected: false
-    critical: false
-    packages:
-        - xf86-video-amdgpu
-        - xf86-video-ati
-        - xf86-video-intel
-        - xf86-video-nouveau
-        - xf86-video-openchrome
-        - xf86-video-fbdev
-        - xf86-video-vesa
-        - xf86-video-vmware
-        - virtualbox-guest-modules-artix
-
-- name: "desktop"
-  description: "Desktop packages"
-  hidden: false
-  selected: false
-  critical: false
-  subgroups:
-  - name: "displaymanager"
-    description: "Displaymanager"
-    hidden: false
-    selected: false
-    critical: false
-    packages:
-        - displaymanager-openrc
-        - artix-sddm-theme
-  - name: 'lxqt'
-    description: 'lxqt desktop'
-    selected: false
-    hidden: false
-    critical: false
-    packages:
-        - lxqt-about
-        - lxqt-admin
-        - lxqt-common
-        - lxqt-config
-        - lxqt-globalkeys
-        - lxqt-notificationd
-        - lxqt-openssh-askpass
-        - lxqt-panel
-        - lxqt-policykit
-        - lxqt-powermanagement
-        - lxqt-qtplugin
-        - lxqt-runner
-        - lxqt-session
-        - lxqt-sudo
-        - obconf-qt
-        - openbox
-        - pcmanfm-qt
-        - gvfs
-        - qterminal
-        - kwrite
-        - compton
-        - xarchiver
-        - qps
-        - qupzilla
-        - network-manager-applet
-        - artix-lxqt-presets
-        - xdg-user-dirs
-        - xdg-utils
-        - lximage-qt
-        - vlc
-        - gvfs-afc
-        - gvfs-gphoto2
-        - gvfs-mtp
-        - gvfs-nfs
-        - gvfs-smb
-        - lxappearance
-  - name: 'cinnamon'
-    description: 'cinnamon desktop'
-    selected: false
-    hidden: false
-    critical: false
-    packages:
-        - accountsservice
-        - caribou
-        - cinnamon-settings-daemon
-        - cinnamon-session
-        - cinnamon-translations
-        - cjs
-        - clutter-gtk
-        - gnome-backgrounds
-        - gnome-themes-standard
-        - gstreamer
-        - libgnome-keyring
-        - libkeybinder3
-        - librsvg
-        - muffin
-        - python2-cairo
-        - python-dbus
-        - python2-dbus
-        - python2-pillow
-        - python2-pam
-        - python2-pexpect
-        - python2-pyinotify
-        - python2-lxml
-        - cinnamon-control-center
-        - cinnamon-screensaver
-        - cinnamon-menus
-        - libgnomekbd
-        - network-manager-applet
-        - nemo
-        - polkit-gnome
-        - xapps
-        - python2-gobject
-        - gedit
-        - gnome-terminal
-        - blueberry
-
-- name: 'fonts'
-  description: 'Fonts'
-  selected: false
-  hidden: false
-  critical: false
-  packages:
-       - terminus-font
-       - ttf-bitstream-vera
-       - ttf-dejavu
-       - ttf-droid
-       - ttf-inconsolata
-       - ttf-indic-otf
-       - ttf-liberation
-       - noto-fonts
-
-- name: 'audio'
-  description: 'Audio'
-  selected: false
-  hidden: false
-  critical: false
-  packages:
-        - pulseaudio
-        - pulseaudio-alsa
-        - pavucontrol-qt
-        - alsa-utils-openrc
-
-- name: 'printing'
-  description: 'Printing'
-  selected: false
-  hidden: false
-  critical: false
-  packages:
-        - bluez-cups
-        - cups-openrc
-        - cups-filters
-        - cups-pdf
-        - system-config-printer

base/profile.conf

@@ -1,7 +1,3 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
 ################ install ################
 
 # default displaymanager: none

cinnamon/Packages-Live

@@ -0,0 +1,22 @@
+calamares
+mkinitcpio-nfs-utils
+nbd
+>openrc artix-live-openrc
+squashfs-tools
+artix-live-portable-efi
+partitionmanager
+virtualbox-guest-modules-artix
+virtualbox-guest-utils
+open-vm-tools
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo

lxqt/Packages-Live

@@ -0,0 +1,22 @@
+calamares
+mkinitcpio-nfs-utils
+nbd
+>openrc artix-live-openrc
+squashfs-tools
+artix-live-portable-efi
+partitionmanager
+virtualbox-guest-modules-artix
+virtualbox-guest-utils
+open-vm-tools
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo