util-pkg: don't set localersion in kernel config

Makefile

@@ -1,6 +1,6 @@
-VERSION=0.8
+VERSION=0.9
 
-CHROOT_VERSION=0.7
+CHROOT_VERSION=0.8
 
 TOOLS = artools
 ifdef PREFIX

bin/artools-chroot.in

@@ -86,8 +86,8 @@ else
 
     ${pretend} && display_settings && exit 1
 
-    chroot_api_efi_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_mount /etc/resolv.conf "${chrootdir}/etc/resolv.conf" --bind
+    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+    chroot_add_resolv_conf "${chrootdir}"
 fi
 
 SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

bin/basestrap.in

@@ -20,6 +20,26 @@ import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-mount.sh
 import ${LIBDIR}/util-chroot.sh
 
+copy_mirrorlist(){
+    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
+}
+
+copy_keyring(){
+    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
+        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
+    fi
+}
+
+create_min_fs(){
+    msg "Creating install root at %s" "$1"
+    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
+    mkdir -m 1777 -p $1/{tmp,run}
+    mkdir -m 0555 -p $1/{sys,proc}
+#     if [[ ! -f $1/etc/machine-id ]];then
+#         touch $1/etc/machine-id
+#     fi
+}
+
 newroot=/mnt
 
 hostcache=false

bin/buildiso.in

@@ -24,8 +24,6 @@ prepare_build(){
 
     load_profile "${profile}"
 
-    netgroups=${netgroups_url}/netgroups-${initsys}.yaml
-
     local pacman_conf pac_file="pacman-default.conf"
 
     case "${stablility}" in
@@ -53,8 +51,6 @@ show_profile(){
     if ${verbose};then
         msg2 "autologin: %s" "${autologin}"
 
-        msg2 "netgroups: %s" "${netgroups}"
-
         msg2 "hostname: %s" "${hostname}"
         msg2 "username: %s" "${username}"
         msg2 "password: %s" "${password}"
@@ -72,7 +68,6 @@ display_settings(){
     msg "OPTIONS:"
     msg2 "profile: %s" "${profile}"
     msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
     [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
     msg2 "stablility: %s" "${stablility}"
 
@@ -146,8 +141,6 @@ usage() {
     echo "                       [default: ${chroots_iso}]"
     echo '    -t <dir>           Target directory'
     echo "                       [default: ${iso_pool}]"
-    echo '    -k <name>          Kernel to use'
-    echo "                       [default: ${kernel}]"
     echo '    -i <name>          Init system to use'
     echo "                       [default: ${initsys}]"
     echo '    -g <key>           The gpg key for sfs signing'
@@ -167,14 +160,13 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:r:t:k:i:g:czxmvqh'
+opts='p:r:t:i:g:czxmvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
         r) chroots_iso="$OPTARG" ;;
         t) iso_pool="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
         i) initsys="$OPTARG" ;;
         g) gpgkey="$OPTARG" ;;
         c) clean_first=false ;;

bin/buildtree.in

