Merge pull request #17 from artix-linux/devel

Devel-0.4.1

bin/buildpkg.in

@@ -51,6 +51,7 @@ display_settings(){
     msg2 "purge: %s" "${purge}"
     msg2 "namcap: %s" "${namcap}"
     msg2 "sign: %s" "${sign}"
+    msg2 "repo_add: %s" "${repo_add}"
 
     msg "PATHS:"
     msg2 "pkg_dir: %s" "${pkg_dir}"
@@ -80,11 +81,13 @@ pretend=false
 is_build_list=false
 sign=false
 is_multilib=false
+repo_add=false
 
 mkchroot_args=()
 mkchrootpkg_args=()
 
 install_pkgs=()
+repository=${PWD##*/}
 
 prepare_build(){
     local pac_arch='default'
@@ -126,11 +129,13 @@ usage() {
     echo '    -r <dir>           Chroots directory'
     echo "                       [default: ${chroots_pkg}]"
     echo '    -i <pkgs>          Install packages into the working copy of the chroot'
+    echo "    -z <repo>          The repo name to add the package(s)  [default: ${repository}]"
     echo '    -o                 Create chroot'
     echo '    -d                 Delete chroot'
     echo '    -c                 Clean chroot copy'
     echo '    -u                 Update chroot copy'
     echo '    -w                 Clean up cache and sources'
+    echo '    -x                 Add the package(s) to the repo'
     echo '    -n                 Install and run namcap check'
     echo '    -s                 Sign packages'
     echo '    -q                 Query settings and pretend build'
@@ -142,7 +147,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:i:odcuwnsqh'
+opts='p:a:r:i:z:odcuwnsxqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -150,11 +155,13 @@ while getopts "${opts}" arg; do
         a) target_arch="$OPTARG" ;;
         r) chroots_pkg="$OPTARG" ;;
         i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "${install_pkgs[*]}") ;;
+        z) repository="$OPTARG" ;;
         o) create_first=true ;;
         d) delete_first=true ;;
         c) clean_first=true ; mkchrootpkg_args+=(-c) ;;
         u) update_first=true ; mkchrootpkg_args+=(-u) ;;
         w) purge=true ;;
+        x) repo_add=true ;;
         n) namcap=true; mkchrootpkg_args+=(-n) ;;
         s) sign=true ;;
         q) pretend=true ;;

bin/deploypkg.in

@@ -109,8 +109,8 @@ prepare_dir "${repos_local}"
 
 ${pretend} && display_settings #&& exit 1
 
-${add_pkg} && repo_add_pkg "${repository}" "${target_arch}" "${package}"
-${del_pkg} && repo_del_pkg "${repository}" "${target_arch}" "${package}"
+${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add"
+${del_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "remove"
 
 ${download} && repo_download "${repository}"
 ${upload} && repo_upload "${repository}"

bin/testiso.in

@@ -1,39 +0,0 @@
-#!/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@
-
-if [ $# -eq 0 ]; then
-    echo "
-    usage: testiso <isofile> [id|ic|sd|sc|vd|vc]
-
-    id    boot iso as IDE disk
-    ic    boot iso as IDE cd-rom
-    sd    boot iso as SCSI disk
-    sc    boot iso as SCSI cd-rom
-    vd    boot iso as virtio disk
-    vc    boot iso as virtio cd-rom
-    "
-    exit 1
-fi
-
-case "${2}" in
-    id) IF="ide"; MEDIA="disk";;
-    ic) IF="ide"; MEDIA="cdrom";;
-    sd) IF="scsi"; MEDIA="disk";;
-    sc) IF="scsi"; MEDIA="cdrom";;
-    vd) IF="virtio"; MEDIA="disk";;
-    vc) IF="virtio"; MEDIA="cdrom";;
-    *) IF="scsi"; MEDIA="cdrom";;
-esac
-
-echo qemu -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on
-qemu -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on

data/base-devel-udev

@@ -1,30 +0,0 @@
-autoconf
-automake
-binutils
-bison
-libeudev
-fakeroot
-file
-findutils
-flex
-gawk
-gcc
-gettext
-grep
-groff
-gzip
-libtool
-m4
-make
-pacman
-patch
-pkg-config
-sed
-sudo
-texinfo
-libutil-linux-nosystemd
-util-linux-nosystemd
-which
->multilib gcc-multilib
->multilib lib32-fakeroot
->multilib lib32-libltdl

data/import.list.d/world.list

@@ -0,0 +1,35 @@
+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

lib/util-pkg-chroot.sh

@@ -61,6 +61,7 @@ clean_up(){
 
 sign_pkg(){
     local pkg="$1"
+    [[ -f ${pkg_dir}/${pkg}.sig ]] && rm ${pkg_dir}/${pkg}.sig
     user_run "signfile ${pkg_dir}/${pkg}"
 }
 
@@ -87,6 +88,9 @@ post_build(){
         local ver=$(get_full_version "$pkg") src
         src=$pkg-$ver-$tarch.$ext
         move_to_cache "$src"
+        if ${repo_add};then
+            deploypkg -r "${repository}" -x -p "$src"
+        fi
     done
 }
 

lib/util-pkg-publish.sh

@@ -9,17 +9,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-repo_add_pkg(){
-    local repo="$1" arch="$2" pkg="$3"
-#     if [[ ! -f ${cache_dir_pkg}/$arch/$pkg{,.sig} ]];then
+repo_update(){
+    local repo="$1" arch="$2" pkg="$3" action="$4"
+    if [[ $action == "add" ]];then
+        if [[ -f ${repos_local}/$repo/os/$arch/$pkg \
+            && -f ${repos_local}/$repo/os/$arch/$pkg.sig ]];then
+            rm ${repos_local}/$repo/os/$arch/$pkg
+            rm ${repos_local}/$repo/os/$arch/$pkg.sig
+        fi
         ln -s ${cache_dir_pkg}/$arch/$pkg{,.sig} ${repos_local}/$repo/os/$arch/
-#     fi
-    repo-add -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz ${repos_local}/$repo/os/$arch/$pkg
-}
-
-repo_del_pkg(){
-    local repo="$1" arch="$2" pkg="$3"
-    repo-remove -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz $pkg
+    fi
+    repo-$action -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz ${repos_local}/$repo/os/$arch/$pkg
 }
 
 update_lock(){
@@ -29,7 +29,7 @@ update_lock(){
 
 is_locked(){
     local repo="$1" url="https://${host}/projects/${project}/files/repos"
-    if wget --spider -v $url/$repo/$repo.lock;then
+    if wget --spider -v $url/$repo/$repo.lock &>/dev/null;then
         return 0
     else
         return 1

lib/util-pkg-tree.sh

@@ -125,7 +125,9 @@ import_from_arch(){
                 rsync "${rsync_args[@]}" ${tree_dir_arch}/$arch_dir/$pkg/trunk/ ${tree_dir_artix}/$repo/$pkg/
                 if $(is_dirty); then
                     git add $pkg
-                    git commit -m "Archlinux $pkg-$(get_pkgver) import"
+                    cd $pkg
+                        git commit -m "Archlinux $pkg-$(get_pkgver) import"
+                    cd ..
                 fi
             done
         fi

lib/util-profile.sh

@@ -61,7 +61,7 @@ load_profile(){
 
     enable_live=('artix-live' 'pacman-init')
 
-    netgroups="https://raw.githubusercontent.com/artix-linux/iso-profiles/master/base/netgroups"
+    netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
 
     root_list=${run_dir}/base/Packages-Root
     [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"