Makefile: remove base profile

add jenkinsfile
Merge pull request #12 from schlomie/master
2017-08-17 01:58:01 +02:00 · 2017-08-16 18:21:36 +02:00 · 2017-08-16 08:54:02 -07:00 · 2017-08-15 15:40:35 +02:00 · 2017-08-15 15:40:15 +02:00 · 2017-08-07 23:29:52 +01:00
13 changed files with 284 additions and 394 deletions
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+node {
+    stage('Checkout') {
+        checkout scm
+    }
+    stage('Build') {
+        sh "/var/lib/jenkins/isobuild.sh"
+    }
+}
+
--- a/65
+++ b/65
@@ -3,26 +3,6 @@ Version=0.4
 PREFIX = /usr/local
 SYSCONFDIR = /etc

-SHARED = \
-	$(wildcard base/Packages-*) \
-	$(wildcard base/*.example)
-
-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 ${SHARED} $(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 ${SHARED}; 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
--- a/base/Packages-Live
+++ b/base/Packages-Live
@@ -1,22 +1,9 @@
-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
+linux-lts-headers
+
--- a/base/Packages-Root
+++ b/base/Packages-Root
@@ -41,7 +41,7 @@ lsb-release
 man-db
 man-pages
 memtest86+
-mkinitcpio
+mkinitcpio-openswap
 nano
 ntfs-3g
 >openrc acpid-openrc
--- a/base/netgroups/netgroups-openrc.yaml
+++ b/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
--- a/base/profile.conf.example
+++ b/base/profile.conf.example
@@ -1,7 +1,3 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
 ################ install ################

 # default displaymanager: none
--- a/cinnamon/Packages-Live
+++ b/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
--- a/i3/Packages-Desktop
+++ b/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
--- a/i3/profile.conf
+++ b/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"
--- a/lxqt/Packages-Live
+++ b/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
--- a/plasma/Packages-Desktop
+++ b/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
--- a/plasma/Packages-Live
+++ b/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
--- a/plasma/profile.conf
+++ b/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"
Author	SHA1	Message	Date
udeved	3151d1ea52	Makefile: remove base profile add jenkinsfile	2017-08-17 01:58:01 +02:00
artoo	8738b20823	Merge pull request #12 from schlomie/master Adding LTS headers in order to build DKMS packages	2017-08-16 18:21:36 +02:00
Loren Schlomer	3389203f29	Adding LTS headers in order to build DKMS packages	2017-08-16 08:54:02 -07:00
udeved	44f0ad185c	Merge branch 'master' of github.com:artix-linux/iso-profiles	2017-08-15 15:40:35 +02:00
udeved	35e4827569	add plasma profile	2017-08-15 15:40:15 +02:00
Oscar Campos	ccb68bfdaa	add artix-i3-presets	2017-08-07 23:29:52 +01:00
Oscar Campos	7bd12f03ea	added i3wm profile	2017-08-07 22:08:12 +01:00
udeved	dd3e6b08aa	add mkinitcpio-openswap for CAL luks support	2017-08-04 19:09:44 +02:00
udeved	a59313a398	make base a profile	2017-08-02 12:53:09 +02:00