Update

.gitignore

@@ -1,11 +1,15 @@
 /boot/fd/*
 /boot/iso/*
 /boot/qcow2/*
-/boot/txt/*
+/Melawy-Linux-Full/.vscode
-/boot/shell_scripts
+/Melawy-Linux-Full/airootfs/opt/extra-drivers/*.pkg.tar.*
-/make_iso/.vscode
+/Melawy-Linux-Full/airootfs/root/packages/*.pkg.tar.*
-/make_iso/airootfs/opt/extra-drivers/*.pkg.tar.*
+/Melawy-Linux-Full/airootfs/usr/share/packages/*.pkg.tar.*
-/make_iso/airootfs/root/packages/*.pkg.tar.*
+/Melawy-Linux-NetInstall/airootfs/opt/extra-drivers/*.pkg.tar.*
-/make_iso/airootfs/usr/share/packages/*.pkg.tar.*
+/Melawy-Linux-NetInstall/airootfs/root/packages/*.pkg.tar.*
+/Melawy-Linux-NetInstall/airootfs/usr/share/packages/*.pkg.tar.*
+/Melawy-Linux-Tiny/airootfs/opt/extra-drivers/*.pkg.tar.*
+/Melawy-Linux-Tiny/airootfs/root/packages/*.pkg.tar.*
+/Melawy-Linux-Tiny/airootfs/usr/share/packages/*.pkg.tar.*
 /sf/*
-/work/*
+/work_*

Melawy-Linux-Full/00_mkdirs.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
+edition="$(basename $(pwd))"
 mkdir -pv ../boot/{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
 # mkdir -pv ../make_iso 2>/dev/null
 mkdir -pv ../sf 2>/dev/null
-mkdir -pv ../work 2>/dev/null
+mkdir -pv ../work_${edition} 2>/dev/null
 
 echo "Ready"

Melawy-Linux-Full/00_reset_light.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
 
-sudo rm -rfv ../work
+edition="$(basename $(pwd))"
+sudo rm -rfv ../work_${edition}
 status="$?"
 
-mkdir ../work
+mkdir ../work_${edition}
 
 notify-send -a "$(basename $(pwd)): Reset" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 

Melawy-Linux-Full/00_reset_with_packages.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
-sudo rm -rfv ../work
+edition="$(basename $(pwd))"
+sudo rm -rfv ../work_${edition}
 status="$?"
 rm -v airootfs/opt/extra-drivers/*.pkg.tar.*
 status=$(( $status + "$?" ))
@@ -9,7 +10,7 @@ status=$(( $status + "$?" ))
 rm -v airootfs/usr/share/packages/*.pkg.tar.*
 status=$(( $status + "$?" ))
 
-mkdir ../work
+mkdir ../work_${edition}
 
 notify-send -a "$(basename $(pwd)): Reset" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 

Melawy-Linux-Full/02_prepare.sh

@@ -4,7 +4,7 @@ cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/"
 
 sudo pacman -Sy --config pacman_sys.conf
 
-sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168
+sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168-dkms
 
 # sudo mv -vf "./airootfs/opt/extra-drivers/linux"* "./airootfs/usr/share/packages/"
 sudo rm -vf "./airootfs/opt/extra-drivers/linux"*

Melawy-Linux-Full/04_make.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+edition="$(basename $(pwd))"
+date_tag=$(date +%Y.%m.%d)
+std_iso_name="Melawy-Linux-${date_tag}-x86_64"
+iso_name="${edition}-${date_tag}-x86_64"
+iso_dir="${edition}-${date_tag}"
+
+mkdir -p "../sf/${iso_dir}"
+sudo ./mkarchiso_last_my -v "."
+
+if [ "$?" -eq 0 ]; then
+    cp -vf      "../work_${edition}/iso/arch/pkglist.x86_64.txt"                     "../sf/${iso_dir}/${iso_name}-pkglist.txt"
+
+    mv "../sf/${iso_dir}/${std_iso_name}.iso" "../sf/${iso_dir}/${iso_name}.iso"
+
+    echo "Sign ../sf/${iso_dir}/${iso_name}.iso.sig ../sf/${iso_dir}/${iso_name}.iso"
+    if [ -f "../sf/${iso_dir}/${iso_name}.iso.sig" ]; then rm "../sf/${iso_dir}/${iso_name}.iso.sig"; fi
+    gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${iso_dir}/${iso_name}.iso.sig" "../sf/${iso_dir}/${iso_name}.iso"
+
+
+    cd "../sf/${iso_dir}"
+
+    echo "md5sum ${iso_name}.iso"
+    md5sum     "${iso_name}.iso"                                                      > "${iso_name}.iso.md5"
+
+    echo "sha1sum ${iso_name}.iso"
+    sha1sum     "${iso_name}.iso"                                                      > "${iso_name}.iso.sha1"
+
+    echo "sha256sum ${iso_name}.iso"
+    sha256sum   "${iso_name}.iso"                                                      > "${iso_name}.iso.sha256"
+
+    cd ".."
+
+    mktorrent --verbose --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" --output="${iso_dir}/${iso_name}.torrent" "${iso_dir}"
+
+    notify-send -a "$(basename $(pwd)): Sign" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
+
+    echo "Ready"
+    if [ "$status" == 0 ]; then
+        sleep 5
+        kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
+    fi
+fi

Melawy-Linux-Full/05_sign.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+edition="$(basename $(pwd))"
+date_tag="$(date +%Y.%m.%d)"
+
+iso_name="${edition}-${date_tag}-x86_64"
+iso_dir="${edition}-${date_tag}"
+
+
+
+
+
+cp -vf      "../work_${edition}/iso/arch/pkglist.x86_64.txt"                     "../sf/${iso_dir}/${iso_name}-pkglist.txt"
+
+
+
+echo "Sign ../sf/${iso_dir}/${iso_name}.iso.sig ../sf/${iso_dir}/${iso_name}.iso"
+if [ -f "../sf/${iso_dir}/${iso_name}.iso.sig" ]; then rm "../sf/${iso_dir}/${iso_name}.iso.sig"; fi
+gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${iso_dir}/${iso_name}.iso.sig" "../sf/${iso_dir}/${iso_name}.iso"
+
+
+cd "../sf/${iso_dir}"
+
+echo "md5sum ${iso_name}.iso"
+md5sum     "${iso_name}.iso"                                                      > "${iso_name}.iso.md5"
+
+echo "sha1sum ${iso_name}.iso"
+sha1sum     "${iso_name}.iso"                                                      > "${iso_name}.iso.sha1"
+
+echo "sha256sum ${iso_name}.iso"
+sha256sum   "${iso_name}.iso"                                                      > "${iso_name}.iso.sha256"
+
+cd ".."
+
+mktorrent --verbose --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" --output="${iso_dir}/${iso_name}.torrent" "${iso_dir}"
+
+notify-send -a "$(basename $(pwd)): Sign" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
+
+echo "Ready"
+if [ "$status" == 0 ]; then
+    sleep 5
+    kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
+fi

Melawy-Linux-Full/airootfs/etc/pacman-cache.conf

@@ -102,6 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
 
 [cache]
 SigLevel = Optional
+Server = http://10.120.152.1/$repo/$arch
 Server = http://192.168.1.250/$repo/$arch
 Server = https://repo.melawy.ru/$repo/$arch
 

Melawy-Linux-Full/airootfs/etc/pacman-std.conf

@@ -102,6 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
 
 # [cache]
 # SigLevel = Optional
+# Server = http://10.120.152.1/$repo/$arch
 # Server = http://192.168.1.250/$repo/$arch
 # Server = https://repo.melawy.ru/$repo/$arch
 

Melawy-Linux-Full/airootfs/etc/pacman.conf

@@ -102,6 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
 
 # [cache]
 # SigLevel = Optional
+# Server = http://10.120.152.1/$repo/$arch
 # Server = http://192.168.1.250/$repo/$arch
 # Server = https://repo.melawy.ru/$repo/$arch
 

Melawy-Linux-Full/airootfs/etc/pacman.d/gnupg/gpg.conf

@@ -9,5 +9,3 @@ keyserver hkp://keyserver.ubuntu.com:80
 #keyserver hkp://pool.sks-keyservers.net:80
 #keyserver hkps://hkps.pool.sks-keyservers.net:443
 #keyserver hkp://ipv4.pool.sks-keyservers.net:11371
-
-

Melawy-Linux-Full/airootfs/etc/pacman.d/mirrorlist

@@ -0,0 +1,30 @@
+################################################################################
+################# Arch Linux mirrorlist generated by Reflector #################
+################################################################################
+
+# With:       reflector @/etc/xdg/reflector/reflector.conf
+# When:       2023-12-19 05:14:30 UTC
+# From:       https://archlinux.org/mirrors/status/json/
+# Retrieved:  2023-12-19 05:13:06 UTC
+# Last Check: 2023-12-19 05:01:52 UTC
+
+Server = http://archlinux.thaller.ws/$repo/os/$arch
+Server = https://archlinux.thaller.ws/$repo/os/$arch
+Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
+Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
+Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
+Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
+Server = https://de.arch.mirror.kescher.at/$repo/os/$arch
+Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch
+Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+Server = http://arch.sakamoto.pl/$repo/os/$arch
+Server = https://arch.sakamoto.pl/$repo/os/$arch
+Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
+Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
+Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
+Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch