Merge pull request #28 from artix-linux/devel

Devel-0.5.3

Makefile

@@ -1,4 +1,4 @@
-Version=0.4
+Version=0.5
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc
@@ -81,6 +81,26 @@ LIBS_YAML = \
 SHARED_YAML = \
 	data/linux.preset
 
+INFO = \
+	data/repo_info
+
+BASE = \
+	$(wildcard data/base/Packages-*) \
+	data/base/profile.conf
+
+LIVE_ETC = \
+	data/base/live-overlay/etc/issue \
+	data/base/live-overlay/etc/fstab
+
+LIVE_ETC_DEFAULT = \
+	$(wildcard data/base/live-overlay/etc/default/*)
+
+LIVE_ETC_PAM = \
+	$(wildcard data/base/live-overlay/etc/pam.d/*)
+
+LIVE_ETC_SUDOERS = \
+	$(wildcard data/base/live-overlay/etc/sudoers.d/*)
+
 all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) $(BIN_YAML)
 
 edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
@@ -112,9 +132,6 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
 	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
 
@@ -132,6 +149,25 @@ install_pkg:
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
 	install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
 
+install_isobase:
+	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_iso:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
@@ -168,7 +204,6 @@ uninstall_base:
 	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
 uninstall_pkg:
-	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d/$$f; done
 	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
 	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
@@ -176,6 +211,14 @@ uninstall_pkg:
 	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
 	for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
+uninstall_isobase:
+	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_iso:
 	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
@@ -190,9 +233,9 @@ uninstall_yaml:
 	for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 	for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
 
-install: install_base install_pkg install_iso install_yaml
+install: install_base install_pkg install_iso install_yaml install_isobase
 
-uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_yaml
+uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_yaml uninstall_isobase
 
 dist:
 	git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz

README.md

@@ -31,16 +31,12 @@ By default it is commented and shows just initialization values done in code.
 Tools configuration is done in artools.conf or by args.
 Specifying args will override artools.conf settings.
 
-User build lists(eg 'my-super-build.list') can be placed in
-
 ~~~
-$HOME/.config/artools/pkg.list.d
-$HOME/.config/artools/iso.list.d
+$HOME/.config/artools/import.list.d
 ~~~
 
 overriding
 
 ~~~
-/etc/artools/pkg.list.d
-/etc/artools/iso.list.d
+/etc/artools/import.list.d
 ~~~

bin/buildpkg.in

@@ -37,11 +37,9 @@ display_settings(){
     show_version
     show_config
 
-    msg2 "is_build_list: %s" "${is_build_list}"
-
     msg "OPTIONS:"
     msg2 "arch: %s" "${target_arch}"
-    ${repo_add} && msg2 "repository: %s" "${repository}"
+    msg2 "repository: %s" "${repository}"
     msg2 "chroots_pkg: %s" "${chroots_pkg}"
 
     msg "ARGS:"
@@ -49,10 +47,10 @@ display_settings(){
     msg2 "delete_first: %s" "${delete_first}"
     msg2 "clean_first: %s" "${clean_first}"
     msg2 "update_first: %s" "${update_first}"
-    msg2 "purge: %s" "${purge}"
     msg2 "namcap: %s" "${namcap}"
     msg2 "sign: %s" "${sign}"
     msg2 "repo_add: %s" "${repo_add}"
+    msg2 "copy_pkg: %s" "${copy_pkg}"
 
     msg "PATHS:"
     msg2 "pkg_dir: %s" "${pkg_dir}"
@@ -62,8 +60,8 @@ display_settings(){
         msg2 "packages: %s" "${packages[*]}"
     fi
 
-    msg "BUILD QUEUE:"
-    run show_pkg "${build_list}"
+    msg "BUILD:"
+    show_pkg "${package}"
 }
 
 load_user_info
@@ -76,19 +74,20 @@ create_first=false
 delete_first=false
 clean_first=false
 update_first=false
-purge=false
 namcap=false
 pretend=false
-is_build_list=false
 sign=false
 is_multilib=false
 repo_add=false
+copy_pkg=false
 
 mkchroot_args=()
 mkchrootpkg_args=()
+deploypkg_args=(-x)
 
 install_pkgs=()
 repository=${PWD##*/}
