From 28fbb5cd9d12f092f48f0757beba58d4dd6b0baf Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Thu, 2 Feb 2023 10:42:27 +0000
Subject: Add Packages list to mirror

---
 iso/mkiso.sh  |  9 +++++----
 src/mirror.sh | 12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/iso/mkiso.sh b/iso/mkiso.sh
index 6fe2914..ed071e6 100755
--- a/iso/mkiso.sh
+++ b/iso/mkiso.sh
@@ -7,7 +7,7 @@ SYSLINUX_VER=6.04-pre1
 
 TO_MIRROR="file:///var/lib/xib/repo"
 
-XI_ARGS="-yv"
+XI_ARGS="-yq"
 
 WORKDIR=/tmp/xiiso
 
@@ -50,7 +50,8 @@ agetty_options="--autologin root --noclear"
 EOF
 
     xichroot $chroot rc-update add networkmanager
-    
+    [ -d "$chroot/var/lib/xipkg/mirror" ] && rm -rf "$chroot/var/lib/xipkg/mirror"
+    return 0
 }
 
 build_initramfs () {
@@ -121,8 +122,8 @@ EOF
 
 build_iso () {
     local name=${1:-netinst}
-    mksquashfs $chroot $isoroot/filesystem.squashfs -noappend -no-progress -e "/proc/*" -e "/dev/*" -e "/sys/*" 
-    xorrisofs -output ${name}.iso \
+    mksquashfs $chroot $isoroot/filesystem.squashfs -noappend -no-progress -wildcards -e 'proc/*' 'dev/*' 'sys/*'
+    xorrisofs -output ${ISO_NAME}-${name}.iso \
             -joliet \
             -rational-rock \
             -sysid LINUX \
diff --git a/src/mirror.sh b/src/mirror.sh
index b2b7c80..a1c4065 100644
--- a/src/mirror.sh
+++ b/src/mirror.sh
@@ -16,6 +16,16 @@ create_deps_graph () {
     done
 }
 
+create_packages_list () {
+    for pkg in $@; do 
+        while read line; do
+            set -- $line
+            shift
+            echo $pkg $@
+        done < $PACKAGES_DIR/$pkg
+    done
+}
+
 mirror () {
     local MIRROR_DIR=${SYSROOT}${1:-$MIRROR_DIR}
     mkdir -p $MIRROR_DIR/repo
@@ -25,6 +35,8 @@ mirror () {
     cp -r $KEYCHAIN_DIR/* $MIRROR_DIR/keychain/
 
     local packages=$(list)
+        
+    create_packages_list $packages > $MIRROR_DIR/repo/packages.list
 
     cd $MIRROR_DIR/repo
     fetch $packages
-- 
cgit v1.2.1