Merge pull request #41 from artix-linux/devel

Devel

Makefile

@@ -36,7 +36,10 @@ BIN_PKG = \
 	bin/mkchrootpkg \
 	bin/buildpkg \
 	bin/buildtree \
-	bin/deploypkg
+	bin/deploypkg \
+	bin/buildpkg2 \
+	bin/buildtree2 \
+	bin/deploypkg2
 
 LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
@@ -121,7 +124,7 @@ install_pkg:
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
 
 	ln -sf buildpkg $(DESTDIR)$(PREFIX)/bin/buildpkg-testing
-
+	
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools

bin/basestrap.in

@@ -32,7 +32,6 @@ usage() {
     echo "usage: ${0##*/} [options] root [packages...]"
     echo " -C <config>      Use an alternate config file for pacman"
     echo " -c               Use the package cache on the host, rather than the target"
-    echo " -d               Allow installation to a non-mountpoint directory"
     echo " -G               Avoid copying the host's pacman keyring to the target"
     echo " -i               Avoid auto-confirmation of package selections"
     echo " -M               Avoid copying the host's mirrorlist to the target"
@@ -47,12 +46,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':C:cdGiM'
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        d) directory=true ;;
         c) hostcache=true ;;
         i) interactive=true ;;
         G) copykeyring=false ;;
@@ -77,10 +75,6 @@ ${interactive} || pacman_args+=(--noconfirm)
 
 [[ -d $newroot ]] || die "%s is not a directory" "$newroot"
 
-if ! mountpoint -q "$newroot" && ! ${directory}; then
-    die '%s is not a mountpoint!' "$newroot"
-fi
-
 # create obligatory directories
 create_min_fs "$newroot"
 

bin/buildiso.in

@@ -60,9 +60,8 @@ show_profile(){
         msg2 "password: %s" "${password}"
         msg2 "addgroups: %s" "${addgroups}"
 
-        msg2 "enable_live: %s" "${enable_live[*]}"
-        msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-        msg2 "openrc_default: %s" "${openrc_default[*]}"
+        msg2 "services_live: %s" "${services_live[*]}"
+        msg2 "services: %s" "${services[*]}"
     fi
 }
 

bin/buildpkg2.in

