update readme

Makefile

@@ -22,17 +22,6 @@ M4 = m4 -P
 CHMODAW = chmod a-w
 CHMODX = chmod +x
 
-ifdef WITH-PKG
-WITH-PKG = no
-else
-WITH-PKG = yes
-endif
-ifdef WITH-ISO
-WITH-ISO = no
-else
-WITH-ISO = yes
-endif
-
 CPIODIR = $(SYSCONFDIR)/initcpio
 
 SYSCONF = \
@@ -103,19 +92,7 @@ LIBS_ISO = \
 SHARED_ISO = \
 	data/mkinitcpio.conf
 
-ifeq ($(WITH-PKG),yes)
-
-all: $(BIN_PKG)
-
-endif
-
-ifeq ($(WITH-ISO),yes)
-
-all: $(BIN_ISO)
-
-endif
-
-all: $(BIN_BASE)
+all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
 
 EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
@@ -177,54 +154,6 @@ install_iso: install_cpio
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-uninstall_base:
-	for f in $(notdir $(SYSCONF)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(BIN_BASE)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for f in $(notdir $(LIBS_BASE)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(SHARED_BASE)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-	$(RMD) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	$(RMD) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	$(RMD) $(DESTDIR)$(DATADIR)/$(TOOLS)
+install: install_base install_pkg install_iso
 
-uninstall_pkg:
-	for f in $(notdir $(BIN_PKG)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	$(RM) $(DESTDIR)$(BINDIR)/find-libprovides
-	for l in $(COMMITPKG_SYMS); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
-	for f in $(notdir $(LIBS_PKG)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(PATCHES)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches/$$f; done
-	for f in $(notdir $(SHARED_PKG)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-
-uninstall_cpio:
-	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio uninstall
-
-uninstall_iso: uninstall_cpio
-	for f in $(notdir $(BIN_ISO)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for l in $(notdir $(BIN_ISO_SYMS)); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
-	for f in $(notdir $(LIBS_ISO)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(SHARED_ISO)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-
-ifeq ($(WITH-PKG),yes)
-
-install: install_pkg
-
-uninstall: uninstall_pkg
-
-endif
-
-ifeq ($(WITH-ISO),yes)
-
-install: install_iso
-
-uninstall: uninstall_iso
-
-endif
-
-install: install_base
-
-uninstall: uninstall_base
-
-dist:
-	git archive --format=tar --prefix=$(TOOLS)-$(VERSION)/ $(VERSION) | gzip -9 > $(TOOLS)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent $(TOOLS)-$(VERSION).tar.gz
-
-.PHONY: all clean install uninstall dist
+.PHONY: all clean install

README.md

@@ -6,9 +6,6 @@ artools
 
 * PREFIX=/usr/local (default if defined)
 * SYSCONFDIR=/etc
-* WITH-PKG=yes
-* WITH-ISO=yes
-
 
 #### Dependencies
 
@@ -21,7 +18,6 @@ artools
 ##### Runtime:
 
 - base:
-
   * openssh
   * rsync
   * haveged
@@ -30,9 +26,8 @@ artools
   * pacman
 
 - pkg:
-
   * namcap
-  * git
+  * git-subrepo
 
 - iso:
   * dosfstools

bin/buildtree.in

@@ -26,8 +26,8 @@ pull_tree_arch(){
     for tree in packages community;do
         if [[ -d ${tree} ]];then
             cd ${tree}
-                msg "Checking (%s)" "${tree}"
-                pull_tree
+            msg "Checking (%s)" "${tree}"
+            pull_tree
             cd ..
         else
             msg "Cloning (%s) ..." "$tree"
@@ -36,24 +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
+            config_tree "${tree}"
             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
+            msg "Checking (%s)" "${tree}"
+            pull_tree
             cd ..
         else
             msg "Cloning (%s) ..." "$tree"
             clone_tree "${host_tree_artix}/${tree}"
+            config_tree "${tree}"
         fi
     done
 }
@@ -165,6 +173,7 @@ from_arch(){
         dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
 
         create_repo "$pkg"
+        add_repo_to_team "$pkg" "$pkg_path"
         subrepo_clone "$pkg"
 
         info "Import from archlinux (%s)" "$git_tree_arch"

bin/commitpkg.in

@@ -59,6 +59,7 @@ commit_pkg(){
             sleep 1
             git push origin master
         fi
+        git prune
     else
         error "Package '%s' does not exist!" "${package}"
     fi
@@ -108,6 +109,7 @@ symlink_commit_pkg(){
             sleep 1
             git push origin master
         fi
+        git prune
     else
         error "Package '%s' does not exist!" "${package}"
     fi

lib/util-iso-grub.sh

@@ -20,6 +20,11 @@ prepare_initcpio(){
 prepare_initramfs(){
     local mnt="$1"
     cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
+
+    if [[ "${profile}" != 'base' ]];then
+        sed -e 's/artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs //' -i $mnt/etc/mkinitcpio-artix.conf
+    fi
+
     if [[ -n ${gpgkey} ]]; then
         user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
         exec 17<>${AT_USERCONFDIR}/gpgkey
@@ -40,8 +45,12 @@ prepare_initramfs(){
 
 prepare_boot_extras(){
     local src="$1" dest="$2"
-#     cp $src/boot/intel-ucode.img $dest/intel_ucode.img
-#     cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
+
+#     for u in intel amd;do
+#         cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+#         cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+#     done
+
     cp $src/boot/memtest86+/memtest.bin $dest/memtest
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
@@ -83,8 +92,13 @@ prepare_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
+    if [[ -f /usr/share/grub/unicode.pf2 ]];then
+        msg2 "Copying %s ..." "unicode.pf2"
+        cp /usr/share/grub/unicode.pf2 ${grub}/unicode.pf2
+    else
+        msg2 "Creating %s ..." "unicode.pf2"
+        grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+    fi
 
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"

lib/util-iso-yaml.sh

@@ -30,22 +30,34 @@ write_users_conf(){
 
 write_servicescfg_conf(){
     local init="$2"
-    local conf="$1"/"$init"cfg.conf state='add'
+    local conf="$1"/services-"$init".conf
     msg2 "Writing %s ..." "${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
+    case "$init" in
+        'runit')
+            echo 'svDir: /etc/runit/sv' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runsvDir: /etc/runit/runsvdir' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            echo "    enabled:" >> "$conf"
+            for svc in ${services[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+        'openrc')
+            echo 'initdDir: /etc/init.d' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runlevelsDir: /etc/runlevels' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            for svc in ${services[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+    esac
 }
 
 write_postcfg_conf(){
@@ -66,8 +78,8 @@ configure_calamares(){
         write_users_conf "$mods"
         write_servicescfg_conf "$mods" "$init"
         write_postcfg_conf "$mods" "$init"
-        local name="$init"cfg
-        sed -e "s|openrccfg|$name|" -i "$1"/etc/calamares/settings.conf
+        local name=services-"$init"
+        sed -e "s|services-openrc|$name|" -i "$1"/etc/calamares/settings.conf
         info "Done configuring [Calamares]"
     fi
 }

lib/util-pkg-gitea.sh

@@ -1,24 +1,59 @@
- #!/bin/bash
+#!/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"
-    curl -X POST "${git_url}/api/v1/org/packages/repos?access_token=${git_token}" -H "accept: application/json" -H "content-type: application/json" -d "{\"name\":\"$pkg\"}"
+    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"
-    curl -X DELETE "${git_url}/api/v1/repos/packages/$pkg?access_token=${git_token}" -H  "accept: application/json"
+    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" repo="$2"
-    local id=0
-    case $repo in
-        core) id=18 ;;
-        extra) id=19 ;;
-        community) id=20 ;;
-        multilib) id=21 ;;
-    esac
+    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.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