@@ -18,6 +18,8 @@ DATADIR='@datadir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
+import ${LIBDIR}/util-pkg-gitea.sh
+import ${LIBDIR}/util-pkg-subrepo.sh
 
 pull_tree_arch(){
     cd ${tree_dir_arch}
@@ -40,6 +42,12 @@ pull_tree_artix(){
         if [[ -d ${tree} ]];then
             cd ${tree}
                 git config --bool pull.rebase true
+                git config commit.gpgsign true
+                if [[ -n "${GPGKEY}" ]];then
+                    git config user.signingkey "${GPGKEY}"
+                else
+                    warning "No GPGKEY configured in makepkg.conf!"
+                fi
                 msg "Checking (%s)" "${tree}"
                 pull_tree
             cd ..
@@ -55,30 +63,30 @@ show_version_table(){
     for tree in packages packages-galaxy;do
         local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
         for pkg_path in ${git[@]}; do
-            local artixrepo=$(find_repo "$pkg_path" "${unstable}")
+            local artixrepo=$(find_repo "$pkg_path" "${unstable}" "${staging}")
             if [[ -d $pkg_path/repos/$artixrepo ]];then
                 source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
                 local pkg=${pkg_path##*/}
                 local artixver=$(get_full_version $pkg)
                 local src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg" "${unstable}")
+                local archrepo=$(find_repo "$src/$pkg" "${unstable}" "${staging}")
                 if [[ -d $src/$pkg/repos/$archrepo ]];then
                     source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
                     local archver=$(get_full_version $pkg)
                 fi
                 if ${artix};then
-                    if [ $(vercmp $artixver $archver) -eq 0 ] || [ $(vercmp $artixver $archver) -gt 0 ];then
+                    if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
                         local ar=$(arch_to_artix_repo "$artixrepo")
                         case $ar in
                             *goblins)
-                                if [[ $archrepo == $artixrepo ]];then
+                                if [[ "$archrepo" == "$artixrepo" ]];then
                                     msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                                 else
                                     msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                                 fi
                             ;;
                             *gremlins)
-                                if [[ $archrepo == $artixrepo ]];then
+                                if [[ "$archrepo" == "$artixrepo" ]];then
                                     msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                                 else
                                     msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
@@ -87,11 +95,11 @@ show_version_table(){
                         esac
                     fi
                 else
-                    if [ $(vercmp $artixver $archver) -lt 0 ];then
+                    if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
                         local ar=$(arch_to_artix_repo "$artixrepo")
                         ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                     fi
-                    if [ $(vercmp $artixver $archver) -gt 0 ];then
+                    if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
                         local ar=$(arch_to_artix_repo "$artixrepo")
                         if [[ -n $archver ]] && [[ -n $archrepo ]];then
                             ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
@@ -155,7 +163,10 @@ from_arch(){
         cd ${tree_dir_artix}/$git_tree_artix
 
         dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
-        mkdir $pkg
+
+        create_repo "$pkg"
+        add_repo_to_team "$pkg" "$pkg_path"
+        subrepo_clone "$pkg"
 
         info "Import from archlinux (%s)" "$git_tree_arch"
         rsync "${rsync_args[@]}" $src/ $dest/
@@ -195,6 +206,8 @@ display_settings(){
     msg2 "upgrades: %s" "${upgrades}"
     msg2 "downgrades: %s" "${downgrades}"
     msg2 "artix: %s" "${artix}"
+    msg2 "staging: %s" "${staging}"
+    msg2 "unstable: %s" "${unstable}"
     msg2 "import: %s" "${import}"
     msg2 "view: %s" "${view}"
     msg2 "trunk: %s" "${trunk}"
@@ -215,6 +228,7 @@ sync=false
 sync_arch=true
 compare=false
 unstable=false
+staging=true
 upgrades=false
 downgrades=false
 artix=false
@@ -231,10 +245,11 @@ usage() {
     echo "    -s            Clone or pull repos"
     echo "    -z            Don't clone or pull arch repos"
     echo '    -c            Compare packages'
-    echo '    -x            Include unstable kde and gnome'
     echo '    -u            Show upgrade packages'
     echo '    -d            Show downgrade packages'
-    echo '    -a            Show testing and staging packages'
+    echo '    -a            Show testing packages'
+    echo "    -y            Don't inlcude staging packages"
+    echo '    -x            Include unstable kde and gnome'
     echo '    -i            Import a package from arch repos'
     echo '    -t            Import from arch trunk'
     echo '    -v            View package depends'
@@ -247,7 +262,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:csudaiztxvqh'
+opts='p:csudayiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -258,6 +273,7 @@ while getopts "${opts}" arg; do
         u) upgrades=true ;;
         d) downgrades=true ;;
         a) artix=true ;;
+        y) staging=false ;;
         i) import=true ;;
         t) trunk=true ;;
         v) view=true ;;

bin/chroot-run.in

@@ -93,9 +93,9 @@ copy_hostconf () {
 }
 
 chroot_extra_mount() {
-    chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
+    chroot_add_resolv_conf "$1"
     chroot_mount "/etc/hosts" "$1/etc/hosts" -B
-    chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
+#     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
     chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
     for cache_dir in ${cache_dirs[@]:1}; do

bin/commitpkg.in

@@ -18,6 +18,7 @@ DATADIR='@datadir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
+import ${LIBDIR}/util-pkg-subrepo.sh
 
 commit_pkg(){
     local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
@@ -27,6 +28,7 @@ commit_pkg(){
         source trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
         local ver=$(get_full_version "${package}")
+        local commit_msg=""
 
         if ${remove};then
             local action='remove'
@@ -37,20 +39,27 @@ commit_pkg(){
                 local pkg="${package}-$ver"
                 git rm -r repos/"${source_repo}-$CARCH"
             fi
-            msg "Action: [%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
-            git commit -m "[${source_repo}] '$pkg' ${action}"
+            commit_msg="[${source_repo}] '$pkg' ${action}"
+            msg "Action: %s" "$commit_msg"
         else
             local action='modify'
-            msg "Action: [%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
+            commit_msg="[${source_repo}] '${package}-$ver' ${action}"
+            msg "Action: %s" "$commit_msg"
             git add .
-            git commit -m "[${source_repo}] '${package}-$ver' ${action}"
+
         fi
+        git commit -m "$commit_msg"
+
+        cd ${tree_dir_artix}/${git_tree}
 
         if ${push};then
             msg "Checking (%s)" "${git_tree}"
             git pull origin master
+            subrepo_push "${package}"
+            sleep 1
             git push origin master
         fi
+        git prune
     else
         error "Package '%s' does not exist!" "${package}"
     fi
@@ -85,16 +94,22 @@ symlink_commit_pkg(){
             cp repos/$src/* repos/$dest/
             git rm -r repos/$src
         fi
+        local commit_msg="[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
+        msg "Action: %s" "$commit_msg"
 
-        msg "Action: [%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
         git add .
-        git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
+        git commit -m "$commit_msg"
+
+        cd ${tree_dir_artix}/${git_tree}
 
         if ${push};then
             msg "Checking (%s)" "${git_tree}"
             git pull origin master
+            subrepo_push "${package}"
+            sleep 1
             git push origin master
         fi
+        git prune
     else
         error "Package '%s' does not exist!" "${package}"
     fi

bin/fstabgen.in

@@ -93,6 +93,7 @@ usage() {
 usage: ${0##*/} [options] root
 
   Options:
+    -f FILTER      Restrict output to mountpoints matching the prefix FILTER
     -L             Use labels for source identifiers (shortcut for -t LABEL)
     -p             Exclude pseudofs mounts (default behavior)
     -P             Include printing mounts
@@ -112,10 +113,11 @@ if [[ -z $1 || $1 = @(-h|--help) ]]; then
   exit $(( $# ? 0 : 1 ))
 fi
 
-while getopts ':LPpt:U' flag; do
+while getopts ':f:LPpt:U' flag; do
     case $flag in
         L) bytag=LABEL ;;
         U) bytag=UUID ;;
+        f) prefixfilter=$OPTARG ;;
         P) pseudofs=1 ;;
         p) pseudofs=0 ;;
         t) bytag=${OPTARG^^} ;;
