Makefile: remove base profile

add jenkinsfile

Jenkinsfile

@@ -0,0 +1,9 @@
+node {
+    stage('Checkout') {
+        checkout scm
+    }
+    stage('Build') {
+        sh "/var/lib/jenkins/isobuild.sh"
+    }
+}
+

Makefile

@@ -3,26 +3,6 @@ Version=0.4
 PREFIX = /usr/local
 SYSCONFDIR = /etc
 
-BASE = \
-	$(wildcard base/Packages-*) \
-	base/profile.conf
-
-INFO = \
-	repo_info
-
-LIVE_ETC = \
-	base/live-overlay/etc/issue \
-	base/live-overlay/etc/fstab
-
-LIVE_ETC_DEFAULT = \
-	$(wildcard base/live-overlay/etc/default/*)
-
-LIVE_ETC_PAM = \
-	$(wildcard base/live-overlay/etc/pam.d/*)
-
-LIVE_ETC_SUDOERS = \
-	$(wildcard base/live-overlay/etc/sudoers.d/*)
-
 LXQT = \
 	$(wildcard lxqt/Packages-*) \
 	lxqt/profile.conf
@@ -31,54 +11,41 @@ CINNAMON = \
 	$(wildcard cinnamon/Packages-*) \
 	cinnamon/profile.conf
 
+PLASMA = \
+	$(wildcard plasma/Packages-*) \
+	plasma/profile.conf
+
+ITHREE = \
+	$(wildcard i3/Packages-*) \
+	i3/profile.conf
+
 CINNAMON_LIGHTDM = \
 	$(wildcard cinnamon/desktop-overlay/etc/lightdm/*.conf)
 
-install_base:
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
-	install -m0644 ${INFO} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
-
-	install -dm0755 $(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
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
-	install -m0644 ${LIVE_ETC_DEFAULT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
-	install -m0644 ${LIVE_ETC_PAM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
-	install -m0644 ${LIVE_ETC_SUDOERS} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
-
 install_profiles:
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt
 	install -m0644 ${LXQT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt
 
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/plasma
+	install -m0644 ${PLASMA} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/plasma
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/i3
+	install -m0644 ${ITHREE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/i3
+
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon
 	install -m0644 ${CINNAMON} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm
 	install -m0644 ${CINNAMON_LIGHTDM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm
 
-uninstall_base:
-	for f in ${INFO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/$$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
-	for f in ${LIVE_ETC_SUDOERS}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d/$$f; done
-
 uninstall_profiles:
 	for f in ${LXQT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt/$$f; done
 	for f in ${CINNAMON}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/$$f; done
 	for f in ${CINNAMON_LIGHTDM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm/$$f; done
 
-install: install_base install_profiles
+install: install_profiles
 
-uninstall: uninstall_base uninstall_profiles
+uninstall: uninstall_profiles
 
 dist:
 	git archive --format=tar --prefix=iso-profiles-$(Version)/ $(Version) | gzip -9 > iso-profiles-$(Version).tar.gz

base/Packages-Live

@@ -5,4 +5,5 @@ squashfs-tools
 artix-live-portable-efi
 virtualbox-guest-modules-artix
 virtualbox-guest-utils
+linux-lts-headers
 

i3/Packages-Desktop

@@ -0,0 +1,54 @@
+acpi
+alsa-firmware
+artix-sddm-theme
+artix-i3-presets
+blueberry
+clipit
+compton
+dash
+dmenu
+dmidecode
+gsimplecal
+feh
+i3blocks
+i3lock
+i3lock-wrapper
+i3status
+i3-wm
+j4-dmenu-desktop
+lm_sensors
+network-manager-applet
+>openrc alsa-utils-openrc
+>openrc avahi-openrc
+>openrc displaymanager-openrc
+>openrc json-c
+>openrc networkmanager-openrc
+>openrc ntp-openrc
+>openrc openrc-settingsd
+>openrc openssh-openrc
+>openrc syslog-ng-openrc
+pcmanfm
+polkit
+powertop
+ranger
+sxiv
+screenfetch
+terminus-font
+termite
+tree
+ttf-bitstream-vera
+ttf-dejavu
+ttf-droid
+ttf-inconsolata
+ttf-indic-otf
+ttf-liberation
+vim
+w3m
+xdg-user-dirs
+xdg-utils
+xosd
+xorg-server
+xorg-twm
+xorg-xinit
+xorg-xrandr
+zathura

i3/profile.conf

@@ -0,0 +1,26 @@
+################ install ################
+
+# default displaymanager: none
+# supported; lightdm, sddm, gdm, lxdm, mdm
+displaymanager="sddm"
+
+# Set to false to disable autologin in the livecd
+# autologin="true"
+
+# service runlevels
+# openrc_boot=('elogind')
+# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+
+# unset defaults to given values
+# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
+
+################# live-session #################
+
+# unset defaults to given value
+# hostname="artix"
+
+# unset defaults to given value
+# username="artix"
+
+# unset defaults to given value
+# password="artix"

plasma/Packages-Desktop

@@ -0,0 +1,84 @@
+alsa-firmware
+artix-sddm-theme
+artix-lxqt-presets
+dmidecode
+inxi
+kwrite
+mobile-broadband-provider-info
+modemmanager
+nss-mdns
+>openrc alsa-utils-openrc
+>openrc avahi-openrc
+>openrc displaymanager-openrc
+>openrc json-c
+>openrc networkmanager-openrc
+>openrc ntp-openrc
+>openrc openrc-settingsd
+>openrc openssh-openrc
+>openrc syslog-ng-openrc
+powertop
+terminus-font
+ttf-bitstream-vera
+ttf-dejavu
+ttf-droid
+ttf-inconsolata
+ttf-indic-otf
+ttf-liberation
+xdg-user-dirs
+xdg-utils
+xorg-server
+xorg-twm
+xorg-xinit
+bluedevil
+breeze
+breeze-gtk
+discover
+drkonqi
+kactivitymanagerd
+kde-cli-tools
+kde-gtk-config
+kdecoration
+kdeplasma-addons
+kgamma5
+khotkeys
+kinfocenter
+kmenuedit
+knetattach
+kscreen
+kscreenlocker
+ksshaskpass
+ksysguard
+kuiserver
+kwallet-pam
+kwayland-integration
+kwin
+kwrited
+libkscreen
+libksysguard
+milou
+oxygen
+plasma-desktop
+plasma-integration
+plasma-nm
+plasma-pa
+plasma-sdk
+plasma-workspace
+plasma-workspace-wallpapers
+polkit-kde-agent
+powerdevil
+sddm-kcm
+systemsettings
+user-manager
+xdg-desktop-portal-kde
+dolphin
+kate
+kdialog
+keditbookmarks
+kfind
+khelpcenter
+konqueror
+konsole
+kwrite
+ark
+okular
+kwalletmanager

plasma/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

plasma/profile.conf

@@ -0,0 +1,26 @@
+################ install ################
+
+# default displaymanager: none
+# supported; lightdm, sddm, gdm, lxdm, mdm
+displaymanager="sddm"
+
+# Set to false to disable autologin in the livecd
+# autologin="true"
+
+# service runlevels
+# openrc_boot=('elogind')
+# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+
+# unset defaults to given values
+# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
+
+################# live-session #################
+
+# unset defaults to given value
+# hostname="artix"
+
+# unset defaults to given value
+# username="artix"
+
+# unset defaults to given value
+# password="artix"