+package=''
 
 prepare_build(){
     local pac_arch='default'
@@ -99,9 +98,10 @@ prepare_build(){
     fi
 
     local pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
+    [[ -f $AT_USERCONFDIR/pacman-$pac_arch.conf ]] && pacman_conf="$AT_USERCONFDIR/pacman-$pac_arch.conf"
 
-    work_dir="${chroots_pkg}/${target_arch}"
-    pkg_dir="${cache_dir_pkg}/${target_arch}"
+    work_dir="${chroots_pkg}/${target_arch}/${repository}"
+    pkg_dir="${cache_dir_pkg}/${target_arch}/${repository}"
 
     local makepkg_conf=$(get_makepkg_conf "${target_arch}")
 
@@ -110,13 +110,12 @@ prepare_build(){
     mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf})
 
     mkchrootpkg_args+=(-r ${work_dir})
+    deploypkg_args+=(-r ${repository})
 
     prepare_dir "${pkg_dir}"
 
     prepare_dir "${work_dir}"
 
-    eval_build_list "${build_list}"
-
     packages=('base-devel')
     ${is_multilib} && packages+=('multilib-devel')
 
@@ -125,18 +124,18 @@ prepare_build(){
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -p <pkg>           Build list or pkg [default: ${build_list}]"
+    echo "    -p <pkg>           Package to build [default: ${package}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo '    -r <dir>           Chroots directory'
     echo "                       [default: ${chroots_pkg}]"
     echo '    -i <pkgs>          Install packages into the working copy of the chroot'
-    echo "    -z <repo>          The repo name to add the package(s)  [default: ${repository}]"
+    echo "    -z <repo>          The repo name to add the package(s) [default: ${repository}]"
     echo '    -o                 Create chroot'
     echo '    -d                 Delete chroot'
     echo '    -c                 Clean chroot copy'
     echo '    -u                 Update chroot copy'
-    echo '    -w                 Clean up cache and sources'
     echo '    -x                 Add the package(s) to the repo'
+    echo '    -l                 Copy the package(s) to the repo instead of symlink'
     echo '    -n                 Install and run namcap check'
     echo '    -s                 Sign packages'
     echo '    -q                 Query settings and pretend build'
@@ -148,11 +147,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:i:z:odcuwnsxqh'
+opts='p:a:r:i:z:oldcunsxqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) build_list="$OPTARG" ;;
+        p) package="$OPTARG" ;;
         a) target_arch="$OPTARG" ;;
         r) chroots_pkg="$OPTARG" ;;
         i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "${install_pkgs[*]}") ;;
@@ -161,8 +160,8 @@ while getopts "${opts}" arg; do
         d) delete_first=true ;;
         c) clean_first=true ; mkchrootpkg_args+=(-c) ;;
         u) update_first=true ; mkchrootpkg_args+=(-u) ;;
-        w) purge=true ;;
         x) repo_add=true ;;
+        l) copy_pkg=true; deploypkg_args+=(-c) ;;
         n) namcap=true; mkchrootpkg_args+=(-n) ;;
         s) sign=true ;;
         q) pretend=true ;;
@@ -183,4 +182,4 @@ ${delete_first} && delete_chroot "${work_dir}/root" "${work_dir}"
 
 ${create_first} && create_chroot "${mkchroot_args[@]}" "${work_dir}/root" "${packages[@]}"
 
-run make_pkg "${build_list}"
+build "${package}"

bin/buildtree.in

@@ -19,7 +19,7 @@ import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg-tree.sh
 
 show_imports(){
-    for repo in ${repo_tree_artix[@]};do
+    for repo in ${repo_tree_import[@]};do
         read_import_list "$repo"
         for p in ${import_list[@]};do
             msg2 "%s: %s" ""$repo "$p"
@@ -32,20 +32,17 @@ display_settings(){
     show_config
 
     msg "REPOS:"
-    msg2 "repo_tree_artix: %s" "${repo_tree_artix[*]}"
     msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
+    msg2 "repo_tree_import: %s" "${repo_tree_import[*]}"
 
     msg "ARGS:"
     msg2 "verbose: %s" "${verbose}"
-    msg2 "artix: %s" "${artix}"
     msg2 "arch: %s" "${arch}"
     msg2 "import_arch: %s" "${import_arch}"
 
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
     msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-#     msg2 "host_tree_artix: %s" "${host_tree_artix}"
-#     msg2 "host_tree_arch: %s" "${host_tree_arch}"
 
     if ${verbose}; then
         if ${import_arch};then
@@ -59,7 +56,6 @@ load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
-artix=false
 pretend=false
 arch=false
 import_arch=false
@@ -69,9 +65,8 @@ rsync_args=(-aWx --progress --delete --no-R --no-implied-dirs)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -x            Sync artix tree"
     echo "    -a            Sync arch tree"
-    echo '    -i            Import arch system packages'
+    echo '    -i            Import arch packages'
     echo '    -v            Verbose import output'
     echo '    -q            Query settings'
     echo '    -h            This help'
@@ -82,11 +77,10 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='xaivqh'
+opts='aivqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        x) artix=true ;;
         a) arch=true ;;
         i) import_arch=true ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;
