buildtree: add -y arg to exclude staging from compare ops

bin/buildtree.in

@@ -40,6 +40,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,13 +61,13 @@ 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)
@@ -195,6 +201,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 +223,7 @@ sync=false
 sync_arch=true
 compare=false
 unstable=false
+staging=true
 upgrades=false
 downgrades=false
 artix=false
@@ -231,10 +240,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 +257,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:csudaiztxvqh'
+opts='p:csudayiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -258,6 +268,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

@@ -94,7 +94,7 @@ copy_hostconf () {
 
 chroot_extra_mount() {
     chroot_add_resolv_conf "$1"
-#     chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+    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 "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 

bin/mkchrootpkg.in

@@ -204,11 +204,11 @@ _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

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
 }

lib/util-pkg.sh

@@ -125,7 +125,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
@@ -145,11 +145,13 @@ find_repo(){
         repo=testing-any
     fi
 
+    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
         repo=community-x86_64
@@ -163,11 +165,13 @@ find_repo(){
         repo=community-testing-any
     fi
 
+    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
         repo=multilib-x86_64
@@ -177,11 +181,13 @@ find_repo(){
         repo=multilib-testing-x86_64
     fi
 
+    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