buildtree: ch in proper dir in config

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.8
+VERSION=0.9
 
 CHROOT_VERSION=0.8
 

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}
@@ -34,18 +36,32 @@ pull_tree_arch(){
     done
 }
 
+config_tree(){
+    local tree="$1"
+    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
+    cd ..
+}
+
 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
+            config_tree
             msg "Checking (%s)" "${tree}"
             pull_tree
             cd ..
         else
             msg "Cloning (%s) ..." "$tree"
             clone_tree "${host_tree_artix}/${tree}"
+            config_tree "${tree}"
         fi
     done
 }
@@ -55,13 +71,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)
@@ -155,7 +171,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 +214,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 +236,7 @@ sync=false
 sync_arch=true
 compare=false
 unstable=false
+staging=true
 upgrades=false
 downgrades=false
 artix=false
@@ -231,10 +253,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 +270,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:csudaiztxvqh'
+opts='p:csudayiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -258,6 +281,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/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/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/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
 

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-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,7 @@ 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
@@ -77,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")
@@ -125,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
@@ -145,11 +152,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 +172,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 +188,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

lib/util.sh

@@ -60,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