@@ -103,8 +97,6 @@ prepare_dir "${tree_dir_arch}"
 
 ${pretend} && display_settings && exit 1
 
-${artix} && sync_tree_artix
-
 ${arch} && sync_tree_arch
 
 ${import_arch} && import_from_arch

bin/deploypkg.in

@@ -36,6 +36,7 @@ display_settings(){
     msg "ARGS:"
     msg2 "add_pkg: %s" "${add_pkg}"
     msg2 "del_pkg: %s" "${del_pkg}"
+    msg2 "copy_pkg: %s" "${copy_pkg}"
     msg2 "download: %s" "${download}"
     msg2 "upload: %s" "${upload}"
     msg2 "verbose: %s" "${verbose}"
@@ -60,7 +61,7 @@ verbose=false
 verbose=false
 add_pkg=false
 del_pkg=false
-move=false
+copy_pkg=false
 package=''
 
 rsync_args=(-rtxisP --progress --delete -e ssh)
@@ -71,9 +72,9 @@ usage() {
     echo "    -r                 Repository to sync [default:${repository}]"
     echo "    -u                 Upload repository"
     echo '    -d                 Download repository'
-    echo '    -m                 Move package from repository to pool'
     echo "    -p                 Package name to add/delete"
     echo '    -x                 Add package to repository'
+    echo '    -c                 Copy instead of symlink package to repository'
     echo '    -y                 Delete package from repository'
     echo '    -q                 Query settings and pretend upload'
     echo '    -v                 Verbose output'
@@ -85,7 +86,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:xymduvqh'
+opts='p:a:r:xyducvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -94,8 +95,8 @@ while getopts "${opts}" arg; do
         p) package="$OPTARG" ;;
         x) add_pkg=true ;;
         y) del_pkg=true ;;
+        c) copy_pkg=true ;;
         d) download=true ;;
-        m) move=true ;;
         u) upload=true; rsync_args+=(-L) ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;
         q) pretend=true; rsync_args+=(-n) ;;
@@ -112,9 +113,7 @@ prepare_dir "${repos_local}"
 
 ${pretend} && display_settings #&& exit 1
 
