bumped versions on xi tools

6 files changed, 24 insertions, 7 deletions

diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild
index cf224bb..343c07e 100644
--- a/repo/system/grub.xibuild
+++ b/repo/system/grub.xibuild
@@ -28,4 +28,16 @@ package () {
     make DESTDIR=$PKG_DEST install 
     mkdir -p $PKG_DEST/usr/share/bash-completion/completions
     mv $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions
+    mkdir -p $PKG_DEST/etc/default
+    cat > $PKG_DEST/etc/default/grub << "EOF"
+# GRUB boot loader configuration
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="XiLinux"
+
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+EOF
 }
diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild
index bfff8c4..87370e4 100644
--- a/repo/system/sysklogd.xibuild
+++ b/repo/system/sysklogd.xibuild
@@ -33,6 +33,6 @@ user.* -/var/log/user.log
 # End /etc/syslog.conf
 EOF
 	install -Dm 754 sysklogd.initd $PKG_DEST/etc/init.d/sysklogd
-    mkdir -p $PKG_DEST/etc/runlevels/boot/
-    ln -s /etc/init.d/sysklogd $PKG_DEST/etc/runlevels/boot/sysklogd
+    mkdir -p $PKG_DEST/etc/runlevels/default/
+    ln -s /etc/init.d/sysklogd $PKG_DEST/etc/runlevels/default/sysklogd
 }
diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild
index 7d0ba6e..dbb08f7 100644
--- a/repo/util/sudo.xibuild
+++ b/repo/util/sudo.xibuild
@@ -25,7 +25,7 @@ package () {
 
     cat > $PKG_DEST/etc/sudoers.d/00-sudo << "EOF"
 Defaults secure_path="/usr/sbin:/usr/bin"
-%wheel ALL="ALL" ALL
+%wheel ALL=(ALL:ALL) ALL
 EOF
 
     mkdir -p $PKG_DEST/etc/pam.d
diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild
index 294a9f4..1b5184a 100644
--- a/repo/util/wpa_supplicant.xibuild
+++ b/repo/util/wpa_supplicant.xibuild
@@ -7,9 +7,11 @@ PKG_VER=2.10
 
 SOURCE=https://w1.fi/releases/wpa_supplicant-$PKG_VER.tar.gz
 DESC="A utility providng key negotiation for WPA wireless networks"
-BOOTSCRIPTS=blfs-bootscripts-20210826
 ADDITIONAL="
-        https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz
+wpa_cli.confd
+wpa_cli.initd
+wpa_supplicant.confd
+wpa_supplicant.initd
     "
 
 
@@ -55,6 +57,8 @@ build () {
 package () {
     mkdir -p $PKG_DEST/usr/sbin
     mkdir -p $PKG_DEST/usr/share/dbus-1/system-services
+    mkdir -p $PKG_DEST/usr/share/man/man5
+    mkdir -p $PKG_DEST/usr/share/man/man8
     install -m755 wpa_cli $PKG_DEST/usr/sbin/ &&
     install -m755 wpa_passphrase $PKG_DEST/usr/sbin/ &&
     install -m755 wpa_supplicant $PKG_DEST/usr/sbin/ &&
@@ -71,6 +75,7 @@ package () {
     cd ..
 
     # openrc runscripts
+    install -d $PKG_DEST/etc/init.d/wpa_supplicant
 	install -Dm755 wpa_supplicant.initd \
 		$PKG_DEST/etc/init.d/wpa_supplicant
 	install -Dm644 wpa_supplicant.confd \
diff --git a/repo/xi/xipkg.xibuild b/repo/xi/xipkg.xibuild
index 686d95a..c2e95bb 100644
--- a/repo/xi/xipkg.xibuild
+++ b/repo/xi/xipkg.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make"
 DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64"
 
-PKG_VER=1.1.2
+PKG_VER=1.1.3
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
 BRANCH="v$PKG_VER"
 
diff --git a/repo/xi/xiutils.xibuild b/repo/xi/xiutils.xibuild
index d60ad34..4cbcc01 100644
--- a/repo/xi/xiutils.xibuild
+++ b/repo/xi/xiutils.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make gcc"
 DEPS="musl sh"
 
-PKG_VER=1.2.1
+PKG_VER=1.2.2
 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
 BRANCH="v$PKG_VER"