@@ -0,0 +1,151 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+shopt -s nullglob
+
+LIBDIR='@libdir@'
+DATADIR='@datadir@'
+SYSCONFDIR='@sysconfdir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-chroot.sh
+import ${LIBDIR}/util-pkg.sh
+
+show_pkg(){
+    source PKGBUILD
+    for n in ${pkgname[@]}; do
+        msg2 "%s" "$n"
+    done
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "chroots_pkg: %s" "${chroots_pkg}"
+    msg2 "repository: %s" "${repository}"
+
+    msg "ARGS:"
+    msg2 "create_first: %s" "${create_first}"
+    msg2 "makepkg_args: %s" "${makepkg_args[*]}"
+    msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
+    
+    msg "BUILD:"
+    show_pkg
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+create_first=false
+pretend=false
+
+mkchroot_args=()
+mkchrootpkg_args=(-c -n)
+
+repository='default'
+    
+prepare_build(){
+    local pac_file= mp_file='makepkg.conf'    
+            
+    base_devel=('base-devel')
+    
+    case ${repository} in
+        'system'|'world'|'galaxy') repository='default' ;;
+        lib32*) base_devel+=('multilib-devel') ;;
+        galaxy-gremlins|galaxy-goblins) repository=${repository#*-} ;;
+    esac
+    local pac_file="pacman-${repository}.conf"
+
+    local pacman_conf="${DATADIR}/$pac_file"
+    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
+
+    work_dir="${chroots_pkg}/${repository}-${target_arch}"
+
+    local makepkg_conf="${DATADIR}/$mp_file"
+    [[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
+
+    mkchroot_args+=(-C "${pacman_conf}" -M "${makepkg_conf}" "${work_dir}/root")
+
+    mkchrootpkg_args+=(-r "${work_dir}" "${makepkg_args[@]}")
+}
+
+build(){
+    local timer_start=$(get_timer) 
+
+    exec mkchrootpkg "${mkchrootpkg_args[@]}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
+usage() {
+    echo "Usage: ${0##*/} [options] -- [makepkg_args]"
+    echo "    -r <dir>           Repository [default: ${repository}]"
+    echo '    -c                 Create root chroot'
+    echo '    -q                 Query settings and pretend build'
+    echo '    -h                 This help'
+    echo ''
+    echo "Default makepkg_args args: ${makepkg_args[*]}"
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='r:cqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) repository="$OPTARG" ;;
+        c) create_first=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
+    esac
+done
+
+makepkg_args+=("${@:$OPTIND}")
+
+check_root
+
+prepare_build
+
+${pretend} && display_settings && exit
+
+if ${create_first} || [[ ! -d ${work_dir}/root ]];then
+    msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
+
+    for copy in "${work_dir}"/*; do
+        [[ -d $copy ]] || continue
+        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
+
+        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
+
+        subvolume_delete_recursive "${copy}"
+        rm -rf --one-file-system "${copy}"
+    done
+    lock_close 9
+
+    rm -rf --one-file-system "${work_dir}"
+    mkdir -p "${work_dir}"
+    setarch "${target_arch}" mkchroot \
+        "${mkchroot_args[@]}"  "${base_devel[@]}" || abort
+else
+    lock 9 "${work_dir}/root.lock" "Locking clean chroot"
+    chroot-run "${mkchroot_args[@]}" \
+        pacman -Syu --noconfirm || abort
+fi
+
+build

bin/buildtree2.in

@@ -0,0 +1,318 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+
+get_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
+}
+
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
+}
+
+is_dirty() {
+    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
+    return 0
+}
+
+is_untracked(){
+    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
+    return 0
+}
+
+pull_tree(){
+    local branch="master" tree="$1"
+    local local_head=$(get_local_head "$branch")
+    local remote_head=$(get_remote_head "$branch")
+    local timer=$(get_timer)
+    msg "Checking [%s] ..." "$tree"
+    msg2 "local: %s" "${local_head}"
+    msg2 "remote: %s" "${remote_head}"
+    if [[ "${local_head}" == "${remote_head}" ]]; then
+        info "nothing to do"
+    else
+        info "needs pull"
+        git pull origin $branch
+    fi
+    msg "Done [%s]" "$tree"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+clone_tree(){
+    local timer=$(get_timer) tree="$1" host_tree="$2"
+    msg "Preparing [%s] ..." "$tree"
+    info "clone"
+    git clone $host_tree.git
+    msg "Done [%s]" "$tree"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+pull_tree_arch(){
+    cd ${tree_dir_arch}
+    for tree in packages community;do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+                pull_tree "${tree}"
+            cd ..
+        else
+            clone_tree "${tree}" "${host_tree_arch}/${tree}"
+        fi
+    done
+}
+
+pull_tree_artix(){
+    cd ${tree_dir_artix}
+    for tree in packages packages-galaxy;do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+                git config --bool pull.rebase true
+                pull_tree "${tree}"
+            cd ..
+        else
+            clone_tree "${tree}" "${host_tree_artix}/${tree}"
+        fi
+    done
+}
+
+read_import_list(){
+    local tree="$1"
+    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
+    import_list=$(sed "$_com_rm" "${list_dir_import}/$tree.list" | sed "$_space" | sed "$_clean")
+}
+
+patch_pkg(){
+    local pkg="$1" repo="$2"
+    case $pkg in
+        'glibc')
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/$repo/PKGBUILD
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'tp_smapi'|'acpi_call'|'r8168')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/$repo/PKGBUILD
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+        ;;
+    esac
+}
+
+get_import_path(){
+    local tree="$1" import_path=
+    case $tree in
+        packages) import_path=${tree_dir_arch}/packages ;;
+        packages-galaxy) import_path=${tree_dir_arch}/community ;;
+    esac
+    echo $import_path
+}
+
+find_repo(){
+    local pkg="$1" repo=
+    
+    if [[ -d $pkg/repos/core-x86_64 ]];then
+        repo=core-x86_64
+    elif [[ -d $pkg/repos/core-any ]];then
+        repo=core-any
+    fi
+    
+    if [[ -d $pkg/repos/extra-x86_64 ]];then
+        repo=extra-x86_64
+    elif [[ -d $pkg/repos/extra-any ]];then
+        repo=extra-any
+    fi
+    
+    if [[ -d $pkg/repos/testing-x86_64 ]];then
+        repo=testing-x86_64
+    elif [[ -d $pkg/repos/testing-any ]];then
+        repo=testing-any
+    fi
+    
+    if [[ -d $pkg/repos/staging-x86_64 ]];then
+        repo=staging-x86_64  
+    elif [[ -d $pkg/repos/staging-any ]];then
+        repo=staging-any
+    fi
+    
+    if [[ -d $pkg/repos/community-x86_64 ]];then
+        repo=community-x86_64
+    elif [[ -d $pkg/repos/community-any ]];then
+        repo=community-any
+    fi
+    
+    if [[ -d $pkg/repos/community-testing-x86_64 ]];then
+        repo=community-testing-x86_64
+    elif [[ -d $pkg/repos/community-testing-any ]];then
+        repo=community-testing-any
+    fi
+    
+    if [[ -d $pkg/repos/community-staging-x86_64 ]];then
+        repo=community-staging-x86_64
+    elif [[ -d $pkg/repos/community-staging-any ]];then
+        repo=community-staging-any
+    fi
+    
+    if [[ -d $pkg/repos/multilib-x86_64 ]];then
+        repo=multilib-x86_64
+    fi
+    
+    if [[ -d $pkg/repos/multilib-testing-x86_64 ]];then
+        repo=multilib-testing-x86_64
+    fi
+    
+    if [[ -d $pkg/repos/multilib-staging-x86_64 ]];then
+        repo=multilib-staging-x86_64
+    fi
+    
+    echo $repo
+}
+
+show_version_table(){
+    local tree="$1"
+    declare -A UPDATES
+    msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
+    for pkg in ${tree_dir_artix}/$tree/*; do
+        local artixrepo=$(find_repo "$pkg")
+        if [[ -f $pkg/repos/$artixrepo/PKGBUILD ]];then
+            source $pkg/repos/$artixrepo/PKGBUILD 2>/dev/null
+            package=${pkg##*/}
+            cd $pkg/repos/$artixrepo
+            artixver=$(get_full_version $package)
+            local src=$(get_import_path "$tree" "$package")
+            local archrepo=$(find_repo "$src/$package")
+            if [[ -f $src/$package/repos/$archrepo/PKGBUILD ]];then
+                source $src/$package/repos/$archrepo/PKGBUILD 2>/dev/null
+                cd $src/$package/repos/$archrepo
+                archver=$(get_full_version $package)
+                
+            fi
+            if [ $(vercmp $artixver $archver) -lt 0 ];then
+                UPDATES[$package]="$pkg/repos/$artixrepo/PKGBUILD $src/$package/repos/$archrepo/PKGBUILD"
+                msg_row_update "%-30s %-30s %-30s %-30s" "${archrepo%-*}" "$package" "$artixver" "$archver"
+            fi
+            unset pkgver epoch pkgrel artixver archver package
+        fi
+    done
+    find "${patches_dir}/$tree/" -name *.patch -delete
+    for upd in "${!UPDATES[@]}"; do
+        msg "Writing %s update patch ..." "$upd"
+        diff -u ${UPDATES[$upd]} > ${patches_dir}/$tree/"$upd"-archlinux.patch
+    done
+}
+
+import_from_arch(){
+    local timer=$(get_timer) tree="$1"
+    read_import_list "$tree"
+    if [[ -n ${import_list[@]} ]];then
+        cd ${tree_dir_artix}/$tree
+        for pkg in ${import_list[@]};do
+            local src=$(get_import_path "$tree")
+            local dest=${tree_dir_artix}/$tree
+            rsync "${rsync_args[@]}"  $src/$pkg/ $dest/$pkg/
+            local repo=$(find_repo "$pkg")
+            source $src/$pkg/repos/$repo/PKGBUILD 2>/dev/null
+            local ver=$(get_full_version $pkg)
+            msg "Repo: [%s] Package: %s-%s" "$repo" "$pkg" "$ver"
+            
+            patch_pkg "$pkg" "repos/$repo"
+            unset pkgver epoch pkgrel ver
+        done
+    fi
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+sync_repos(){   
+    pull_tree_arch
+    pull_tree_artix
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "git_tree: %s" "${git_tree}"
+
+    msg "ARGS:"
+    msg2 "sync: %s" "${sync}"
+    msg2 "import_arch: %s" "${import_arch}"
+    msg2 "compare: %s" "${compare}"
+    
+    msg "PATHS:"
+    msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
+    msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
+    msg2 "patches_dir: %s" "${patches_dir}/${git_tree}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+
+pretend=false
+sync=false
+import_arch=false
+compare=false
+move=false
+git_tree='packages'
+
+rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -g <git>      Git repo [default:${git_tree}]"
+    echo "    -s            Sync repos"
+    echo '    -i            Import arch packages'
+    echo '    -c            Compare packages'
+    echo '    -q            Query settings'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='g:sciqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        g) git_tree="$OPTARG" ;;
+        s) sync=true ;;
+        i) import_arch=true ;;
+        c) compare=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+prepare_dir "${tree_dir_artix}"
+prepare_dir "${tree_dir_arch}"
+prepare_dir "${patches_dir}/${git_tree}"
+
+${pretend} && display_settings && exit 1
+
+${sync} && sync_repos
+
+${compare} && show_version_table "${git_tree}"
+
+${import_arch} && import_from_arch "${git_tree}"

bin/chroot-run.in

