Merge pull request #34 from artix-linux/devel

Devel

bin/buildtree.in

@@ -25,8 +25,11 @@ display_settings(){
     show_config
 
     msg "REPOS:"
-    msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
     msg2 "repo_tree_artix: %s" "${repo_tree_artix[*]}"
+    msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
+
+    msg "OPTIONS:"
+    msg2 "repository: %s" "${repository}"
 
     msg "ARGS:"
     msg2 "artix: %s" "${artix}"
@@ -38,7 +41,7 @@ display_settings(){
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
     msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-    msg2 "patches_dir: %s" "${patches_dir}"
+    msg2 "patches_dir: %s" "${patches_dir}/${repository}"
 }
 
 load_user_info
@@ -51,11 +54,13 @@ artix=false
 compare=false
 import_arch=false
 gitpush=false
+repository='system' #${PWD##*/}
 
-rsync_args=(-aWxv --progress --delete-before --no-R --no-implied-dirs)
+rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
+    echo "    -r <repo>     Repository [default:${repository}]"
     echo "    -a            Sync arch tree"
     echo "    -s            Sync artix tree"
     echo "    -c            Compare artix and arch versions"
@@ -70,10 +75,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='aipscqh'
+opts='r:aipscqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
+        r) repository="$OPTARG" ;;
         a) arch=true ;;
         s) artix=true ;;
         c) compare=true ;;
@@ -89,7 +95,7 @@ shift $(($OPTIND - 1))
 
 prepare_dir "${tree_dir_artix}"
 prepare_dir "${tree_dir_arch}"
-prepare_dir "${patches_dir}"
+prepare_dir "${patches_dir}/${repository}"
 
 ${pretend} && display_settings && exit 1
 
@@ -97,6 +103,6 @@ ${artix} && sync_tree_artix
 
 ${arch} && sync_tree_arch
 
-${compare} && show_version_table
+${compare} && show_version_table "${repository}"
 
-${import_arch} && import_from_arch ${gitpush}
+${import_arch} && import_from_arch "${repository}" "${gitpush}"

bin/deployiso.in

@@ -78,7 +78,7 @@ opts='p:l:uvtqh'
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
-        l) limit="$OPTARG" ;;
+        l) uplimit="$OPTARG" ;;
         u) update=true; rsync_args+=(-u) ;;
         t) torrent=true ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;

bin/mkchrootpkg.in

@@ -19,29 +19,6 @@ import ${LIBDIR}/util-chroot.sh
 
 shopt -s nullglob
 