@@ -139,6 +141,8 @@ while read -r src target fstype opts fsroot; do
         continue
     fi
 
+    [[ $target = "$prefixfilter"* ]] || continue
+
     # default 5th and 6th columns
     dump=0 pass=2
 

bin/mkchroot.in

@@ -22,9 +22,6 @@ import ${LIBDIR}/util-chroot.sh
 working_dir=''
 files=()
 
-build_locales=false
-keep_mirrors=false
-keep_flag=''
 nosetarch=false
 
 usage() {
@@ -73,9 +70,6 @@ else
     cache_dirs=(${cache_dir})
 fi
 
-basestrap_args=(-Gc ${pacman_conf:+-C "$pacman_conf"})
-[[ -n ${mirror} ]] && basestrap_args+=(-M)
-
 umask 0022
 
 #[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir"
@@ -104,17 +98,21 @@ while read -r varname; do
     _env+=("$varname=${!varname}")
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
-basestrap "${basestrap_args[@]}" "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+basestrap -Gc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
 echo "$chroot_version" > "$working_dir/.artools"
 
-default_locale "set" "$working_dir"
+if [[ ! -f "$working_dir/etc/locale.gen.orig" ]];then
+    mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.orig"
+fi
+printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+
+dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 
 chroot_args=(${pacman_conf:+-C "$pacman_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${cache_dir:+-c "$cache_dir"})
 ${nosetarch} && chroot_args+=(${nosetarch:+-s})
 
-[[ -n ${mirror} ]] && default_mirror "$working_dir" "$mirror"
-
 exec chroot-run \
     "${chroot_args[@]}" \
     "$working_dir" locale-gen

bin/mkchrootpkg.in

@@ -163,10 +163,10 @@ prepare_chroot() {
 
     $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
 
-    for x in .gnupg/pubring.{kbx,gpg}; do
-        [[ -r $USER_HOME/$x ]] || continue
-        $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
-    done
+#     for x in .gnupg/pubring.{kbx,gpg}; do
+#         [[ -r $USER_HOME/$x ]] || continue
+#         $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
+#     done
 
     sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
     for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
@@ -204,17 +204,23 @@ _chrootbuild() {
     ulimit -c 0
 
     # Work around chroot-run not giving a ctty
-    exec </dev/console
+    #exec </dev/console
 
     . /etc/profile
 
-    export LANG=en_US.UTF-8
+    #export LANG=en_US.UTF-8
 
     # workaround meson locale errors
     # supposedly fixed with coming python-3.7
-    locale-gen &> /dev/null
+    #locale-gen &> /dev/null
 
     sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+
+    ret=$?
+    case $ret in
+        0|14) return 0;;
+        *) return $ret;;
+    esac
 }
 
 _chrootnamcap() {
@@ -235,8 +241,8 @@ download_sources() {
 
     local builddir
     builddir="$(mktemp -d)"
-    chmod 1777 "$builddir"
-#     chown "$makepkg_user:$makepkg_user" "$builddir"
+#     chmod 1777 "$builddir"
+    chown "$makepkg_user:" "$builddir"
 
     # Ensure sources are downloaded
     sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \

data/artools.conf

@@ -12,7 +12,10 @@
 ################ artools-pkg ################
 #############################################
 
-# host_tree_artix='https://github.com/artix-linux'
+# git user access token
+# git_token=''
+
+# host_tree_artix='gitea@gitea.artixlinux.org:artix'
 
 # host_tree_arch=git://projects.archlinux.org/svntogit
 
@@ -35,9 +38,6 @@
 # unset defaults to given value
 # kernel="linux"
 
-# custom additional kernel args
-# kernel_args=""
-
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
 

data/makepkg.conf

@@ -1,3 +1,4 @@
+#!/hint/bash
 #
 # /etc/makepkg.conf
 #
@@ -8,9 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -34,8 +36,6 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
@@ -50,7 +50,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -83,11 +83,9 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- emptydirs:  Leave empty directories in packages
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
-#-- optipng:    Optimize PNG images with optipng
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -103,6 +101,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -143,5 +143,3 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:

data/mkinitcpio.conf

@@ -1,5 +1,5 @@
 MODULES=(loop dm-snapshot)
 
-HOOKS=(base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap)
+HOOKS=(base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block filesystems keyboard keymap)
 
 COMPRESSION="xz"

initcpio/hooks/artix

@@ -32,6 +32,10 @@ _mnt_dmsnapshot() {
 
     dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
 
+    if [[ "${cow_persistent}" != "P" ]]; then
+        rm -f "/run/artix/cowspace/${cow_directory}/${img_name}.cow"
+    fi
+
     _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
     echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/artix/used_block_devices
 }

initcpio/install/artix_kms

@@ -7,16 +7,6 @@ build() {
     add_module "via-agp"
     add_module "sis-agp"
     add_module "intel-agp"
-
-    if [[ $(uname -m) == i686 ]]; then
-        add_module "amd64-agp"
-        add_module "ati-agp"
-        add_module "sworks-agp"
-        add_module "ali-agp"
-        add_module "amd-k7-agp"
-        add_module "nvidia-agp"
-        add_module "efficeon-agp"
-    fi
 }
 
 help() {

lib/util-chroot.sh

@@ -8,26 +8,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-copy_mirrorlist(){
-    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
-}
-
-copy_keyring(){
-    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
-        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
-    fi
-}
-
-create_min_fs(){
-    msg "Creating install root at %s" "$1"
-    mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
-    mkdir -m 1777 -p $1/{tmp,run}
-    mkdir -m 0555 -p $1/{sys,proc}
-    if [[ ! -f $1/etc/machine-id ]];then
-        touch $1/etc/machine-id
-    fi
-}
-
 is_btrfs() {
 	[[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
 }
@@ -47,30 +27,6 @@ subvolume_delete_recursive() {
     return 0
 }
 
-default_locale(){
-    local action="$1" mnt="$2"
-    if [[ $action == "set" ]];then
-        if [[ ! -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Setting locale ..."
-            mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
-            printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$mnt/etc/locale.gen"
-            echo 'LANG=en_US.UTF-8.UTF-8' > "$mnt/etc/locale.conf"
-        fi
-    elif [[ $action == "reset" ]];then
-        if [[ -f "$mnt/etc/locale.gen.bak" ]];then
-            info "Resetting locale ..."
-            mv "$mnt/etc/locale.gen.bak" "$mnt/etc/locale.gen"
-            rm "$mnt/etc/locale.conf"
-        fi
-    fi
-}
-
-default_mirror(){
-    local mnt="$1" mirror="$2"'/$repo/os/$arch'
-    [[ -f $mnt/etc/pacman.d/mirrorlist ]] && mv "$mnt"/etc/pacman.d/mirrorlist "$mnt"/etc/pacman.d/mirrorlist.bak
-    echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
-}
-
 # $1: chroot
 kill_chroot_process(){
     local prefix="$1" flink pid name

lib/util-iso-grub.sh

@@ -19,7 +19,7 @@ prepare_initcpio(){
 
 prepare_initramfs(){
     local mnt="$1"
-    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${iso_name}.conf
+    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
     if [[ -n ${gpgkey} ]]; then
         user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
         exec 17<>${AT_USERCONFDIR}/gpgkey
@@ -27,7 +27,7 @@ prepare_initramfs(){
     local _kernel=$(cat $mnt/usr/lib/modules/*/version)
     ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
         /usr/bin/mkinitcpio -k ${_kernel} \
-        -c /etc/mkinitcpio-${iso_name}.conf \
+        -c /etc/mkinitcpio-artix.conf \
         -g /boot/initramfs.img
 
     if [[ -n ${gpgkey} ]]; then
@@ -47,18 +47,13 @@ prepare_boot_extras(){
 }
 
 configure_grub(){
-    local conf="$1"
-
-    sed -e "s|@arch@|${target_arch}|g" \
-        -e "s|@iso_label@|${iso_label}|" \
-        -e "s|@iso_name@|${iso_name}|g" \
-        -e "s|@kernel_args@|${kernel_args}|g" \
-        -i $conf
+    local conf="$1/boot/grub/kernels.cfg"
+    sed -e "s|@iso_label@|${iso_label}|" -i $conf
 }
 
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
-        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
+        lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub
 
     prepare_dir ${grub}/${platform}
 
@@ -72,16 +67,8 @@ prepare_grub(){
 
     cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
-    case ${target_arch} in
-        'i686')
-            platform=i386-efi
-            img=bootia32.efi
-        ;;
-        'x86_64')
-            platform=x86_64-efi
-            img=bootx64.efi
-        ;;
-    esac
+    platform=x86_64-efi
+    img=bootx64.efi
 
     prepare_dir ${efi}
     prepare_dir ${grub}/${platform}
@@ -93,10 +80,12 @@ prepare_grub(){
     grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
-    cp -r ${theme}/themes/${iso_name} ${grub}/themes/
-    cp ${data}/unicode.pf2 ${grub}
+    cp -r ${theme}/themes/artix ${grub}/themes/
     cp -r ${theme}/{locales,tz} ${grub}
 
+    msg2 "Creating %s ..." "unicode.pf2"
+    grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

lib/util-iso-profile.sh

@@ -67,8 +67,6 @@ load_profile(){
         services_live=('artix-live' 'pacman-init')
     fi
 
-    [[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
-
     return 0
 }
 
@@ -93,7 +91,7 @@ write_live_session_conf(){
 }
 
 load_pkgs(){
-    local pkglist="$1" init="$2" _kv="$3"
+    local pkglist="$1" init="$2"
     info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
     local _init="s|>$init||g"
@@ -104,7 +102,6 @@ load_pkgs(){
     esac
 
     local _blacklist="s|>blacklist.*||g" \
-        _kernel="s|KERNEL|$_kv|g" \
         _space="s| ||g" \
         _clean=':a;N;$!ba;s/\n/ /g' \
         _com_rm="s|#.*||g"
@@ -116,6 +113,5 @@ load_pkgs(){
             | sed "$_init" \
             | sed "$_init_rm1" \
             | sed "$_init_rm2" \
-            | sed "$_kernel" \
             | sed "$_clean"))
 }

lib/util-iso-yaml.sh

@@ -9,44 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-write_bootloader_conf(){
-    local conf="$1/bootloader.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' > "$conf"
-    echo "efiBootLoader: \"grub\"" >> "$conf"
-    echo "kernel: \"/vmlinuz-$kernel-${target_arch}\"" >> "$conf"
-    echo "img: \"/initramfs-$kernel-${target_arch}.img\"" >> "$conf"
-    echo "fallback: \"/initramfs-$kernel-${target_arch}-fallback.img\"" >> "$conf"
-    echo 'timeout: "10"' >> "$conf"
-    echo "kernelLine: \", with ${kernel}\"" >> "$conf"
-    echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
-    echo 'grubInstall: "grub-install"' >> "$conf"
-    echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
-    echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
-    echo '#efiBootloaderId: "dirname"' >> "$conf"
-}
-
-write_servicescfg_conf(){
-    local conf="$1/servicescfg.conf" init="$2"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' >  "$conf"
-    echo "initsys: $init" >> "$conf"
-    echo '' >> "$conf"
-    echo 'services:' >> "$conf"
-    echo '    enabled:' >> "$conf"
-    for svc in ${services[@]};do
-        echo "      - name: $svc" >> "$conf"
-        echo '        runlevel: default' >> "$conf"
-    done
-}
-
-write_initcpio_conf(){
-    local conf="$1/initcpio.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "kernel: ${kernel}" >> "$conf"
-}
-
 write_users_conf(){
     local conf="$1/users.conf"
     msg2 "Writing %s ..." "${conf##*/}"
@@ -61,43 +23,51 @@ write_users_conf(){
     echo "doAutologin:     false" >> "$conf"
     echo "sudoersGroup:    wheel" >> "$conf"
     echo "setRootPassword: true" >> "$conf"
-    echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
+#     echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
     echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
     echo "avatarFilePath:  ~/.face" >> "$conf"
 }
 
-write_netinstall_conf(){
-    local conf="$1/netinstall.conf"
+write_servicescfg_conf(){
+    local init="$2"
+    local conf="$1"/"$init"cfg.conf state='add'
     msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "groupsUrl: ${netgroups}" >> "$conf"
+    echo '---' >  "$conf"
+    if [[ "$init" == 'runit' ]];then
+        state='enabled'
+        echo 'svdir: /etc/runit/sv' >> "$conf"
+        echo '' >> "$conf"
+        echo 'runsvdir: /etc/runit/runsvdir' >> "$conf"
+    fi
+    echo '' >> "$conf"
+    echo 'services:' >> "$conf"
+    echo "    $state:" >> "$conf"
+    for svc in ${services[@]};do
+        echo "      - name: $svc" >> "$conf"
+        echo '        runlevel: default' >> "$conf"
+    done
 }
 
-write_unpack_conf(){
-    local conf="$1/unpackfs.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "unpack:" >> "$conf"
-    echo "    - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/rootfs.sfs\"" >> "$conf"
-    echo "      sourcefs: \"squashfs\"" >> "$conf"
-    echo "      destination: \"\"" >> "$conf"
-    if [[ -f "${desktop_list}" ]] ; then
-        echo "    - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/desktopfs.sfs\"" >> "$conf"
-        echo "      sourcefs: \"squashfs\"" >> "$conf"
-        echo "      destination: \"\"" >> "$conf"
-    fi
+write_postcfg_conf(){
+    local conf="$1/postcfg.conf" init="$2"
+    sed -e "s|openrc|$init|" -i "$conf"
+}
+
+write_netinstall_conf(){
+    local conf="$1/netinstall.conf" init="$2"
+    sed -e "s|netgroups-openrc.yaml|netgroups-$init.yaml|" -i "$conf"
 }
 
 configure_calamares(){
-    local dest="$1" mods="$1/etc/calamares/modules" init="$2"
-    if [[ -d $dest/etc/calamares/modules ]];then
+    local mods="$1/etc/calamares/modules" init="$2"
+    if [[ -d "$mods" ]];then
         info "Configuring [Calamares]"
-        write_netinstall_conf "$mods"
-        write_unpack_conf "$mods"
+        write_netinstall_conf "$mods" "$init"
         write_users_conf "$mods"
-        write_initcpio_conf "$mods"
         write_servicescfg_conf "$mods" "$init"
-        write_bootloader_conf "$mods"
+        write_postcfg_conf "$mods" "$init"
+        local name="$init"cfg
+        sed -e "s|openrccfg|$name|" -i "$1"/etc/calamares/settings.conf
         info "Done configuring [Calamares]"
     fi
 }

lib/util-iso.sh

@@ -213,7 +213,10 @@ clean_up_image(){
     local path mnt="$1"
     msg2 "Cleaning [%s]" "${mnt##*/}"
 
-    default_locale "reset" "$mnt"
+    if [[ -f "$mnt/etc/locale.gen.orig" ]];then
+        mv "$mnt/etc/locale.gen.orig" "$mnt/etc/locale.gen"
+        rm "$mnt/etc/locale.conf"
+    fi
     path=$mnt/boot
     if [[ -d "$path" ]]; then
         find "$path" -name 'initramfs*.img' -delete &> /dev/null
@@ -288,7 +291,7 @@ make_sfs() {
         error "The path %s does not exist" "${src}"
         retrun 1
     fi
-    local timer=$(get_timer) dest=${iso_root}/${iso_name}/${target_arch}
+    local timer=$(get_timer) dest=${iso_root}/artix/${target_arch}
     local name=${1##*/}
     local sfs="${dest}/${name}.sfs"
     mkdir -p ${dest}
@@ -401,8 +404,7 @@ make_iso() {
 }
 
 gen_iso_fn(){
-    local vars=() name
-    vars+=("${iso_name}")
+    local vars=("artix") name
     vars+=("${profile}")
     [[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
     vars+=("${iso_version}")
@@ -522,7 +524,7 @@ make_grub(){
 
         prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
 
-        configure_grub "${iso_root}/boot/grub/kernels.cfg"
+        configure_grub "${iso_root}"
 
         : > ${work_dir}/grub.lock
         msg "Done [/iso/boot/grub]"
@@ -538,14 +540,14 @@ compress_images(){
 
 prepare_images(){
     local timer=$(get_timer)
-    load_pkgs "${root_list}" "${initsys}" "${kernel}"
+    load_pkgs "${root_list}" "${initsys}"
     run_safe "make_rootfs"
     if [[ -f "${desktop_list}" ]] ; then
-        load_pkgs "${desktop_list}" "${initsys}" "${kernel}"
+        load_pkgs "${desktop_list}" "${initsys}"
         run_safe "make_desktopfs"
     fi
     if [[ -f ${live_list} ]]; then
-        load_pkgs "${live_list}" "${initsys}" "${kernel}"
+        load_pkgs "${live_list}" "${initsys}"
         run_safe "make_livefs"
     fi
     run_safe "make_bootfs"

lib/util-mount.sh

@@ -45,44 +45,100 @@ chroot_part_mount() {
 }
 
 select_os(){
-        local os_list=( $(detect) ) count=${#os_list[@]}
+    local os_list=( $(detect) ) count=${#os_list[@]}
     if [[ ${count} > 1 ]];then
-                msg "Detected systems:"
-                local i=0
-                for os in ${os_list[@]};do
+        msg "Detected systems:"
+        local i=0
+        for os in ${os_list[@]};do
             local last=${os##*:}
             case $last in
                 'efi') count=$((count-1)) ;;
                 *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
             esac
-                done
-                i=0
+        done
+        i=0
         msg "Select system to mount [0-%s] : " "$((count-1))"
-                read select
-        else
+        read select
+    else
         select=0
     fi
     local os_str=${os_list[$select]} type
     type=$os_str
     root=${os_str%%:*}
     type=${type##*:}
-        if [[ "${type##*:}" == 'linux' ]];then
+    if [[ "${type##*:}" == 'linux' ]];then
         msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
-        chroot_mount_partitions "$1" "$root"
-        else
-                die "You can't mount %s!" "$select"
-        fi
+        mount_os "$1" "$root"
+    else
+        die "You can't mount %s!" "$select"
+    fi
 }
 
-chroot_mount_partitions(){
+trap_setup(){
+    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
+    trap "$1" EXIT
+}
 
+chroot_mount() {
+    info "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
+}
+
+chroot_add_resolv_conf() {
+    local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
+
+    [[ -e /etc/resolv.conf ]] || return 0
+
+    # Handle resolv.conf as a symlink to somewhere else.
+    if [[ -L $chrootdir/etc/resolv.conf ]]; then
+        # readlink(1) should always give us *something* since we know at this point
+        # it's a symlink. For simplicity, ignore the case of nested symlinks.
+        resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
+        if [[ $resolv_conf = /* ]]; then
+            resolv_conf=$chrootdir$resolv_conf
+        else
+            resolv_conf=$chrootdir/etc/$resolv_conf
+        fi
+
+        # ensure file exists to bind mount over
+        if [[ ! -f $resolv_conf ]]; then
+            install -Dm644 /dev/null "$resolv_conf" || return 1
+        fi
+    elif [[ ! -e $chrootdir/etc/resolv.conf ]]; then
+        # The chroot might not have a resolv.conf.
+        return 0
+    fi
+
+    chroot_mount /etc/resolv.conf "$resolv_conf" --bind
+}
+
+chroot_mount_conditional() {
+    local cond=$1; shift
+    if eval "$cond"; then
+        chroot_mount "$@"
+    fi
+}
+
+chroot_setup(){
+    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
+    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
+    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
+    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
+        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
+    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
+    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
+    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
+    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
+    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+}
+
+mount_os(){
     CHROOT_ACTIVE_PART_MOUNTS=()
     CHROOT_ACTIVE_MOUNTS=()
 
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'trap_handler' EXIT
+    trap_setup chroot_part_umount
 
-    chroot_part_mount $2 $1
+    chroot_part_mount "$2" "$1"
 
     local mounts=$(parse_fstab "$1")
 
@@ -105,82 +161,26 @@ chroot_mount_partitions(){
         ;;
     esac
 
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
-    chroot_mount /etc/resolv.conf "$1/etc/resolv.conf" --bind
-}
-
-chroot_mount() {
-    #info "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
-}
-
-chroot_mount_conditional() {
-    local cond=$1; shift
-    if eval "$cond"; then
-        chroot_mount "$@"
-    fi
-}
-
-chroot_api_efi_mount() {
-    CHROOT_ACTIVE_MOUNTS=()
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'chroot_api_efi_umount' EXIT
-
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+    chroot_setup "$1"
+    chroot_add_resolv_conf "$1"
 }
 
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'chroot_api_umount' EXIT
-
-    chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
-    chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
+    trap_setup chroot_api_umount
+    chroot_setup "$1"
 }
 
 chroot_part_umount() {
+    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
     info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
     umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS
+    unset CHROOT_ACTIVE_PART_MOUNTS CHROOT_ACTIVE_MOUNTS
 }
 
 chroot_api_umount() {
-    #info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
     umount "${CHROOT_ACTIVE_MOUNTS[@]}"
     unset CHROOT_ACTIVE_MOUNTS
 }
-
-chroot_api_efi_umount() {
-    #info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_MOUNTS
-}
-
-trap_handler(){
-    chroot_api_umount
-    chroot_part_umount
-}

lib/util-pkg-gitea.sh

@@ -0,0 +1,59 @@
+#!/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.
+
+get_compliant_name(){
+    local gitname="$1"
+    case $gitname in
+        *+) gitname=${gitname//+/plus}
+    esac
+    echo $gitname
+}
+
+
+create_repo(){
+    local pkg="$1"
+    local gitname=$(get_compliant_name "$pkg")
+    curl -X POST "${git_url}/api/v1/org/packages/repos?access_token=${git_token}" -H "accept: application/json" -H "content-type: application/json" -d "{ \"auto_init\": true, \"name\":\"$gitname\", \"readme\": \"Default\" }"
+}
+
+delete_repo(){
+    local pkg="$1"
+    local gitname=$(get_compliant_name "$pkg")
+    curl -X DELETE "${git_url}/api/v1/repos/packages/$gitname?access_token=${git_token}" -H  "accept: application/json"
+}
+
+find_team(){
+    local pkg="$1" team_id=
+
+    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
+        team_id=18
+    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
+        team_id=18
+    elif [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
+        team_id=19
+    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
+        team_id=19
+    elif [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
+        team_id=20
+    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
+        team_id=20
+    elif [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
+        team_id=21
+    fi
+    echo $team_id
+}
+
+add_repo_to_team(){
+    local pkg="$1" path="$2"
+    local id=$(find_team "$path")
+
+    curl -X PUT "${git_url}/api/v1/teams/$id/repos/packages/$pkg?access_token=${git_token}" -H  "accept: application/json"
+}

lib/util-pkg-subrepo.sh

@@ -0,0 +1,30 @@
+#!/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.
+
+subrepo_init(){
+    local pkg="$1"
+    git subrepo init $pkg -r gitea@${git_domain}:packages/$pkg.git -b master
+}
+
+subrepo_push(){
+    local pkg="$1"
+    git subrepo push -u "$pkg" -b master
+}
+
+subrepo_pull(){
+    local pkg="$1" name="${2:-$1}"
+    git subrepo pull "$pkg" -b master -r gitea@${git_domain}:packages/$name.git -u
+}
+
+subrepo_clone(){
+    local pkg="$1" name="${2:-$1}"
+    git subrepo clone gitea@gitea.artixlinux.org:packages/$pkg.git "$name" -b master
+}

lib/util-pkg.sh

@@ -45,8 +45,8 @@ patch_pkg(){
         ;;
         'linux')
             sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
-            sed -e 's|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION="-ARTIX"|' \
-                -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+                -e 's|CONFIG_CRYPTO_SPECK=.*|CONFIG_CRYPTO_SPECK=n|' \
                 -i $pkg/trunk/config
             cd $pkg/trunk
                 updpkgsums
@@ -76,6 +76,14 @@ patch_pkg(){
     esac
 }
 
+write_jenkinsfile(){
+    local pkg="$1" jenkins=Jenkinsfile
+    echo '@Library(["PackagePipeline", "BuildPkg", "DeployPkg", "Notify", "PostBuild", "RepoPackage"]) import org.artixlinux.RepoPackage' > $pkg/$jenkins
+    echo '' >> $pkg/$jenkins
+    echo 'PackagePipeline(new RepoPackage(this))' >> $pkg/$jenkins
+    echo '' >> $pkg/$jenkins
+}
+
 find_tree(){
     local tree="$1" pkg="$2"
     local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
@@ -124,7 +132,7 @@ is_valid_repo(){
 }
 
 find_repo(){
-    local pkg="$1" incl="$2" repo=
+    local pkg="$1" unst="$2" stag="$3" repo=
 
     if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
         repo=core-x86_64
@@ -144,10 +152,12 @@ find_repo(){
         repo=testing-any
     fi
 
-    if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
-        repo=staging-x86_64
-    elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
-        repo=staging-any
+    if $stag;then
+        if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
+            repo=staging-x86_64
+        elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
+            repo=staging-any
+        fi
     fi
 
     if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
@@ -162,10 +172,12 @@ find_repo(){
         repo=community-testing-any
     fi
 
-    if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
-        repo=community-staging-x86_64
-    elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
-        repo=community-staging-any
+    if $stag;then
+        if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
+            repo=community-staging-x86_64
+        elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
+            repo=community-staging-any
+        fi
     fi
 
     if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
@@ -176,11 +188,13 @@ find_repo(){
         repo=multilib-testing-x86_64
     fi
 
-    if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
-        repo=multilib-staging-x86_64
+    if $stag;then
+        if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
+            repo=multilib-staging-x86_64
+        fi
     fi
 
-    if $incl;then
+    if $unst;then
         if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
             repo=gnome-unstable-x86_64
         elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then

lib/util.sh

@@ -47,11 +47,6 @@ get_osname(){
     echo "${NAME}"
 }
 
-get_osid(){
-    source /usr/lib/os-release
-    echo "${ID}"
-}
-
 init_artools_base(){
 
     target_arch=$(uname -m)
@@ -65,9 +60,15 @@ init_artools_base(){
 
 init_artools_pkg(){
 
+    git_domain='gitea.artixlinux.org'
+
+    git_url="https://${git_domain}"
+
+    [[ -z ${git_token} ]] && git_token=''
+
     [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
 
-    [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
+    [[ -z ${host_tree_artix} ]] && host_tree_artix="gitea@gitea.artixlinux.org:artix"
 
     [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
 
@@ -89,16 +90,10 @@ init_artools_iso(){
 
     [[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
 
-    iso_name=$(get_osid)
-
     iso_label="ARTIX_$(date +%Y%m)"
 
     [[ -z ${initsys} ]] && initsys="openrc"
 
-    [[ -z ${kernel} ]] && kernel="linux"
-
-    [[ -z ${kernel_args} ]] && kernel_args=""
-
     [[ -z ${gpgkey} ]] && gpgkey=''
 
     [[ -z ${uplimit} ]] && uplimit=100