-${move} && move_to_pool "${repository}" "${target_arch}" "${package}"
-
-${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add"
+${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add" "${copy_pkg}"
 ${del_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "remove"
 
 ${download} && repo_download "${repository}"

bin/mkchrootpkg.in

@@ -221,6 +221,7 @@ EOF
 # These functions aren't run in makechrootpkg,
 # so no global variables
 _chrootbuild() {
+    export LANG=en_US.UTF-8
     . /etc/profile
     sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }

data/artools.conf

@@ -27,8 +27,8 @@
 ################ artools-pkg ################
 #############################################
 
-# artix package tree
-# repo_tree_artix=('system' 'world' 'galaxy')
+# artix import tree
+# repo_tree_import=('system-arch' 'world-arch' 'galaxy-arch')
 
 # host_tree_artix=https://github.com/artix-linux
 
@@ -37,9 +37,6 @@
 
 # host_tree_arch=git://projects.archlinux.org/svntogit
 
-# default pkg build list; name without .list extension
-# build_list=default
-
 # default repos root
 # repos_local=${workspace_dir}/repos
 

data/base/Packages-Live

@@ -0,0 +1,9 @@
+mkinitcpio-nfs-utils
+nbd
+>openrc artix-live-openrc
+squashfs-tools
+artix-live-portable-efi
+virtualbox-guest-modules-artix
+virtualbox-guest-utils
+linux-lts-headers
+

data/base/Packages-Root

@@ -0,0 +1,82 @@
+acpi
+b43-fwcutter
+bash
+btrfs-progs
+bzip2
+coreutils
+crda
+dhclient
+diffutils
+dmraid
+dnsmasq
+dosfstools
+e2fsprogs
+ecryptfs-utils
+exfat-utils
+f2fs-tools
+file
+filesystem
+findutils
+gawk
+gcc-libs
+gettext
+glibc
+grep
+grub
+gzip
+inetutils
+#intel-ucode
+iproute2
+iptables
+iputils
+ipw2100-fw
+ipw2200-fw
+jfsutils
+KERNEL
+less
+licenses
+linux-firmware
+logrotate
+lsb-release
+man-db
+man-pages
+memtest86+
+mkinitcpio-openswap
+nano
+ntfs-3g
+>openrc acpid-openrc
+>openrc cronie-openrc
+>openrc cryptsetup-openrc
+>openrc dbus-openrc
+>openrc device-mapper-openrc
+>openrc dhcpcd-openrc
+>openrc elogind-openrc
+>openrc haveged-openrc
+>openrc lvm2-openrc
+>openrc mdadm-openrc
+>openrc netifrc
+>openrc nfs-utils-openrc
+>openrc rsync-openrc
+>openrc wpa_supplicant-openrc
+os-prober
+pacman
+pciutils
+pcmciautils
+perl
+procps-ng
+psmisc
+reiserfsprogs
+sed
+shadow
+s-nail
+sudo
+sysfsutils
+tar
+texinfo
+usbutils
+util-linux
+which
+>x86_64 efibootmgr
+xfsprogs
+zd1211-firmware
+zsh

data/base/live-overlay/etc/default/grub

@@ -0,0 +1,49 @@
+GRUB_DEFAULT=saved
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Artix"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX=""
+
+# If you want to enable the save default function, uncomment the following
+# line, and set GRUB_DEFAULT to saved.
+GRUB_SAVEDEFAULT=true
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT=5
+#GRUB_HIDDEN_TIMEOUT_QUIET=true
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT=console
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX=keep
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY=true
+
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper
+# modes only.  Entries specified as foreground/background.
+GRUB_COLOR_NORMAL="light-gray/black"
+GRUB_COLOR_HIGHLIGHT="cyan/black"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+GRUB_BACKGROUND="/usr/share/grub/background.png"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"

data/base/live-overlay/etc/fstab

@@ -0,0 +1,5 @@
+#
+# /etc/fstab: static file system information
+#
+# <file system>        <dir>         <type>    <options>          <dump> <pass>
+/dev/mapper/root-image /             auto      defaults           0      0

data/base/live-overlay/etc/issue

@@ -0,0 +1,13 @@
+
+Artix Live ISO (\l) - \s-\r \m
+
+
+
+# Welcome to Artix #
+
+
+login for the live environment:
+    user     'artix'
+    password 'artix'
+
+

data/base/live-overlay/etc/pam.d/su

@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth		sufficient	pam_rootok.so
+auth		sufficient	pam_wheel.so trust use_uid
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

data/base/live-overlay/etc/sudoers.d/g_wheel

@@ -0,0 +1 @@
+%wheel  ALL=(ALL) NOPASSWD: ALL

data/base/profile.conf

@@ -0,0 +1,26 @@
+################ install ################
+
+# default displaymanager: none
+# supported; lightdm, sddm, gdm, lxdm, mdm
+# displaymanager="none"
+
+# 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"

data/import.list.d/galaxy.list

@@ -0,0 +1,6 @@
+autoconf-archive
+confuse
+libappindicator
+libdbusmenu
+libftdi
+libindicator

data/import.list.d/world.list

@@ -33,3 +33,180 @@ qt5-websockets
 qt5-webview
 qt5-x11extras
 qt5-xmlpatterns
+adwaita-icon-theme
+alsa-lib
+apr
+apr-util
+atk
+at-spi2-atk
+at-spi2-core
+boost
+cairo
+cantarell-fonts
+check
+compositeproto
+damageproto
+dbus-glib
+dconf
+desktop-file-utils
+docbook-dsssl
+docbook-sgml31
+docbook-utils
+docbook-xml
+docbook-xsl
+double-conversion
+doxygen
+eventlog
+fixesproto
+fontconfig
+fontsproto
+freetype2
+gd
+gdk-pixbuf2
+ghostscript
+giflib
+gnome-common
+gobject-introspection
+gptfdisk
+graphite
+graphviz
+gsfonts
+gtk3
+gtk-doc
+gts
+harfbuzz
+hicolor-icon-theme
+ijs
+inputproto
+intltool
+itstool
+jasper
+jbig2dec
+json-glib
+kbproto
+lcms2
+libasyncns
+libblockdev
+libbytesize
+libcap-ng
+libcroco
+libdaemon
+libdatrie
+libdrm
+libepoxy
+libexif
+libfontenc
+libglvnd
+libgphoto2
+libical
+libice
+libieee1284
+libimobiledevice
+libiscsi
+libjpeg-turbo
+libomxil-bellagio
+libpaper
+libpciaccess
+libplist
+libpng
+libproxy
+librsvg
+libsm
+libthai
+libtiff
+libtxc_dxtn
+libunwind
+libusb-compat
+libusbmuxd
+libwebp
+libx11
+libxau
+libxaw
+libxcb
+libxcomposite
+libxcursor
+libxdamage
+libxdmcp
+libxext
+libxfixes
+libxfont
+libxfont2
+libxft
+libxi
+libxinerama
+libxkbcommon
+libxkbfile
+libxml2
+libxmu
+libxpm
+libxrandr
+libxrender
+libxshmfence
+libxslt
+libxt
+libxtst
+libxxf86vm
+lirc
+llvm
+mesa
+mtdev
+net-snmp
+openjade
+opensp
+pango
+parted
+pcre2
+perl-error
+perl-xml-parser
+perl-yaml
+pixman
+python2
+python
+python-appdirs
+python-beaker
+python-mako
+python-markupsafe
+python-packaging
+python-pyparsing
+python-setuptools
+python-six
+randrproto
+recordproto
+renderproto
+serf
+sgml-common
+shared-mime-info
+source-highlight
+speexdsp
+tslib
+v4l-utils
+vala
+valgrind
+volume_key
+vte3
+vte
+wayland
+wayland-protocols
+xcb-proto
+xcb-util
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
+xextproto
+xf86vidmodeproto
+xineramaproto
+xkeyboard-config
+xorg-bdftopcf
+xorg-fonts-alias
+xorg-fonts-encodings
+xorg-fonts-misc
+xorg-font-util
+xorg-font-utils
+xorg-mkfontdir
+xorg-mkfontscale
+xorg-setxkbmap
+xorg-xkbcomp
+xproto
+yelp-tools
+yelp-xsl

data/pkg.list.d/default.list

@@ -1 +0,0 @@
-openrc

data/repo_info

@@ -0,0 +1 @@
+0.5

lib/util-pkg-chroot.sh

@@ -26,7 +26,11 @@ get_makepkg_conf(){
     local arch="$1"
     local conf="${tmp_dir}/makepkg-${arch}.conf"
 
-    cp "${DATADIR}/makepkg.conf" "$conf"
+    if [[ -f $AT_USERCONFDIR/makepkg.conf ]];then
+        cp "$AT_USERCONFDIR/makepkg.conf" "$conf"
+    else
+        cp "${DATADIR}/makepkg.conf" "$conf"
+    fi
 
     load_compiler_settings "${arch}"
 
@@ -47,16 +51,7 @@ check_build(){
 find_pkg(){
     local bdir="$1"
     local result=$(find . -type d -name "${bdir}")
-    [[ -z $result ]] && die "%s is not a valid package or build list!" "${bdir}"
-}
-
-clean_up(){
-    msg2 "Cleaning [%s]" "${pkg_dir}"
-    find ${pkg_dir} -maxdepth 1 -name "*.*" -delete #&> /dev/null
-    if [[ -z $SRCDEST ]];then
-        msg2 "Cleaning [source files]"
-        find $PWD -maxdepth 1 -name '*.?z?' -delete #&> /dev/null
-    fi
+    [[ -z $result ]] && die "%s is not a valid package!" "${bdir}"
 }
 
 sign_pkg(){
@@ -89,20 +84,18 @@ post_build(){
         src=$pkg-$ver-$tarch.$ext
         move_to_cache "$src"
         if ${repo_add};then
-            deploypkg -r "${repository}" -x -p "$src"
+            deploypkg "${deploypkg_args[@]}" -p "$src"
             user_own "${repos_local}/${repository}" -R
         fi
     done
 }
 
 build_pkg(){
-    ${purge} && clean_up
-#     setarch "${target_arch}"
     mkchrootpkg "${mkchrootpkg_args[@]}" || die
     post_build
 }
 
-make_pkg(){
+build(){
     local pkg="$1"
     check_build "${pkg}"
     msg "Start building [%s]" "${pkg}"

lib/util-pkg-publish.sh

@@ -10,27 +10,22 @@
 # GNU General Public License for more details.
 
 repo_update(){
-    local repo="$1" arch="$2" pkg="$3" action="$4"
+    local repo="$1" arch="$2" pkg="$3" action="$4" copy="$5"
     if [[ $action == "add" ]];then
         if [[ -f ${repos_local}/$repo/os/$arch/$pkg \
             && -f ${repos_local}/$repo/os/$arch/$pkg.sig ]];then
             rm ${repos_local}/$repo/os/$arch/$pkg
             rm ${repos_local}/$repo/os/$arch/$pkg.sig
         fi
-        ln -s ${cache_dir_pkg}/$arch/$pkg{,.sig} ${repos_local}/$repo/os/$arch/
+        local cmd='ln -s'
+        $copy && cmd='cp'
+        $cmd ${cache_dir_pkg}/$arch/$repo/$pkg{,.sig} ${repos_local}/$repo/os/$arch/
     fi
     local dest=${repos_local}/$repo/os/$arch/$pkg
-    if [[ $action == "remove" ]];then
-        dest=$pkg
-    fi
+    [[ $action == "remove" ]] && dest=$pkg
     repo-$action -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz $dest
 }
 
-move_to_pool(){
-    local repo="$1" arch="$2" pkg="$3"
-    cp ${repos_local}/$repo/os/$arch/$pkg{,.sig} ${cache_dir_pkg}/$arch/
-}
-
 update_lock(){
     local repo="$1"
     rsync "${rsync_args[@]}" --exclude='os' "${repos_local}/$repo/" "$(connect)${repos_remote}/$repo/"

lib/util-pkg-tree.sh

@@ -17,33 +17,16 @@ get_remote_head(){
     echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
 }
 
-sync_tree_branches(){
-    local branches=(master artix archlinux)
-    for b in ${branches[@]};do
-        git checkout $b &> /dev/null
-        local local_head=$(get_local_head "$b")
-        local remote_head=$(get_remote_head "$b")
-        local timer=$(get_timer) repo="$1"
-        msg "Checking [%s] (%s) ..." "$repo" "$b"
-        msg2 "local: %s" "${local_head}"
-        msg2 "remote: %s" "${remote_head}"
-        if [[ "${local_head}" == "${remote_head}" ]]; then
-            info "nothing to do"
-        else
-            info "needs sync"
-            git pull origin $b
-        fi
-        msg "Done [%s] (%s)" "$repo" "$b"
-    done
-    git checkout master &> /dev/null
-    show_elapsed_time "${FUNCNAME}" "${timer}"
+is_dirty() {
+    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
+    return 0
 }
 
 sync_tree(){
-    local branch="master"
+    local branch="master" repo="$1"
     local local_head=$(get_local_head "$branch")
     local remote_head=$(get_remote_head "$branch")
-    local timer=$(get_timer) repo="$1"
+    local timer=$(get_timer)
     msg "Checking [%s] ..." "$repo"
     msg2 "local: %s" "${local_head}"
     msg2 "remote: %s" "${remote_head}"
@@ -66,20 +49,6 @@ clone_tree(){
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
-sync_tree_artix(){
-    cd ${tree_dir_artix}
-        for repo in ${repo_tree_artix[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    sync_tree_branches "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_artix}/${repo}"
-            fi
-        done
-    cd ..
-}
-
 sync_tree_arch(){
     cd ${tree_dir_arch}
         for repo in ${repo_tree_arch[@]};do
@@ -100,33 +69,36 @@ read_import_list(){
     import_list=$(sed "$_com_rm" "${list_dir_import}/$name.list" | sed "$_space" | sed "$_clean")
 }
 
-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
 get_pkgver(){
     source PKGBUILD
     echo $pkgver-$pkgrel
 }
 
+is_untracked(){
+    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
+    return 0
+}
+
 import_from_arch(){
-    local timer=$(get_timer)
-    for repo in ${repo_tree_artix[@]};do
+    local timer=$(get_timer) branch='testing'
+    for repo in ${repo_tree_import[@]};do
         read_import_list "$repo"
         if [[ -n ${import_list[@]} ]];then
             cd ${tree_dir_artix}/$repo
-            git checkout archlinux &> /dev/null
+            git checkout $branch &> /dev/null
+            $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
+            git pull origin $branch &> /dev/null
             local arch_dir=packages
             [[ $repo == "galaxy" ]] && arch_dir=community
-            msg "Import into [%s] branch (archlinux)" "$repo"
+            msg "Import into [%s]" "$repo"
             for pkg in ${import_list[@]};do
-                msg2 "Importing [%s] ..." "$pkg"
                 rsync "${rsync_args[@]}" ${tree_dir_arch}/$arch_dir/$pkg/trunk/ ${tree_dir_artix}/$repo/$pkg/
-                if $(is_dirty); then
+                if $(is_dirty) || $(is_untracked); then
                     git add $pkg
                     cd $pkg
-                        git commit -m "Archlinux $pkg-$(get_pkgver) import"
+                        local ver=$(get_pkgver)
+                        msg2 "Archlinux import: [%s]" "$pkg-$ver"
+                        git commit -m "Archlinux import: $pkg-$ver"
                     cd ..
                 fi
             done

lib/util-pkg.sh

@@ -9,39 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# $1: list_dir
-show_build_lists(){
-    local list temp
-    for item in $(ls $1/*.list); do
-        temp=${item##*/}
-        list=${list:-}${list:+|}${temp%.list}
-    done
-    echo $list
-}
-
-read_build_list(){
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
-    build_list=$(sed "$_com_rm" "$1.list" | sed "$_space" | sed "$_clean")
-}
-
-# $1: build list
-eval_build_list(){
-    eval "case $1 in
-        $(show_build_lists ${list_dir_pkg})) is_build_list=true; read_build_list ${list_dir_pkg}/$1 ;;
-        *) is_build_list=false ;;
-    esac"
-}
-
-run(){
-    if ${is_build_list};then
-        for item in ${build_list[@]};do
-            $1 $item
-        done
-    else
-        $1 $2
-    fi
-}
-
 in_array() {
     local needle=$1; shift
     local item

lib/util-profile.sh

@@ -61,21 +61,21 @@ load_profile(){
 
     enable_live=('artix-live' 'pacman-init')
 
-    netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
+    [[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
 
-    root_list=${run_dir}/base/Packages-Root
+    root_list=${DATADIR}/iso-profiles/base/Packages-Root
     [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
 
-    root_overlay="${run_dir}/base/root-overlay"
+    root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
     [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
 
     [[ -f "$profdir/Packages-Desktop" ]] && desktop_list=$profdir/Packages-Desktop
     [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
 
-    live_list="${run_dir}/base/Packages-Live"
+    live_list="${DATADIR}/iso-profiles/base/Packages-Live"
     [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
 
-    live_overlay="${run_dir}/base/live-overlay"
+    live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
     [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
 
     return 0

lib/util.sh

@@ -37,14 +37,9 @@ prepare_dir(){
     [[ ! -d $1 ]] && mkdir -p $1
 }
 
-get_release(){
-    source /etc/lsb-release
-    echo "${DISTRIB_RELEASE}"
-}
-
 get_distname(){
-    source /etc/lsb-release
-    echo "${DISTRIB_ID%Linux}"
+    source /usr/lib/os-release
+    echo "${NAME%Linux}"
 }
 
 get_disturl(){
@@ -91,7 +86,7 @@ init_artools_pkg(){
 
     [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
 
-    [[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy')
+    [[ -z ${repo_tree_import[@]} ]] && repo_tree_import=('system' 'world' 'galaxy')
 
     [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
 
@@ -107,14 +102,8 @@ init_artools_pkg(){
 
     chroots_pkg="${chroots_dir}/buildpkg"
 
-    list_dir_pkg="${SYSCONFDIR}/pkg.list.d"
-
     make_conf_dir="${SYSCONFDIR}/make.conf.d"
 
-    [[ -d ${AT_USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${AT_USERCONFDIR}/pkg.list.d
-
-    [[ -z ${build_list} ]] && build_list='default'
-
     cache_dir_pkg=${workspace_dir}/pkg
 
     prepare_dir "${cache_dir_pkg}"
@@ -135,7 +124,7 @@ init_artools_iso(){
 
     [[ -z ${profile} ]] && profile='base'
 
-    [[ -z ${dist_release} ]] && dist_release=$(get_release)
+    [[ -z ${dist_release} ]] && dist_release=$(date +%Y%m%d)
 
     dist_name=$(get_distname)