@@ -87,7 +87,7 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$1/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
 chroot_extra_mount() {

bin/commitpkg.in

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+
+move_pkg(){
+    local pkg="$1" src_repo="$2" dest_repo="$3" tree="$4"
+    cd ${tree_dir_artix}/$tree/$pkg/repos
+    git mv --force $src_repo $dest_repo
+    git add -u $dest_repo
+    git commit -m "Move '$pkg' from [$src_repo] to [$dest_repo]"
+}

bin/deploypkg2.in

@@ -0,0 +1,118 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+
+del_from_repo(){
+    local ver
+    local repo="$1"
+    local repo_path=${repos_root}/$repo/os/${target_arch}
+    source PKGBUILD
+    for name in ${pkgname[@]};do
+        [[ $arch == any ]] && CARCH=any
+        ver=$(get_full_version $name)
+        if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
+            info "pkgfile: %s" "${pkgfile##*/}"
+            repo-remove -R $repo_path/$repo.db.tar.xz $name
+            rm -v $repo_path/${pkgfile##*/}{,.sig}
+        fi
+    done
+}
+
+add_to_repo(){
+    local ver pkgfile=
+    local repo="$1"
+    local repo_path=${repos_root}/$repo/os/${target_arch}
+    source PKGBUILD
+    for name in ${pkgname[@]};do
+        [[ $arch == any ]] && CARCH=any
+        ver=$(get_full_version $name)
+        if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH"); then
+            info "pkgfile: %s" "${pkgfile##*/}"
+            [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
+            signfile ${pkgfile}
+            ln -sf ${pkgfile}{,.sig} $repo_path/
+            repo-add -R $repo_path/$repo.db.tar.xz $pkgfile
+        fi
+    done
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "repository: %s" "${repository}"
+
+    msg "ARGS:"
+    msg2 "add_pkg: %s" "${add_pkg}"
+    msg2 "del_pkg: %s" "${del_pkg}"
+    msg2 "move_pkg: %s" "${move_pkg}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+pretend=false
+add_pkg=false
+del_pkg=false
+repository=
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -d                 Destination repository [default:${repository}]"
+    echo '    -a                 Add package to repository'
+    echo '    -r                 Remove package from repository'
+    echo '    -q                 Query settings and pretend upload'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='d:arqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        d) repository="$OPTARG" ;;
+        a) add_pkg=true ;;
+        r) del_pkg=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+timer_start=$(get_timer)
+
+prepare_dir "${repos_root}"
+
+${pretend} && display_settings && exit 1
+
+${del_pkg} && del_from_repo "${repository}"
+
+${add_pkg} && add_to_repo "${repository}"
+
+exit 0

bin/mkchroot.in

@@ -71,7 +71,7 @@ else
     cache_dirs=(${cache_dir})
 fi
 
-basestrap_args=(-Gcd ${pacman_conf:+-C "$pacman_conf"})
+basestrap_args=(-Gc ${pacman_conf:+-C "$pacman_conf"})
 [[ -n ${mirror} ]] && basestrap_args+=(-M)
 
 umask 0022

bin/mkchrootpkg.in

@@ -146,7 +146,7 @@ prepare_chroot() {
     local keepbuilddir=$3
     local run_namcap=$4
 
-    $keepbuilddir || rm -rf "$copydir/build"
+    [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
     local builduser_uid="${SUDO_UID:-$UID}"
     local builduser_gid="$(id -g "$builduser_uid")"
@@ -185,9 +185,10 @@ EOF
     {
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
+        declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
         printf '_chrootbuild "$@" || exit\n'
 
-        if $run_namcap; then
+        if [[ $run_namcap = true ]]; then
             declare -f _chrootnamcap
             printf '_chrootnamcap || exit\n'
         fi
@@ -201,7 +202,7 @@ _chrootbuild() {
     exec </dev/console
     export LANG=en_US.UTF-8
     . /etc/profile
-    sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }
 
 _chrootnamcap() {
@@ -218,17 +219,16 @@ _chrootnamcap() {
 #  - USER
 download_sources() {
     local copydir=$1
-    local src_owner=$2
+    local makepkg_user=$2
 
-    local builddir="$(mktemp -d)"
+    local builddir
+    builddir="$(mktemp -d)"
     chmod 1777 "$builddir"
 
     # Ensure sources are downloaded
-    makepkg_user=${makepkg_user:-$SUDO_USER}
     sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
-    makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
-    die "Could not download sources."
-    (( $? != 0 )) && die "Could not download sources."
+        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
+        die "Could not download sources."
 
     # Clean up garbage from verifysource
     rm -rf "$builddir"
@@ -263,6 +263,11 @@ move_products() {
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
         mv "$s" "$SRCPKGDEST"
+
+        # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
+        if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
+            ln -sf "$SRCPKGDEST/${s##*/}"
+        fi
     done
 }
 # }}}
@@ -376,7 +381,7 @@ main() {
 
     download_sources "$copydir" "$src_owner"
 
-    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir"
+    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 
     bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
 

bin/transition.in

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# alias git=hub
+
+super_repo=/home/artux/artools-workspace/artix/packages
+
+copy_pkgs(){
+    for repo in system world;do
+        local old_repo=/home/artux/artools-workspace/artix/$repo
+        cd $old_repo
+        local packages=$(find . -mindepth 1 -maxdepth 1 -type d)
+       # git checkout testing
+        for p in ${packages[@]};do
+            local pkg=${p#*/}             
+            mkdir -p $super_repo/$pkg/$repo
+        #     cp -v $pkg/* $super_repo/$pkg/trunk/
+            cp -v $pkg/* $super_repo/$pkg/$repo/
+        done
+    done
+    rm -r $super_repo/.git
+}
+
+create_pkg_repo(){
+    cd $super_repo
+    local packages=$(find . -mindepth 1 -maxdepth 1 -type d)
+    for p in ${packages[@]};do
+        local pkg=${p#*/} 
+        cd $pkg
+        git init
+        git add .
+        git commit -m "initial commit $pkg"
+        hub create artix-packages/$pkg
+        git push origin master
+        cd ..
+    done
+}
+
+add_pkg_subtree(){
+    for repo in system world;do
+        local old_repo=/home/artux/artools-workspace/artix/$repo
+        cd $old_repo
+        local packages=$(find . -mindepth 1 -maxdepth 1 -type d)
+        cd $super_repo
+        for p in ${packages[@]};do
+            local pkg=${p#*/} 
+            git remote add -f $pkg git@github.com:artix-packages/$pkg.git
+            git subtree add --prefix $pkg $pkg master --squash
+#             git subtree add --prefix $pkg git@github.com:artix-packages/$pkg.git master --squash
+        done
+    done
+}
+
+# copy_pkgs
+# create_pkg_repo
+add_pkg_subtree

data/Jenkinsfile.galaxy

@@ -0,0 +1,239 @@
+def ADD_REPO = ''
+def RM_REPO = ''
+def IS_ADD = 'false'
+def IS_REMOVE = 'false'
+def IS_BUILD = 'false'
+def PKG_TRUNK = ''
+def PKG_PATH = ''
+
+pipeline {
+    agent any
+    options {
+        skipDefaultCheckout()
+        timestamps()
+    }
+    stages {
+        stage('Checkout') {
+            steps {
+                script {
+                    checkout scm
+
+                    def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
+                    echo "currentCommit: ${currentCommit}"
+
+                    def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
+                    echo "changedFilesStatus: " + changedFilesStatus
+                    def changedPkgStatus = []
+                    def pkgPath = []
+                    int entrySize = 0
+                    for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
+                        def entry = changedFilesStatus[i].split()
+                        def fileStatus = entry[0]
+                        entrySize = entry.size()
+                        for ( int j = 1; j < entry.size(); j++ ) {
+                            if ( entry[j].contains('PKGBUILD') && entry[j].contains('repos') ){
+                                changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
+                                pkgPath << entry[j].minus('/PKGBUILD')
+                            }
+                        }
+                    }
+                    
+                    int pkgCount = changedPkgStatus.size()
+                    int pkgPathCount = pkgPath.size()
+                    echo "pkgCount: ${pkgCount}"
+                    echo "pkgPath: ${pkgPath}"
+                    echo "entrySize: ${entrySize}"
+                    echo "pkgPathCount: ${pkgPathCount}"
+                    echo "changedPkgStatus: ${changedPkgStatus}"
+                    
+                    if ( pkgCount > 0 ) {
+                    
+                        if ( entrySize == 2 && pkgCount == 2 ) {
+                            def pkgEntry1 = changedPkgStatus[0].split()
+                            def pkgEntry2 = changedPkgStatus[1].split()
+                            def srcPath = []
+                            def pkgStatus = []
+                            srcPath << pkgEntry1[1]
+                            srcPath << pkgEntry2[1]
+                            pkgStatus << pkgEntry1[0]
+                            pkgStatus << pkgEntry2[0]
+                            def buildInfo1 = srcPath[0].tokenize('/')
+                            def buildInfo2 = srcPath[1].tokenize('/')
+                            for ( s in pkgStatus ) {
+                                if ( s == "M" ) {
+                                    IS_ADD = 'true'
+                                    if ( srcPath[0].contains('community-testing') ) {
+                                        ADD_REPO = 'galaxy-gremlins'
+                                    } else if ( srcPath[0].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
+                                        ADD_REPO = 'galaxy'
+                                    }
+                                    if ( srcPath[0].contains('multilib-testing') ) {
+                                        ADD_REPO = 'lib32-gremlins'
+                                    } else if ( srcPath[0].contains('multilib-x86_64') ) {
+                                        ADD_REPO = 'lib32'
+                                    }
+                                }
+                                if ( s == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                    if ( srcPath[1].contains('community-testing') ) {
+                                        RM_REPO = 'galaxy-gremlins'
+                                    } else if ( srcPath[1].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
+                                        RM_REPO = 'galaxy'
+                                    }
+                                    if ( srcPath[1].contains('multilib-testing') ) {
+                                        RM_REPO = 'lib32-gremlins'
+                                    } else if ( srcPath[1].contains('multilib-x86_64') ) {
+                                        RM_REPO = 'lib32'
+                                    }
+                                }
+                            }
+                            PKG_TRUNK = buildInfo1[0] + '/trunk'
+                        } 
+
+                        if ( entrySize == 3 && pkgCount == 2 ) {
+                            def pkgEntry = changedPkgStatus[0].split()
+                            def pkgStatus = pkgEntry[0]
+                            def buildInfo1 = pkgPath[0].tokenize('/')
+                            def buildInfo2 = pkgPath[1].tokenize('/')
+                            if ( pkgStatus.contains('R') ) {
+                                IS_ADD = 'true'
+                                IS_REMOVE = 'true'
+                                if ( pkgPath[0].contains('community-staging') ) {
+                                    RM_REPO = 'galaxy-goblins'
+                                } 
+                                if ( pkgPath[1].contains('community-testing') ) {
+                                    ADD_REPO = 'galaxy-gremlins'
+                                }
+                                if ( pkgPath[1].contains('community-staging') ) {
+                                    RM_REPO = 'galaxy-gremlins'
+                                } 
+                                if ( pkgPath[0].contains('community-testing') ) {
+                                    ADD_REPO = 'galaxy-goblins'
+                                }
+                                if ( pkgPath[0].contains('multilib-staging') ) {
+                                    RM_REPO = 'lib32-goblins'
+                                } 
+                                if ( pkgPath[1].contains('multilib-testing') ) {
+                                    ADD_REPO = 'lib32-gremlins'
+                                }
+                                if ( pkgPath[1].contains('multilib-staging') ) {
+                                    RM_REPO = 'lib32-gremlins'
+                                } 
+                                if ( pkgPath[0].contains('multilib-testing') ) {
+                                    ADD_REPO = 'lib32-goblins'
+                                }
+                            }
+                            PKG_TRUNK = buildInfo1[0] + '/trunk'
+                        } 
+                    
+                        if ( pkgCount == 1 ) {
+                            def pkgEntry = changedPkgStatus[0].split()
+                            def pkgStatus = pkgEntry[0]
+                            def srcPath = pkgEntry[1]
+                            def buildInfo = srcPath.tokenize('/')
+                            if ( srcPath.contains('community-staging') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'galaxy-goblins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('community-testing') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'galaxy-gremlins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('community-x86_64') || srcPath.contains('community-any') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'galaxy'
+                                RM_REPO = ADD_REPO
+                            }
+                            if ( srcPath.contains('multilib-staging') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'lib32-goblins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('multilib-testing') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'lib32-gremlins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('multilib-x86_64') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'lib32'
+                                RM_REPO = ADD_REPO
+                            }
+                            PKG_PATH = srcPath
+                            PKG_TRUNK = buildInfo[0] + '/trunk'
+                        }
+                    
+                    }
+                }
+            }
+        }
+        stage('Build') {
+            environment {
+                BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
+            }
+            when {
+                expression { return  IS_BUILD == 'true' }
+            }
+            steps {
+                dir("${PKG_PATH}") {
+                    echo "buildpkg2 -r ${ADD_REPO}"
+                }
+            }
+            post {
+                success {
+                    dir("${PKG_PATH}") {
+                        echo "deploypkg2 -a -d ${ADD_REPO}"
+                    }
+                }
+            }
+        }
+        stage('Add') {
+            when {
+                expression { return  IS_ADD == 'true' }
+            }
+            steps {
+                dir("${PKG_TRUNK}") {
+                    echo "deploypkg2 -a -d ${ADD_REPO}"
+                }
+            }
+        }
+        stage('Remove') {
+            when {
+                expression { return  IS_REMOVE == 'true' }
+            }
+            steps {
+                dir("${PKG_TRUNK}") {
+                    echo "deploypkg2 -r -d ${RM_REPO}"
+                }
+            }
+        }
+    }
+}

data/Jenkinsfile.packages

@@ -0,0 +1,202 @@
+def ADD_REPO = ''
+def RM_REPO = ''
+def IS_ADD = 'false'
+def IS_REMOVE = 'false'
+def IS_BUILD = 'false'
+def PKG_TRUNK = ''
+def PKG_PATH = ''
+
+pipeline {
+    agent any
+    options {
+        skipDefaultCheckout()
+        timestamps()
+    }
+    stages {
+        stage('Checkout') {
+            steps {
+                script {
+                    checkout scm
+
+                    def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
+                    echo "currentCommit: ${currentCommit}"
+
+                    def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
+                    echo "changedFilesStatus: " + changedFilesStatus
+                    def changedPkgStatus = []
+                    def pkgPath = []
+                    int entrySize = 0
+                    for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
+                        def entry = changedFilesStatus[i].split()
+                        def fileStatus = entry[0]
+                        entrySize = entry.size()
+                        for ( int j = 1; j < entry.size(); j++ ) {
+                            if ( entry[j].contains('PKGBUILD') && entry[j].contains('repos') ){
+                                changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
+                                pkgPath << entry[j].minus('/PKGBUILD')
+                            }
+                        }
+                    }
+                    
+                    int pkgCount = changedPkgStatus.size()
+                    int pkgPathCount = pkgPath.size()
+                    echo "pkgCount: ${pkgCount}"
+                    echo "pkgPath: ${pkgPath}"
+                    echo "entrySize: ${entrySize}"
+                    echo "pkgPathCount: ${pkgPathCount}"
+                    echo "changedPkgStatus: ${changedPkgStatus}"
+                    
+                    if ( pkgCount > 0 ) {
+                    
+                        if ( entrySize == 2 && pkgCount == 2 ) {
+                            def pkgEntry1 = changedPkgStatus[0].split()
+                            def pkgEntry2 = changedPkgStatus[1].split()
+                            def srcPath = []
+                            def pkgStatus = []
+                            srcPath << pkgEntry1[1]
+                            srcPath << pkgEntry2[1]
+                            pkgStatus << pkgEntry1[0]
+                            pkgStatus << pkgEntry2[0]
+                            def buildInfo1 = srcPath[0].tokenize('/')
+                            def buildInfo2 = srcPath[1].tokenize('/')
+                            for ( s in pkgStatus ) {
+                                if ( s == "M" ) {
+                                    IS_ADD = 'true'
+                                    if ( srcPath[0].contains('testing') ) {
+                                        ADD_REPO = 'gremlins'
+                                    } else if ( srcPath[0].contains('core') ) {
+                                        ADD_REPO = 'system'
+                                    } else if ( srcPath[0].contains('extra') ) {
+                                        ADD_REPO = 'world'
+                                    }
+                                }
+                                if ( s == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                    if ( srcPath[1].contains('testing') ) {
+                                        RM_REPO = 'gremlins'
+                                    } else if ( srcPath[1].contains('core') ) {
+                                        RM_REPO = 'system'
+                                    } else if ( srcPath[1].contains('extra') ) {
+                                        RM_REPO = 'world'
+                                    }
+                                }
+                            }
+                            PKG_TRUNK = buildInfo1[0] + '/trunk'
+                        } 
+
+                        if ( entrySize == 3 && pkgCount == 2 ) {
+                            def pkgEntry = changedPkgStatus[0].split()
+                            def pkgStatus = pkgEntry[0]
+                            def buildInfo1 = pkgPath[0].tokenize('/')
+                            def buildInfo2 = pkgPath[1].tokenize('/')
+                            if ( pkgStatus.contains('R') ) {
+                                IS_ADD = 'true'
+                                IS_REMOVE = 'true'
+                                if ( pkgPath[0].contains('staging') ) {
+                                    RM_REPO = 'goblins'
+                                } 
+                                if ( pkgPath[1].contains('testing') ) {
+                                    ADD_REPO = 'gremlins'
+                                }
+                                if ( pkgPath[1].contains('staging') ) {
+                                    RM_REPO = 'gremlins'
+                                } 
+                                if ( pkgPath[0].contains('testing') ) {
+                                    ADD_REPO = 'goblins'
+                                }
+                            }
+                            PKG_TRUNK = buildInfo1[0] + '/trunk'
+                        } 
+                    
+                        if ( pkgCount == 1 ) {
+                            def pkgEntry = changedPkgStatus[0].split()
+                            def pkgStatus = pkgEntry[0]
+                            def srcPath = pkgEntry[1]
+                            def buildInfo = srcPath.tokenize('/')
+                            if ( srcPath.contains('staging') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'goblins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('testing') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'gremlins'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('core') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'system'
+                                RM_REPO = ADD_REPO
+                            } else if ( srcPath.contains('extra') ) {
+                                if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
+                                    IS_BUILD = 'true'
+                                }
+                                if ( pkgStatus == 'D' ) {
+                                    IS_REMOVE = 'true'
+                                }
+                                ADD_REPO = 'world'
+                                RM_REPO = ADD_REPO
+                            }
+                            PKG_PATH = srcPath
+                            PKG_TRUNK = buildInfo[0] + '/trunk'
+                        }
+                    
+                    }
+                }
+            }
+        }
+        stage('Build') {
+            environment {
+                BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
+            }
+            when {
+                expression { return  IS_BUILD == 'true' }
+            }
+            steps {
+                dir("${PKG_PATH}") {
+                    echo "buildpkg2 -r ${ADD_REPO}"
+                }
+            }
+            post {
+                success {
+                    dir("${PKG_PATH}") {
+                        echo "deploypkg2 -a -d ${ADD_REPO}"
+                    }
+                }
+            }
+        }
+        stage('Add') {
+            when {
+                expression { return  IS_ADD == 'true' }
+            }
+            steps {
+                dir("${PKG_TRUNK}") {
+                    echo "deploypkg2 -a -d ${ADD_REPO}"
+                }
+            }
+        }
+        stage('Remove') {
+            when {
+                expression { return  IS_REMOVE == 'true' }
+            }
+            steps {
+                dir("${PKG_TRUNK}") {
+                    echo "deploypkg2 -r -d ${RM_REPO}"
+                }
+            }
+        }
+    }
+}

data/artools.conf

@@ -12,12 +12,12 @@
 ################ artools-pkg ################
 #############################################
 
-# artix package tree
-# repo_tree_artix=('system' 'world' 'galaxy' 'lib32')
+# to be removed
+# repo_tree_artix=('packages' 'galaxy')
 
 # host_tree_artix='https://github.com/artix-linux'
 
-# archlinux package tree
+# to be removed
 # repo_tree_arch=('packages' 'community')
 
 # host_tree_arch=git://projects.archlinux.org/svntogit

data/base/profile.conf

@@ -8,8 +8,7 @@
 # autologin="true"
 
 # service runlevels
-# openrc_boot=('elogind')
-# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
 
 # default values
 # addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"

data/import.list.d/galaxy.list

@@ -24,11 +24,9 @@ portaudio
 sassc
 yaml-cpp
 zeromq
-acpi_call
-r8168
-tp_smapi
-acpi_call-lts
-r8168-lts
-tp_smapi-lts
-virtualbox
-virtualbox-guest-iso
+# acpi_call
+# r8168
+# tp_smapi
+# acpi_call-lts
+# r8168-lts
+# tp_smapi-lts

data/import.list.d/packages-galaxy.list

@@ -0,0 +1,36 @@
+autoconf-archive
+cmocka
+confuse
+dovecot
+hub
+hwinfo
+jansson
+libappindicator
+libbson
+libdbi
+libdbusmenu
+libftdi
+libindicator
+libmongoc
+libnewt
+libpgm
+libreplaygain
+libsass
+libsodium
+libx86emu
+ninja
+pigeonhole
+portaudio
+sassc
+yaml-cpp
+zeromq
+acpi_call
+r8168
+tp_smapi
+acpi_call-lts
+r8168-lts
+tp_smapi-lts
+virtualbox
+virtualbox-guest-iso
+lib32-fakeroot
+lib32-libltdl

data/import.list.d/packages.list

@@ -0,0 +1,674 @@
+### system ###
+
+tzdata
+iana-etc
+linux-api-headers
+binutils
+glibc
+gcc
+attr
+acl
+ncurses
+readline
+# bash
+sed
+diffutils
+expat
+db
+lz4
+lzo
+bzip2
+gmp
+mpfr
+m4
+gdbm
+xz
+zlib
+file
+zstd
+icu
+perl
+openssl
+openssl-1.0
+autoconf
+automake
+dash
+bison
+ldns
+less
+libaio
+libarchive
+libassuan
+libcap
+libedit
+libevent
+libffi
+libgcrypt
+libgpg-error
+libgssglue
+libidn
+libidn2
+libksba
+libmnl
+libmpc
+libnftnl
+libnghttp2
+libnl
+libpcap
+libpipeline
+libpsl
+libidn2
+librpcsecgss
+libseccomp
+libsecret
+libssh2
+libtasn1
+libtirpc
+libtool
+libunistring
+pcre
+glib2
+grep
+gzip
+bridge-utils
+ca-certificates
+ca-certificates-cacert
+coreutils
+cracklib
+dialog
+ding-libs
+dnssec-anchors
+dosfstools
+e2fsprogs
+ed
+efibootmgr
+efivar
+elfutils
+fakeroot
+findutils
+flex
+gawk
+gettext
+gnutls
+gpgme
+groff
+hdparm
+hwids
+ifenslave
+iproute2
+iputils
+iw
+jfsutils
+kbd
+keyutils
+#licenses
+links
+linux-atm
+linux-firmware
+make
+man-pages
+mkinitcpio-busybox
+mkinitcpio-nfs-utils
+nano
+nettle
+net-tools
+nfsidmap
+nilfs-utils
+npth
+nspr
+nss
+p11-kit
+patch
+pciutils
+pinentry
+pkcs11-helper
+pkg-config
+popt
+pptpclient
+procinfo-ng
+psmisc
+pth
+reiserfsprogs
+run-parts
+sdparm
+# s-nail
+sqlite
+sysfsutils
+syslinux
+tar
+texinfo
+thin-provisioning-tools
+traceroute
+usbutils
+vi
+which
+wireless-regdb
+wireless_tools
+wpa_actiond
+xfsprogs
+zd1211-firmware
+archlinux-keyring
+b43-fwcutter
+ipw2100-fw
+ipw2200-fw
+isdn4k-utils
+curl
+sudo
+argon2
+
+
+### world ###
+
+a52dec
+aalib
+adwaita-icon-theme
+alsa-firmware
+alsa-lib
+#alsa-utils
+apr
+apr-util
+aspell
+assimp
+atk
+at-spi2-atk
+at-spi2-core
+babl
+bc
+boost
+brltty
+cairo
+cantarell-fonts
+cdparanoia
+check
+cifs-utils
+cln
+cmake
+extra-cmake-modules
+convertlit
+cpio
+dbus-glib
+dbus-python
+dcadec
+dconf
+desktop-file-utils
+dkms
+docbook-dsssl
+docbook-sgml31
+docbook-utils
+docbook-xml
+docbook-xsl
+dotconf
+double-conversion
+doxygen
+ebook-tools
+editorconfig-core-c
+exiv2
+faad2
+ffmpeg
+ffmpeg2.8
+fftw
+flac
+fontconfig
+freetype2
+fribidi
+fuse2
+fuse3
+gamin
+gc
+gcab
+gconf
+gcr
+gd
+gdb
+gdk-pixbuf2
+gegl02
+ghostscript
+giblib
+giflib
+glade
+glib-networking
+glu
+gnome-common
+gobject-introspection
+gperf
+gperftools
+gptfdisk
+grantlee
+graphite
+graphviz
+gsettings-desktop-schemas
+gsfonts
+gsm
+gst-plugins-base
+gst-plugins-good
+gstreamer
+gtk2
+gtk3
+gtk-doc
+gtksourceview3
+gts
+guile
+guile2.0
+harfbuzz
+hicolor-icon-theme
+hunspell
+hyphen
+ijs
+ilmbase
+imagemagick
+imlib2
+iniparser
+intltool
+iso-codes
+itstool
+jack
+jasper
+java8-openjdk
+java-common
+jbig2dec
+jemalloc
+js
+# json-c
+jsoncpp
+json-glib
+lame
+lapack
+lcms
+lcms2
+ldb
+libaccounts-glib
+libaccounts-qt
+libao
+libass
+libasyncns
+libatomic_ops
+libavc1394
+libbluray
+libbsd
+libburn
+libbytesize
+libcaca
+libcanberra
+libcap-ng
+libcddb
+libcdio
+libcdio-paranoia
+# libconfig
+libcroco
+libcue
+libdaemon
+libdatrie
+libdbusmenu-qt
+libdca
+libdmtx
+libdrm
+libdv
+libdvbpsi
+libdvdcss
+libdvdnav
+libdvdread
+libebml
+libepoxy
+libevdev
+libexif
+libfontenc
+libgee
+libgit2
+libglade
+libglvnd
+libgphoto2
+libgusb
+libical
+libice
+libid3tag
+libiec61883
+libieee1284
+libimobiledevice
+libiscsi
+libisoburn
+libisofs
+libjpeg-turbo
+liblouis
+liblqr
+libmad
+libmatroska
+libmng
+libmodplug
+libmpeg2
+libmspack
+libmtp
+libndp
+libnotify
+# libogg
+libomxil-bellagio
+libpaper
+libpciaccess
+libplist
+libpng
+libproxy
+libpwquality
+libqalculate
+libqmi
+libraqm
+# libraw1394
+librsvg
+libsamplerate
+libshout
+libsigc++
+libsigsegv
+libsm
+# libsndfile
+libsoup
+libsoxr
+libspiro
+libsrtp
+libssh
+libtar
+# libthai
+libtheora
+libtiff
+libtommath
+libunwind
+libupnp
+libusb-compat
+libusbmuxd
+libutempter
+libuv
+libva
+libvdpau
+libvisual
+libvorbis
+libvpx
+libwebp
+libwmf
+libx11
+libxau
+libxaw
+# libxcb
+libxcomposite
+libxcursor
+libxdamage
+# libxdmcp
+libxext
+libxfixes
+libxfont2
+libxft
+libxi
+libxinerama
+libxkbcommon
+libxkbfile
+libxml2
+libxmu
+libxpm
+libxrandr
+libxrender
+libxres
+libxshmfence
+libxslt
+libxss
+libxt
+libxtst
+libxv
+libxvmc
+libxxf86vm
+libyaml
+libzip
+lirc
+llvm
+lmdb
+lua
+xorgproto
+mesa
+# meson
+mailcap
+mobile-broadband-provider-info
+mtdev
+muparser
+musepack
+namcap
+nasm
+network-manager-applet
+noto-fonts
+nss-mdns
+ntfs-3g
+# nvidia
+# nvidia-settings
+# nvidia-utils
+ocl-icd
+openal
+opencore-amr
+openexr
+openjade
+openjpeg
+openjpeg2
+opensp
+opus
+orc
+orca
+pango
+parted
+pcre2
+perl-error
+perl-file-which
+perl-xml-parser
+perl-yaml
+phonon
+phonon-gstreamer
+pixman
+polkit-qt
+poppler
+potrace
+protobuf
+pyalpm
+pygobject
+pygtk
+# pylint
+pyqt5
+python
+python2
+# python2-backports
+# python2-backports.functools_lru_cache
+# python2-configparser
+# python2-ipaddress
+python-appdirs
+python-asn1crypto
+# python-astroid
+python-attrs
+# python-automat
+python-beaker
+python-cairo
+# python-cffi
+python-chardet
+# python-constantly
+# python-cryptography
+python-cssselect
+python-defusedxml
+# python-editdistance
+# python-egenix-mx-base
+python-evdev
+# python-feedparser
+# python-fpconst
+# python-gdata
+# python-geoip
+python-hyperlink
+python-idna
+# python-incremental
+# python-isort
+# python-iwscan
+# python-lazy-object-proxy
+# python-lxml
+python-mako
+python-markupsafe
+# python-mccabe
+# python-mpd
+# python-nose
+python-notify
+python-numpy
+python-packaging
+python-pip
+python-ply
+python-pyasn1
+# python-pyasn1-modules
+# python-pycparser
+# python-pycurl
+python-pyelftools
+# python-pygame
+python-pyparsing
+# python-rdflib
+# python-requests
+# python-retrying
+# python-service-identity
+python-setuptools
+python-six
+# python-soappy
+# python-telepathy
+# python-urllib3
+python-urwid
+python-virtualenv
+# python-wpactrl
+python-wrapt
+# python-wstools
+pyxdg
+qt5-3d
+qt5-canvas3d
+qt5-charts
+qt5-connectivity
+qt5-datavis3d
+qt5-declarative
+qt5-doc
+qt5-examples
+qt5-gamepad
+qt5-graphicaleffects
+qt5-imageformats
+qt5-location
+qt5-multimedia
+qt5-networkauth
+qt5-quickcontrols
+qt5-quickcontrols2
+qt5-remoteobjects
+qt5-script
+qt5-scxml
+qt5-sensors
+qt5-serialbus
+qt5-serialport
+qt5-speech
+qt5-svg
+qt5-tools
+qt5-translations
+qt5-virtualkeyboard
+qt5-wayland
+qt5-webchannel
+qt5-webengine
+qt5-webkit
+qt5-websockets
+qt5-webview
+qt5-x11extras
+qt5-xmlpatterns
+ruby
+schroedinger
+sdl
+sdl2
+sdl_image
+sdl_sound
+serf
+sgml-common
+shared-mime-info
+slang
+snappy
+snowball
+socat
+source-highlight
+speech-dispatcher
+speex
+speexdsp
+startup-notification
+t1lib
+taglib
+talloc
+tcl
+tdb
+tevent
+texlive-bin
+texlive-core
+texlive-formatsextra
+texlive-latexextra
+texlive-pictures
+texlive-science
+tslib
+ttf-bitstream-vera
+ttf-dejavu
+ttf-hack
+ttf-indic-otf
+unixodbc
+unzip
+#usbmuxd
+v4l-utils
+vala
+valgrind
+vid.stab
+volume_key
+vte
+vte3
+wavpack
+wayland
+wayland-protocols
+webrtc-audio-processing
+wget
+whois
+wxgtk
+x265
+xapian-core
+xbitmaps
+# xcb-proto
+# xcb-util
+xcb-util-cursor
+# xcb-util-image
+# xcb-util-keysyms
+# xcb-util-renderutil
+# xcb-util-wm
+xdg-utils
+xf86-input-libinput
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+xkeyboard-config
+xmlto
+xorg-bdftopcf
+xorg-fonts-alias
+xorg-fonts-encodings
+xorg-fonts-misc
+xorg-font-util
+xorg-font-utils
+xorg-luit
+xorg-mkfontdir
+xorg-mkfontscale
+xorg-setxkbmap
+xorg-twm
+xorg-util-macros
+xorg-xauth
+# xorg-xinit
+xorg-xkbcomp
+xorg-xmessage
+xorg-xmodmap
+xorg-xprop
+xorg-xrandr
+xorg-xrdb
+xorg-xset
+xorg-xsetroot
+xterm
+xvidcore
+yajl
+yelp-tools
+yelp-xsl
+zip
+zita-alsa-pcmi
+zita-resampler
+zsh
+zvbi
+zziplib
+re2
+geoip-database
+mercurial

data/import.list.d/system.list

@@ -23,7 +23,6 @@ gdbm
 xz
 zlib
 file
-zstd
 icu
 perl
 openssl

data/import.list.d/world.list

@@ -112,7 +112,7 @@ java-common
 jbig2dec
 jemalloc
 js
-# json-c
+#json-c
 jsoncpp
 json-glib
 kbproto
@@ -228,7 +228,7 @@ libvpx
 libwebp
 libwmf
 libx11
-# libxau
+libxau
 libxaw
 # libxcb
 libxcomposite
@@ -412,6 +412,7 @@ qt5-xmlpatterns
 randrproto
 recordproto
 renderproto
+re2
 ruby
 schroedinger
 scrnsaverproto
@@ -523,3 +524,5 @@ zita-resampler
 zsh
 zvbi
 zziplib
+geoip-database
+mercurial

data/pacman-default.conf

@@ -0,0 +1,84 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+#
+# ARCHLINUX
+#
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-goblins.conf

@@ -0,0 +1,108 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-gremlins.conf

@@ -0,0 +1,96 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-goblins.conf

@@ -0,0 +1,126 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# 
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-gremlins.conf

@@ -0,0 +1,108 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# 
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32.conf

@@ -0,0 +1,90 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# 
+# ARCHLINUX
+#
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-testing.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -82,20 +82,15 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
 [lib32-testing]
 Include = /etc/pacman.d/mirrorlist
 
 [lib32]
 Include = /etc/pacman.d/mirrorlist
 
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#
+# ARCHLINUX
+#
 
 [testing]
 Include = /etc/pacman.d/mirrorlist-arch

data/pacman.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -73,17 +73,12 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
 [lib32]
 Include = /etc/pacman.d/mirrorlist
 
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#
+# ARCHLINUX
+#
 
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch

data/patches/artix-bash.patch

@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/bash/artix.bashrc
++++ b/artix.bashrc
 @@ -0,0 +1,46 @@
 +use_color=true
 +
@@ -47,3 +47,41 @@
 +fi
 +
 +unset use_color safe_term match_lhs sh
+--- a/dot.bashrc
++++ b/dot.bashrc
+@@ -5,5 +5,5 @@
+ # If not running interactively, don't do anything
+ [[ $- != *i* ]] && return
+
+-alias ls='ls --color=auto'
+-PS1='[\u@\h \W]\$ '
++# alias ls='ls --color=auto'
++# PS1='[\u@\h \W]\$ '
+
+--- a/system.bashrc
++++ a/system.bashrc
+@@ -1,5 +1,5 @@
+ #
+-# /etc/bash.bashrc
++# /etc/bash/bashrc
+ #
+
+ # If not running interactively, don't do anything
+@@ -19,4 +19,8 @@
+     ;;
+ esac
+
++for sh in /etc/bash/bashrc.d/*.bashrc ; do
++	[[ -r ${sh} ]] && source "${sh}"
++done
++
+ [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
+
+--- a/system.bash_logout
++++ a/system.bash_logout
+@@ -1,3 +1,3 @@
+ #
+-# /etc/bash.bash_logout
++# /etc/bash/bash_logout
+ #
+

data/patches/dot-bashrc.patch

@@ -1,11 +0,0 @@
---- a/bash/dot.bashrc
-+++ b/bash/dot.bashrc
-@@ -5,5 +5,5 @@
- # If not running interactively, don't do anything
- [[ $- != *i* ]] && return
-
--alias ls='ls --color=auto'
--PS1='[\u@\h \W]\$ '
-+# alias ls='ls --color=auto'
-+# PS1='[\u@\h \W]\$ '
-

data/patches/system-bashrc.patch

@@ -1,19 +0,0 @@
---- a/bash/system.bashrc
-+++ a/bash/system.bashrc
-@@ -1,5 +1,5 @@
- #
--# /etc/bash.bashrc
-+# /etc/bash/bashrc
- #
-
- # If not running interactively, don't do anything
-@@ -19,4 +19,8 @@
-     ;;
- esac
-
-+for sh in /etc/bash/bashrc.d/*.bashrc ; do
-+	[[ -r ${sh} ]] && source "${sh}"
-+done
-+
- [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
-

data/patches/system-bashrc_logout.patch

@@ -1,8 +0,0 @@
---- a/bash/system.bash_logout
-+++ a/bash/system.bash_logout
-@@ -1,3 +1,3 @@
- #
--# /etc/bash.bash_logout
-+# /etc/bash/bash_logout
- #
-

lib/util-iso-profile.sh

@@ -47,18 +47,16 @@ load_profile(){
         addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
     fi
 
-    if [[ -z ${openrc_boot[@]} ]];then
-        openrc_boot=('elogind')
+    if [[ -z ${services[@]} ]];then
+        services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
     fi
 
-    if [[ -z ${openrc_default[@]} ]];then
-        openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+    [[ ${displaymanager} != "none" ]] && services+=('xdm')
+    
+    if [[ -z ${services_live[@]} ]];then
+        services_live=('artix-live' 'pacman-init')
     fi
-
-    [[ ${displaymanager} != "none" ]] && openrc_default+=('xdm')
-
-    enable_live=('artix-live' 'pacman-init')
-
+    
     [[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
 
     return 0

lib/util-iso-yaml.sh

@@ -33,11 +33,7 @@ write_servicescfg_conf(){
     echo '' >> "$conf"
     echo 'services:' >> "$conf"
     echo '    enabled:' >> "$conf"
-    for s in ${openrc_boot[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: boot' >> "$conf"
-    done
-    for s in ${openrc_default[@]};do
+    for s in ${services[@]};do
         echo "      - name: $s" >> "$conf"
         echo '        runlevel: default' >> "$conf"
     done

lib/util-iso.sh

@@ -165,14 +165,11 @@ configure_services(){
     info "Configuring [%s]" "${initsys}"
     case ${initsys} in
         'openrc')
-            for svc in ${openrc_boot[@]}; do
-                add_svc_rc "$mnt" "$svc" "boot"
-            done
-            for svc in ${openrc_default[@]}; do
+            for svc in ${services[@]}; do
                 [[ $svc == "xdm" ]] && set_xdm "$mnt"
                 add_svc_rc "$mnt" "$svc" "default"
             done
-            for svc in ${enable_live[@]}; do
+            for svc in ${services_live[@]}; do
                 add_svc_rc "$mnt" "$svc" "default"
             done
         ;;

lib/util-pkg-tree.sh

@@ -99,21 +99,18 @@ patch_pkg(){
                 -e '/nscd.service/d' \
                 -i $pkg/PKGBUILD
         ;;
-        'bash')
-            sed -e 's|system.bash_logout)|system.bash_logout\n        artix.bashrc)|' \
-                -e 's|etc/bash.|etc/bash/|g' \
-                -e 's|install -dm755 "$pkgdir"/etc/skel/|install -dm755 "$pkgdir"/etc/{skel,bash/bashrc.d}/|' \
-                -e 's|/etc/skel/.bash_logout|/etc/skel/.bash_logout\n  install -m644 artix.bashrc "$pkgdir"/etc/bash/bashrc.d/artix.bashrc|' \
-                -i $pkg/PKGBUILD
-
-            patch -p1 -i $DATADIR/patches/dot-bashrc.patch
-            patch -p1 -i $DATADIR/patches/system-bashrc.patch
-            patch -p1 -i $DATADIR/patches/system-bashrc_logout.patch
-            patch -p1 -i $DATADIR/patches/artix-bashrc.patch
-            cd $pkg
-                updpkgsums
-            cd ..
-        ;;
+#         'bash')
+#             sed -e 's|system.bash_logout)|system.bash_logout\n        artix.bashrc)|' \
+#                 -e 's|etc/bash.|etc/bash/|g' \
+#                 -e 's|install -dm755 "$pkgdir"/etc/skel/|install -dm755 "$pkgdir"/etc/{skel,bash/bashrc.d}/|' \
+#                 -e 's|/etc/skel/.bash_logout|/etc/skel/.bash_logout\n  install -m644 artix.bashrc "$pkgdir"/etc/bash/bashrc.d/artix.bashrc|' \
+#                 -i $pkg/PKGBUILD
+# 
+#             cd $pkg
+#                 patch -p1 -i $DATADIR/patches/artix-bash.patch
+#                 updpkgsums
+#             cd ..
+#         ;;
         'tp_smapi'|'acpi_call'|'r8168')
             sed -e 's|-ARCH|-ARTIX|g' -i $pkg/PKGBUILD
         ;;

lib/util.sh

@@ -27,7 +27,7 @@ load_vars() {
     [[ -f $1 ]] || return 1
 
     for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
-        [[ -z ${!var} ]] && eval $(grep -a "^${var}=" "$1")
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
     done
 
     return 0
@@ -67,12 +67,14 @@ init_artools_pkg(){
 
     [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
 
+    # to be removed
     [[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy' 'lib32')
 
     [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
 
     [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
 
+    # to be removed
     [[ -z ${repo_tree_arch} ]] && repo_tree_arch=('packages' 'community')
 
     [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'