update tree names

Reviewed-on: #57
Co-authored-by: artoo <artoo@artixlinux.org>
Co-committed-by: artoo <artoo@artixlinux.org>

bin/iso/buildiso.in

@@ -221,6 +221,8 @@ display_settings(){
 
     msg "ISO SETTINGS:"
     msg2 "ISO_VERSION: %s" "${ISO_VERSION}"
+    msg2 "COMPRESSION: %s" "${COMPRESSION}"
+    [[ "${COMPRESSION}" == 'zstd' ]] && msg2 "COMPRESSION_LEVEL: %s" "${COMPRESSION_LEVEL}"
 
     msg "BUILD:"
     show_profile
@@ -332,7 +334,7 @@ usage() {
     echo '    -i <name>          Init system to use'
     echo "                       [default: ${INITSYS}]"
     echo '    -g <key>           The gpg key for img signing'
-    echo "                       [default: ${GPG_KEY}]"
+    echo "                       [default: none]"
     echo '    -m                 Set SquashFS image mode to persistence'
     echo '    -c                 Disable clean work dir'
     echo '    -x                 Build chroot only'

bin/pkg/buildtree.in

@@ -117,6 +117,7 @@ patch_pkg(){
     local pkgpath="$1"
     local pkg=${pkgpath%/*}
     pkg=${pkg##*/}
+    sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
     case $pkg in
         glibc)
             msg2 "Patching %s" "$pkg"

bin/pkg/commitpkg.in

@@ -86,14 +86,12 @@ check_rebuild(){
 }
 
 check_team(){
-    if [[ "${repo_src}" == "${valid_names[0]}" \
-        && "${repo_dest}" == "${valid_names[1]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[1]}" \
-        && "${repo_dest}" == "${valid_names[0]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[1]}" \
-        && "${repo_dest}" == "${valid_names[2]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[2]}" \
-        && "${repo_dest}" == "${valid_names[1]}" ]] ;then
+    if [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[0]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
+        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[0]}" ]]; then
 
         local org gitname
         org=$(get_pkg_org "${package}")

data/conf/artools-iso.conf

@@ -13,3 +13,9 @@
 
 # gpg key; leave empty or commented to skip img signing
 # GPG_KEY=""
+
+# possible values: zstd (default), xz
+# COMPRESSION="zstd"
+
+# zstd only: range 1..22
+# COMPRESSION_LEVEL=15

data/conf/artools-pkg.conf

@@ -10,11 +10,11 @@
 # customize buildtree; uncomment to include
 # TREE_NAMES_ARTIX=(
 #         packages-kernel
+#         packages-llvm
 #         packages-openrc
 #         packages-runit
 #         packages-s6
 #         packages-suite66
-#         python-world
 #         packages-perl
 #         packages-java
 #         packages-ruby
@@ -28,12 +28,13 @@
 #         packages-xfce
 #         packages-wm
 #         packages-devel
-#         packages-lib32
 #         packages-qt6
 #         packages-office
 #         packages-misc
-#         packages-python
+#         python-world
 #         python-galaxy
+#         packages-python
+#         packages-lib32
 # )
 
 # TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux

lib/iso/initcpio.sh

@@ -5,13 +5,17 @@
 make_checksum(){
     local file="$1"
     msg2 "Creating md5sum ..."
+    cd "${iso_root}${live_dir}"
     md5sum "$file" > "$file".md5
+    cd "${OLDPWD}"
 }
 
 make_sig () {
     local file="$1"
     msg2 "Creating signature file..."
+    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
     su "${owner}" -c "gpg --detach-sign --output $file.sig --default-key ${GPG_KEY} $file"
+    chown "root:root" "${iso_root}${live_dir}"
 }
 
 export_gpg_publickey() {

lib/iso/squash.sh

@@ -67,16 +67,14 @@ make_sfs() {
 
         mksfs_args+=("${sfs_out}")
 
-        mksfs_args+=(-comp zstd -noappend)
+        mksfs_args+=(-comp "${COMPRESSION}" "${COMPRESSION_ARGS[@]}" -noappend)
 
         mksquashfs "${mksfs_args[@]}"
 
         if ! ${use_dracut}; then
-            make_checksum "${iso_root}${live_dir}/${img_name}"
+            make_checksum "${img_name}"
             if [[ -n ${GPG_KEY} ]];then
-                chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
                 make_sig "${iso_root}${live_dir}/${img_name}"
-                chown "root:root" "${iso_root}${live_dir}"
             fi
         fi
         if ${persist}; then

lib/pkg/table.sh

@@ -5,32 +5,31 @@
 msg_table_header(){
     local mesg=$1; shift
     # shellcheck disable=2059
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@"
 }
 
 msg_row_yellow(){
     local mesg=$1; shift
     # shellcheck disable=2059
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@"
 }
 
 msg_row_green(){
     local mesg=$1; shift
     # shellcheck disable=2059
-    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@"
 }
 
 msg_row(){
     local mesg=$1; shift
-#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
     # shellcheck disable=2059
-    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@"
 }
 
 msg_row_red(){
     local mesg=$1; shift
     # shellcheck disable=2059
-    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@"
 }
 
 #}}}

lib/util-iso.sh

@@ -19,6 +19,18 @@ load_iso_config(){
 
     GPG_KEY=${GPG_KEY:-''}
 
+    COMPRESSION="${COMPRESSION:-zstd}"
+
+    COMPRESSION_LEVEL="${COMPRESSION_LEVEL:-15}"
+
+    if [[ -z "${COMPRESSION_ARGS[*]}" ]]; then
+        COMPRESSION_ARGS=(-Xcompression-level "${COMPRESSION_LEVEL}")
+    fi
+
+    if [[ "${COMPRESSION}" == 'xz' ]]; then
+        COMPRESSION_ARGS=(-Xbcj x86)
+    fi
+
     return 0
 }
 

lib/util-pkg.sh

@@ -27,7 +27,7 @@ load_pkg_config(){
     )
 
     local dev_tree=(
-        packages-{python,perl,java,ruby}
+        packages-{llvm,python,perl,java,ruby}
         python-{world,galaxy}
     )