-init_variables() {
-    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-    makepkg_args=("${default_makepkg_args[@]}")
-    keepbuilddir=false
-    update_first=false
-    clean_first=false
-    run_namcap=false
-    temp_chroot=false
-    chrootdir=
-    passeddir=
-    makepkg_user=
-    declare -ga install_pkgs
-    declare -gi ret=0
-
-    bindmounts_ro=()
-    bindmounts_rw=()
-
-    copy=$USER
-    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-    [[ -z "$copy" || $copy = root ]] && copy=copy
-    src_owner=${SUDO_USER:-$USER}
-}
-
 usage() {
     echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
     echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -293,7 +270,26 @@ move_products() {
 orig_argv=("$0" "$@")
 
 main() {
-    init_variables
+    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
+    makepkg_args=("${default_makepkg_args[@]}")
+    keepbuilddir=false
+    update_first=false
+    clean_first=false
+    run_namcap=false
+    temp_chroot=false
+    chrootdir=
+    passeddir=
+    makepkg_user=
+    declare -ga install_pkgs
+    declare -gi ret=0
+
+    bindmounts_ro=()
+    bindmounts_rw=()
+
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
     local opts='hcur:I:l:nTD:d:U:'
 

bin/signfile.in

@@ -16,6 +16,8 @@ LIBDIR='@libdir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 
+load_user_info
+
 load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
@@ -30,9 +32,5 @@ msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
 if [[ -n "${BUILDBOT_GPGP}" ]]; then
     gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
 else
-    if [[ -f /usr/bin/hellhound ]]; then
+    gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
-        gpg --batch --passphrase $(hellhound retrieve) --detach-sign "$file_to_sign"
-    else
-        gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
-    fi
 fi

data/import.list.d/galaxy.list

@@ -10,3 +10,11 @@ libsodium
 zeromq
 jansson
 libnewt
+libsass
+sassc
+libx86emu
+hwinfo
+yaml-cpp
+libbson
+libmongoc
+cmocka

data/import.list.d/world.list

@@ -68,7 +68,6 @@ libqmi
 glib-networking
 gsettings-desktop-schemas
 slang
-dhcp
 dbus-python
 lirc
 qt5-3d
@@ -180,6 +179,9 @@ python-packaging
 python-pyparsing
 python-setuptools
 python-six
+pyalpm
+python-pyelftools
+python-numpy
 randrproto
 recordproto
 renderproto
@@ -230,3 +232,99 @@ poppler
 bc
 xdg-utils
 xf86-input-libinput
+assimp
+cdparanoia
+cifs-utils
+ffmpeg
+flac
+gamin
+gcab
+giblib
+gsm
+gst-plugins-base
+gstreamer
+gtk2
+hunspell
+hyphen
+imlib2
+iniparser
+iso-codes
+jack
+lame
+ldb
+libass
+libavc1394
+libbluray
+libbsd
+libevdev
+libgee
+libid3tag
+libiec61883
+libmng
+libmodplug
+libndp
+libnotify
+libogg
+libraw1394
+libsamplerate
+libsigsegv
+libsndfile
+libsoup
+libsoxr
+libsrtp
+libssh
+libteam
+libtheora
+libva
+libvdpau
+libvisual
+libvorbis
+libvpx
+libxss
+libxv
+libxvmc
+libyaml
+ocl-icd
+openal
+opencore-amr
+openjpeg2
+opus
+orc
+perl-file-which
+potrace
+protobuf
+scrnsaverproto
+sdl2
+snappy
+speex
+t1lib
+talloc
+tdb
+tevent
+texlive-bin
+texlive-core
+texlive-latexextra
+ttf-dejavu
+usbmuxd
+videoproto
+vid.stab
+webrtc-audio-processing
+x265
+xorg-xauth
+xorg-xset
+xvidcore
+zita-alsa-pcmi
+zita-resampler
+zziplib
+xmlto
+namcap
+unzip
+zip
+gperf
+gperftools
+double-conversion
+lapack
+texlive-formatsextra
+texlive-pictures
+texlive-science
+nasm

initcpio/hooks/artix

@@ -102,7 +102,7 @@ _mnt_dev() {
 _verify_checksum() {
     local _status
     cd "/run/artix/bootmnt/${artixbasedir}/${arch}"
-    md5sum -c $1.md5 > /tmp/checksum.log 2>&1
+    sha512sum -c $1.sha512 > /tmp/checksum.log 2>&1
     _status=$?
     cd "${OLDPWD}"
     return ${_status}
@@ -160,7 +160,7 @@ artix_mount_handler() {
     if [[ "${checksum}" == "y" ]]; then
         for fs in rootfs desktopfs livefs;do
             if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.md5" ]]; then
+                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sha512" ]]; then
                     msg -n ":: Self-test requested, please wait..."
                     if _verify_checksum "${fs}"; then
                         msg "done. Checksum is OK, continue booting."
@@ -170,7 +170,7 @@ artix_mount_handler() {
                         launch_interactive_shell
                     fi
                 else
-                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.md5 not found"
+                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.sha512 not found"
                     launch_interactive_shell
                 fi
             fi

lib/util-iso-yaml.sh

@@ -10,7 +10,7 @@
 # GNU General Public License for more details.
 
 get_preset(){
-    local p=${tmp_dir}/${kernel}.preset
+    local p=/tmp/${kernel}.preset
     cp ${DATADIR}/linux.preset $p
     sed -e "s|@kernel@|$kernel|g" \
         -e "s|@arch@|${target_arch}|g"\

lib/util-iso.sh

@@ -86,9 +86,9 @@ error_function() {
 
 # $1: function
 run_log(){
-    local func="$1"
+    local func="$1" log_dir='/var/log/artools'
     local logfile=${log_dir}/$(gen_iso_fn).$func.log
-    logpipe=$(mktemp -u "${tmp_dir}/$func.pipe.XXXXXXXX")
+    logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
     mkfifo "$logpipe"
     tee "$logfile" < "$logpipe" &
     local teepid=$!
@@ -262,9 +262,9 @@ make_sig () {
 
 make_checksum(){
     local idir="$1" file="$2"
-    msg2 "Creating md5sum ..."
+    msg2 "Creating sha512sum ..."
     cd $idir
-    md5sum $file.sfs > $file.md5
+    sha512sum $file.sfs > $file.sha512
     cd ${OLDPWD}
 }
 
@@ -282,8 +282,8 @@ make_sfs() {
     msg "Generating SquashFS image for %s" "${src}"
     if [[ -f "${sfs}" ]]; then
         local has_changed_dir=$(find ${src} -newer ${sfs})
-        msg2 "Possible changes for %s ..." "${src}"  >> ${tmp_dir}/buildiso.debug
+        msg2 "Possible changes for %s ..." "${src}"  >> /tmp/buildiso.debug
-        msg2 "%s" "${has_changed_dir}" >> ${tmp_dir}/buildiso.debug
+        msg2 "%s" "${has_changed_dir}" >> /tmp/buildiso.debug
         if [[ -n "${has_changed_dir}" ]]; then
             msg2 "SquashFS image %s is not up to date, rebuilding..." "${sfs}"
             rm "${sfs}"

lib/util-msg.sh

@@ -8,61 +8,22 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-export LC_MESSAGES=C
+# export LC_MESSAGES=C
 export LANG=C
 
-declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
+source /usr/share/makepkg/util.sh
 
 if [[ -t 2 ]]; then
-    # prefer terminal safe colored and bold text when tput is supported
+    colorize
-    if tput setaf 0 &>/dev/null; then
+else
-        ALL_OFF="$(tput sgr0)"
+    declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
-        BOLD="$(tput bold)"
-        RED="${BOLD}$(tput setaf 1)"
-        GREEN="${BOLD}$(tput setaf 2)"
-        YELLOW="${BOLD}$(tput setaf 3)"
-        BLUE="${BOLD}$(tput setaf 4)"
-    else
-        ALL_OFF="\e[0m"
-        BOLD="\e[1m"
-        RED="${BOLD}\e[31m"
-        GREEN="${BOLD}\e[32m"
-        YELLOW="${BOLD}\e[33m"
-        BLUE="${BOLD}\e[34m"
-    fi
 fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-    local mesg=$1; shift
-    printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-    local mesg=$1; shift
-    printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-    local mesg=$1; shift
-    printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
 
 info() {
     local mesg=$1; shift
     printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-warning() {
-    local mesg=$1; shift
-    printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-    local mesg=$1; shift
-    printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
     local mesg=$1; shift
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2

lib/util-pkg-publish.sh

@@ -52,6 +52,13 @@ move_to_repo(){
 
 add_to_repo(){
     local repo="$1" destarch="$2" pkg="$3" ver pkgfile result
+    if [[ $pkg == 'llvm' ]];then
+        if [[ ${repo#*-} == 'testing' ]];then
+            repo='world-testing'
+        else
+            repo='world'
+        fi
+    fi
     local repo_path=${repos_root}/$repo/os/$destarch
     source $pkg/PKGBUILD
     local dest=$pkg

lib/util-pkg-tree.sh

@@ -22,35 +22,6 @@ is_dirty() {
     return 0
 }
 
-show_version_table(){
-    declare -A UPDATES
-    msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
-    for repo in ${repo_tree_artix[@]}; do
-        for pkg in ${tree_dir_artix}/$repo/*; do
-            if [[ -f $pkg/PKGBUILD ]];then
-                source $pkg/PKGBUILD 2>/dev/null
-                package=${pkg##*/}
-                artixver=$(get_full_version $package)
-                set_import_path "$repo" "$package"
-                if [[ -f $src/PKGBUILD ]];then
-                    source $src/PKGBUILD 2>/dev/null
-                    archver=$(get_full_version $package)
-                fi
-                if [ $(vercmp $artixver $archver) -lt 0 ];then
-                    UPDATES[$package]="$pkg/PKGBUILD $src/PKGBUILD"
-                    msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
-                fi
-            fi
-            unset pkgver epoch pkgrel artixver archver package
-        done
-    done
-    rm ${patches_dir}/*.patch
-    for upd in "${!UPDATES[@]}"; do
-        msg "Writing %s update patch ..." "$upd"
-        diff -u ${UPDATES[$upd]} > ${patches_dir}/"$upd"-archlinux.patch
-    done
-}
-
 sync_tree(){
     local branch="master" repo="$1"
     git checkout $branch
@@ -80,6 +51,7 @@ clone_tree(){
 }
 
 sync_tree_arch(){
+    local repo="$1"
     cd ${tree_dir_arch}
         for repo in ${repo_tree_arch[@]};do
             if [[ -d ${repo} ]];then
@@ -94,6 +66,7 @@ sync_tree_arch(){
 }
 
 sync_tree_artix(){
+    local repo="$1"
     cd ${tree_dir_artix}
         for repo in ${repo_tree_artix[@]};do
             if [[ -d ${repo} ]];then
@@ -149,36 +122,23 @@ set_import_path(){
     local repo="$1" pkg="$2"
     case $repo in
         system|world)
-            if [[ "$repo" == 'system' ]];then
+            arch_dir=packages
-                arch_repo=core
+            [[ "$repo" == 'system' ]] && arch_repo=core
-                arch_dir=packages
+            [[ "$repo" == 'world' ]] && arch_repo=extra
-            fi
-            if [[ "$repo" == 'world' ]];then
-                arch_repo=extra
-                arch_dir=packages
-            fi
             import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
             src=$import_path/$arch_repo-x86_64
-            if [[ -d $import_path/$arch_repo-any ]];then
+            [[ -d $import_path/testing-x86_64 ]] && src=$import_path/testing-x86_64
-                src=$import_path/$arch_repo-any
+            [[ -d $import_path/$arch_repo-any ]] && src=$import_path/$arch_repo-any
-            elif [[ -d $import_path/testing-x86_64 ]];then
+            [[ -d $import_path/testing-any ]] && src=$import_path/testing-any
-                src=$import_path/testing-x86_64
-            elif [[ -d $import_path/testing-any ]];then
-                src=$import_path/testing-any
-            fi
         ;;
         galaxy)
             arch_repo=community
             arch_dir=$arch_repo
             import_path=${tree_dir_arch}/$arch_dir/$pkg/repos/$arch_repo
             src=$import_path-x86_64
-            if [[ -d $import_path-any ]];then
+            [[ -d $import_path-testing-x86_64 ]] && src=$import_path-testing-x86_64
-                src=$import_path-any
+            [[ -d $import_path-any ]] && src=$import_path-any
-            elif [[ -d $import_path-testing-x86_64 ]];then
+            [[ -d $import_path-testing-any ]] && src=$import_path-testing-any
-                src=$import_path-testing-x86_64
-            elif [[ -d $import_path-testing-any ]];then
-                src=$import_path-testing-any
-            fi
         ;;
         lib32)
             if [[ "$pkg" == 'llvm' ]];then
@@ -186,51 +146,70 @@ set_import_path(){
                 arch_dir=packages
                 import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
                 src=$import_path/extra-x86_64
-                if [[ -d $import_path/testing-x86_64 ]];then
+                [[ -d $import_path/testing-x86_64 ]] && src=$import_path/testing-x86_64
-                    src=$import_path/testing-x86_64
-                fi
             else
                 arch_repo=multilib
                 arch_dir=community
                 import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
                 src=$import_path/$arch_repo-x86_64
-                if [[ -d $import_path/$arch_repo-testing-x86_64 ]];then
+                [[ -d $import_path/$arch_repo-testing-x86_64 ]] && src=$import_path/$arch_repo-testing-x86_64
-                    src=$import_path/$arch_repo-testing-x86_64
-                fi
             fi
         ;;
     esac
+#     info "src: %s" "$src"
+}
+
+show_version_table(){
+    local repo="$1"
+    declare -A UPDATES
+    msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
+    for pkg in ${tree_dir_artix}/$repo/*; do
+        if [[ -f $pkg/PKGBUILD ]];then
+            source $pkg/PKGBUILD 2>/dev/null
+            package=${pkg##*/}
+            artixver=$(get_full_version $package)
+            set_import_path "$repo" "$package"
+            if [[ -f $src/PKGBUILD ]];then
+                source $src/PKGBUILD 2>/dev/null
+                archver=$(get_full_version $package)
+            fi
+            if [ $(vercmp $artixver $archver) -lt 0 ];then
+                UPDATES[$package]="$pkg/PKGBUILD $src/PKGBUILD"
+                msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
+            fi
+        fi
+        unset pkgver epoch pkgrel artixver archver package
+    done
+    find "${patches_dir}/$repo/" -name *.patch -delete
+    for upd in "${!UPDATES[@]}"; do
+        msg "Writing %s update patch ..." "$upd"
+        diff -u ${UPDATES[$upd]} > ${patches_dir}/$repo/"$upd"-archlinux.patch
+    done
 }
 
 import_from_arch(){
-    local timer=$(get_timer) branch='testing' push="$1"
+    local timer=$(get_timer) branch='testing' repo="$1" push="$2"
-    for repo in ${repo_tree_artix[@]};do
+    read_import_list "$repo"
-        read_import_list "$repo"
+    if [[ -n ${import_list[@]} ]];then
-        if [[ -n ${import_list[@]} ]];then
+        cd ${tree_dir_artix}/$repo
-            cd ${tree_dir_artix}/$repo
+        git checkout $branch &> /dev/null
-            git checkout $branch &> /dev/null
+        $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
-            $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
+        git pull origin "$branch"
-            git pull origin "$branch"
+        for pkg in ${import_list[@]};do
-            msg "Import into [%s]" "$repo"
+            set_import_path "$repo" "$pkg"
-            for pkg in ${import_list[@]};do
+            source $src/PKGBUILD 2>/dev/null
-                source $pkg/PKGBUILD 2>/dev/null
+            local ver=$(get_full_version $pkg)
-                local ver=$(get_full_version $pkg)
+            msg "Package: %s-%s" "$pkg" "$ver"
-                msg2 "package: %s-%s" "$pkg" "$ver"
+            rsync "${rsync_args[@]}"  $src/ ${tree_dir_artix}/$repo/$pkg/
-                set_import_path "$repo" "$pkg"
+            patch_pkg "$pkg"
-                rsync "${rsync_args[@]}"  $src/ ${tree_dir_artix}/$repo/$pkg/
+            if ${push};then
-                if $(is_dirty) || $(is_untracked); then
+                git add "$pkg"
-                    patch_pkg "$pkg"
+                git commit -m "$pkg-$ver"
-                    ${push} && git add "$pkg"
+                sleep 10
-                    msg2 "Archlinux import: [%s]" "$pkg-$ver"
+                git push origin "$branch"
-                    if ${push};then
+            fi
-                        git commit -m "Archlinux import: $pkg-$ver"
+            unset pkgver epoch pkgrel ver
-                        sleep 10
+        done
-                        git push origin "$branch"
+    fi
-                    fi
-                fi
-                unset pkgver epoch pkgrel ver
-            done
-        fi
-    done
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }

lib/util-pkg.sh

@@ -9,15 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-in_array() {
-    local needle=$1; shift
-    local item
-    for item in "$@"; do
-        [[ $item = $needle ]] && return 0 # Found
-    done
-    return 1 # Not Found
-}
-
 # $1: sofile
 # $2: soarch
 process_sofile() {
@@ -45,30 +36,6 @@ pkgver_equal() {
     fi
 }
 
-get_full_version() {
-    # set defaults if they weren't specified in buildfile
-    pkgbase=${pkgbase:-${pkgname[0]}}
-    epoch=${epoch:-0}
-    if [[ -z $1 ]]; then
-        if [[ $epoch ]] && (( ! $epoch )); then
-            echo $pkgver-$pkgrel
-        else
-            echo $epoch:$pkgver-$pkgrel
-        fi
-    else
-        for i in pkgver pkgrel epoch; do
-            local indirect="${i}_override"
-            eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
-            [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
-        done
-        if (( ! $epoch_override )); then
-            echo $pkgver_override-$pkgrel_override
-        else
-            echo $epoch_override:$pkgver_override-$pkgrel_override
-        fi
-    fi
-}
-
 find_cached_package() {
     local searchdirs=("$PWD" "$PKGDEST") results=()
     local targetname=$1 targetver=$2 targetarch=$3

lib/util.sh

@@ -58,10 +58,6 @@ init_artools_base(){
 
     [[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
 
-    log_dir='/var/log/artools'
-
-    tmp_dir='/tmp'
-
     [[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
 
     prepare_dir "${workspace_dir}"