From bb499959d88da1b3937c23b5405089c907188a81 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Thu, 10 Mar 2022 11:59:16 +0000
Subject: added and patched broken packages

---
 repo/xi/sysconfigs.xibuild |  4 ++--
 repo/xi/xib.xibuild        |  4 ++--
 repo/xi/xichroot.xibuild   | 14 ++++++++++++++
 repo/xi/xichroot.xipkg     | 13 -------------
 repo/xi/xiutils.xibuild    |  9 +++++----
 5 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 repo/xi/xichroot.xibuild
 delete mode 100644 repo/xi/xichroot.xipkg

(limited to 'repo/xi')

diff --git a/repo/xi/sysconfigs.xibuild b/repo/xi/sysconfigs.xibuild
index a75655e..92acddb 100644
--- a/repo/xi/sysconfigs.xibuild
+++ b/repo/xi/sysconfigs.xibuild
@@ -7,8 +7,8 @@ PKG_VER=N/A
 DESC="Default system configs for xilinux"
 
 package () {
-    mkdir -pv $PKG_DEST/etc/
-    mkdir -pv $PKG_DEST/etc/sysconfig
+    mkdir -p $PKG_DEST/etc/
+    mkdir -p $PKG_DEST/etc/sysconfig
     cat > $PKG_DEST/etc/sysconfig/rc.site << "EOF"
 # rc.site
 
diff --git a/repo/xi/xib.xibuild b/repo/xi/xib.xibuild
index 3c1f877..52ebdb9 100644
--- a/repo/xi/xib.xibuild
+++ b/repo/xi/xib.xibuild
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 MAKEDEPS=""
-DEPS="xichroot xiutils git tar unzip"
+DEPS="xichroot xipkg xiutils git tar unzip"
 
 SOURCE=https://git.davidovski.xyz/xilinux/xib.git
 DESC="The XiBuild system"
 
 package () {
-    mkdir -pv $PKG_DEST/var/lib/xib
+    mkdir -p $PKG_DEST/var/lib/xib
     mv * $PKG_DEST/var/lib/xib/
 }
diff --git a/repo/xi/xichroot.xibuild b/repo/xi/xichroot.xibuild
new file mode 100644
index 0000000..680262b
--- /dev/null
+++ b/repo/xi/xichroot.xibuild
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+MAKEDEPS="bash"
+DEPS="bash"
+
+PKG_VER=1.1.1
+SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
+BRANCH=v$PKG_VER
+DESC="A script to aid with chrooting on XiLinux"
+
+package () {
+    mkdir -p $PKG_DEST/usr/bin
+    make DESTDIR=$PKG_DEST install-chroot
+}
diff --git a/repo/xi/xichroot.xipkg b/repo/xi/xichroot.xipkg
deleted file mode 100644
index 651c1ec..0000000
--- a/repo/xi/xichroot.xipkg
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="bash"
-DEPS="bash"
-
-PKG_VER=1.0.1
-SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
-BRANCH=v$PKG_VER
-DESC="A script to aid with chrooting on XiLinux"
-
-package () {
-    make DESTDIR=$PKG_DEST install-chroot
-}
diff --git a/repo/xi/xiutils.xibuild b/repo/xi/xiutils.xibuild
index c8f7bf6..b052226 100644
--- a/repo/xi/xiutils.xibuild
+++ b/repo/xi/xiutils.xibuild
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-MAKEDEPS="gcc"
-DEPS="bash"
+MAKEDEPS="make gcc"
+DEPS="musl sh"
 
-PKG_VER=1.0.2
+# Use master
+#PKG_VER=1.1.2
 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
-BRANCH="v$PKG_VER"
+#BRANCH="v$PKG_VER"
 
 DESC="Utilities required by various components of the xilinux system"
 
-- 
cgit v1.2.1