Merge branch 'master' of git.cheetah.remote:xilinux/buildfiles

5 files changed, 2 insertions, 121 deletions

diff --git a/repo/xi/mkinitramfs/mkinitramfs.xibuild b/repo/xi/mkinitramfs/mkinitramfs.xibuild
deleted file mode 100644
index 79da979..0000000
--- a/repo/xi/mkinitramfs/mkinitramfs.xibuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="sh cpio sbase findutils gzip util-linux"
-
-SOURCE=https://git.davidovski.xyz/xilinux/bootscripts.git
-
-DESC="Scripts to make initramfs"
-
-package () {
-    mkdir -p $PKG_DEST/usr/bin
-    make DESTDIR=$PKG_DEST install-mkinitramfs
-}
diff --git a/repo/xi/sysconfigs/sysconfigs.xibuild b/repo/xi/sysconfigs/sysconfigs.xibuild
index 1dadea9..519e68f 100644
--- a/repo/xi/sysconfigs/sysconfigs.xibuild
+++ b/repo/xi/sysconfigs/sysconfigs.xibuild
@@ -10,95 +10,6 @@ package () {
     mkdir -p $PKG_DEST/etc/
     mkdir -p $PKG_DEST/etc/sysconfig
 
-#    cat > $PKG_DEST/etc/sysconfig/rc.site << "EOF"
-## rc.site
-#
-## Distro Information
-#DISTRO="xilinux" # The distro name
-#DISTRO_CONTACT="xi@davidovski.xyz" # Bug report address
-#DISTRO_MINI="xi" # Short name used in filenames for distro config
-#
-## Define custom colors used in messages printed to the screen
-#
-## Please consult `man console_codes` for more information
-## under the "ECMA-48 Set Graphics Rendition" section
-##
-## Warning: when switching from a 8bit to a 9bit font,
-## the linux console will reinterpret the bold (1;) to
-## the top 256 glyphs of the 9bit font.  This does
-## not affect framebuffer consoles
-#
-#BRACKET="\\033[1;34m" # Blue
-#FAILURE="\\033[1;31m" # Red
-#INFO="\\033[1;36m"    # Cyan
-#NORMAL="\\033[0;39m"  # Grey
-#SUCCESS="\\033[1;32m" # Green
-#WARNING="\\033[1;33m" # Yellow
-#
-## Use a colored prefix
-#BMPREFIX="      "
-#SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL} "
-#FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
-#WARNING_PREFIX="${WARNING} *** ${NORMAL} "
-#
-## Manually seet the right edge of message output (characters)
-## Useful when resetting console font during boot to override
-## automatic screen width detection
-##COLUMNS=120
-#
-## Interactive startup
-##IPROMPT="yes" # Whether to display the interactive boot prompt
-##itime="3"    # The amount of time (in seconds) to display the prompt
-#
-## The total length of the distro welcome string, without escape codes
-#wlen=$(echo "Welcome to ${DISTRO}" | wc -c )
-#welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}"
-#
-## The total length of the interactive string, without escape codes
-##ilen=$(echo "Press 'I' to enter interactive startup" | wc -c )
-##i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup"
-#
-## Set scripts to skip the file system check on reboot
-##FASTBOOT=yes
-#
-## Skip reading from the console
-##HEADLESS=yes
-#
-## Write out fsck progress if yes
-##VERBOSE_FSCK=no
-#
-## Speed up boot without waiting for settle in udev
-##OMIT_UDEV_SETTLE=y
-#
-## Speed up boot without waiting for settle in udev_retry
-##OMIT_UDEV_RETRY_SETTLE=yes
-#
-## Skip cleaning /tmp if yes
-##SKIPTMPCLEAN=no
-#
-## For setclock
-#UTC=1
-##CLOCKPARAMS=
-#
-## For consolelog (Note that the default, 7=debug, is noisy)
-##LOGLEVEL=7
-#
-## For network
-#HOSTNAME=xi
-#
-## Delay between TERM and KILL signals at shutdown
-##KILLDELAY=3
-#
-## Optional sysklogd parameters
-#SYSKLOGD_PARMS="-m 0"
-#
-## Console parameters
-#UNICODE=1
-#KEYMAP="us"
-#FONT="lat0-16 -m 8859-15"
-#EOF
-#
-
     cat > $PKG_DEST/etc/profile << "EOF"
 
 umask 022
diff --git a/repo/xi/xib/xib.xibuild b/repo/xi/xib/xib.xibuild
index 52ebdb9..e4b3efa 100644
--- a/repo/xi/xib/xib.xibuild
+++ b/repo/xi/xib/xib.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS=""
-DEPS="xichroot xipkg xiutils git tar unzip"
+DEPS="xichroot xibuild xipkg xiutils hbar parseconf git tar unzip"
 
 SOURCE=https://git.davidovski.xyz/xilinux/xib.git
 DESC="The XiBuild system"
diff --git a/repo/xi/xichroot/xichroot.xibuild b/repo/xi/xichroot/xichroot.xibuild
deleted file mode 100644
index 680262b..0000000
--- a/repo/xi/xichroot/xichroot.xibuild
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/xiutils/xiutils.xibuild b/repo/xi/xiutils/xiutils.xibuild
index 3d69986..cbb1aa6 100644
--- a/repo/xi/xiutils/xiutils.xibuild
+++ b/repo/xi/xiutils/xiutils.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make gcc"
 DEPS="musl sh"
 
-PKG_VER=1.3.1
+PKG_VER=1.4.1
 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git
 BRANCH="v$PKG_VER"
 
@@ -18,8 +18,5 @@ check () {
 }
 
 package () {
-    for dir in include bin lib; do
-        mkdir -p $PKG_DEST/usr/$dir
-    done
     make DESTDIR=$PKG_DEST install
 }