From 739c65c54cb0e957df5e9b76f93fb02554e5cac3 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:52:30 +0100 Subject: moved everything to new file formatting --- repo/xi/mkinitramfs.xibuild | 13 --- repo/xi/mkinitramfs/mkinitramfs.xibuild | 13 +++ repo/xi/sysconfigs.xibuild | 186 -------------------------------- repo/xi/sysconfigs/sysconfigs.xibuild | 186 ++++++++++++++++++++++++++++++++ repo/xi/xib.xibuild | 12 --- repo/xi/xib/xib.xibuild | 12 +++ repo/xi/xichroot.xibuild | 14 --- repo/xi/xichroot/xichroot.xibuild | 14 +++ repo/xi/xipkg.xibuild | 18 ---- repo/xi/xipkg/xipkg.xibuild | 18 ++++ repo/xi/xiutils.xibuild | 25 ----- repo/xi/xiutils/xiutils.xibuild | 25 +++++ 12 files changed, 268 insertions(+), 268 deletions(-) delete mode 100644 repo/xi/mkinitramfs.xibuild create mode 100644 repo/xi/mkinitramfs/mkinitramfs.xibuild delete mode 100644 repo/xi/sysconfigs.xibuild create mode 100644 repo/xi/sysconfigs/sysconfigs.xibuild delete mode 100644 repo/xi/xib.xibuild create mode 100644 repo/xi/xib/xib.xibuild delete mode 100644 repo/xi/xichroot.xibuild create mode 100644 repo/xi/xichroot/xichroot.xibuild delete mode 100644 repo/xi/xipkg.xibuild create mode 100644 repo/xi/xipkg/xipkg.xibuild delete mode 100644 repo/xi/xiutils.xibuild create mode 100644 repo/xi/xiutils/xiutils.xibuild (limited to 'repo/xi') diff --git a/repo/xi/mkinitramfs.xibuild b/repo/xi/mkinitramfs.xibuild deleted file mode 100644 index 79da979..0000000 --- a/repo/xi/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/mkinitramfs/mkinitramfs.xibuild b/repo/xi/mkinitramfs/mkinitramfs.xibuild new file mode 100644 index 0000000..79da979 --- /dev/null +++ b/repo/xi/mkinitramfs/mkinitramfs.xibuild @@ -0,0 +1,13 @@ +#!/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.xibuild b/repo/xi/sysconfigs.xibuild deleted file mode 100644 index 1dadea9..0000000 --- a/repo/xi/sysconfigs.xibuild +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/sh - -MAKEDEPS="" -DEPS="bootscripts sh" - -PKG_VER=N/A -DESC="Default system configs for xilinux" - -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 - -PS1="\u@\h \w $ " -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/.local/bin - -export PATH -export PS1 - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH -export QT_QPA_PLATFORMTHEME=qt5ct -EOF - - cat > $PKG_DEST/etc/inputrc << "EOF" -# Begin /etc/inputrc -# Modified by Chris Lynn - -# Allow the command prompt to wrap to the next line -set horizontal-scroll-mode Off - -# Enable 8bit input -set meta-flag On -set input-meta On - -# Turns off 8th bit stripping -set convert-meta Off - -# Keep the 8th bit for display -set output-meta On - -# none, visible or audible -set bell-style none - -# All of the following map the escape sequence of the value -# contained in the 1st argument to the readline specific functions -"\eOd": backward-word -"\eOc": forward-word - -# for linux console -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[3~": delete-char -"\e[2~": quoted-insert - -# for xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for Konsole -"\e[H": beginning-of-line -"\e[F": end-of-line - -# End /etc/inputrc -EOF - cat > $PKG_DEST/etc/shells << "EOF" - /bin/sh -EOF - - cat > $PKG_DEST/etc/lsb-release << "EOF" -LSB_VERSION=1.4 -DISTRIB_ID=xi -DISTRIB_RELEASE=rolling -DISTRIB_DESCRIPTION="XiLinux" -EOF - cat > $PKG_DEST/etc/os-release << "EOF" -NAME="xilinux" -PRETTY_NAME="XiLinux" -ID=xi -BUILD_ID=rolling -ANSI_COLOR="38;2;23;147;209" -HOME_URL="https://xi.davidovski.xyz" -DOCUMENTATION_URL="https://xi.davidovski.xyz" -SUPPORT_URL="https://xi.davidovski.xyz" -BUG_REPORT_URL="https://xi.davidovski.xyz" -LOGO=xilinux-logo -EOF - -} diff --git a/repo/xi/sysconfigs/sysconfigs.xibuild b/repo/xi/sysconfigs/sysconfigs.xibuild new file mode 100644 index 0000000..1dadea9 --- /dev/null +++ b/repo/xi/sysconfigs/sysconfigs.xibuild @@ -0,0 +1,186 @@ +#!/bin/sh + +MAKEDEPS="" +DEPS="bootscripts sh" + +PKG_VER=N/A +DESC="Default system configs for xilinux" + +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 + +PS1="\u@\h \w $ " +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/.local/bin + +export PATH +export PS1 + +# Termcap is outdated, old, and crusty, kill it. +unset TERMCAP + +# Man is much better than us at figuring this out +unset MANPATH +export QT_QPA_PLATFORMTHEME=qt5ct +EOF + + cat > $PKG_DEST/etc/inputrc << "EOF" +# Begin /etc/inputrc +# Modified by Chris Lynn + +# Allow the command prompt to wrap to the next line +set horizontal-scroll-mode Off + +# Enable 8bit input +set meta-flag On +set input-meta On + +# Turns off 8th bit stripping +set convert-meta Off + +# Keep the 8th bit for display +set output-meta On + +# none, visible or audible +set bell-style none + +# All of the following map the escape sequence of the value +# contained in the 1st argument to the readline specific functions +"\eOd": backward-word +"\eOc": forward-word + +# for linux console +"\e[1~": beginning-of-line +"\e[4~": end-of-line +"\e[5~": beginning-of-history +"\e[6~": end-of-history +"\e[3~": delete-char +"\e[2~": quoted-insert + +# for xterm +"\eOH": beginning-of-line +"\eOF": end-of-line + +# for Konsole +"\e[H": beginning-of-line +"\e[F": end-of-line + +# End /etc/inputrc +EOF + cat > $PKG_DEST/etc/shells << "EOF" + /bin/sh +EOF + + cat > $PKG_DEST/etc/lsb-release << "EOF" +LSB_VERSION=1.4 +DISTRIB_ID=xi +DISTRIB_RELEASE=rolling +DISTRIB_DESCRIPTION="XiLinux" +EOF + cat > $PKG_DEST/etc/os-release << "EOF" +NAME="xilinux" +PRETTY_NAME="XiLinux" +ID=xi +BUILD_ID=rolling +ANSI_COLOR="38;2;23;147;209" +HOME_URL="https://xi.davidovski.xyz" +DOCUMENTATION_URL="https://xi.davidovski.xyz" +SUPPORT_URL="https://xi.davidovski.xyz" +BUG_REPORT_URL="https://xi.davidovski.xyz" +LOGO=xilinux-logo +EOF + +} diff --git a/repo/xi/xib.xibuild b/repo/xi/xib.xibuild deleted file mode 100644 index 52ebdb9..0000000 --- a/repo/xi/xib.xibuild +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -MAKEDEPS="" -DEPS="xichroot xipkg xiutils git tar unzip" - -SOURCE=https://git.davidovski.xyz/xilinux/xib.git -DESC="The XiBuild system" - -package () { - mkdir -p $PKG_DEST/var/lib/xib - mv * $PKG_DEST/var/lib/xib/ -} diff --git a/repo/xi/xib/xib.xibuild b/repo/xi/xib/xib.xibuild new file mode 100644 index 0000000..52ebdb9 --- /dev/null +++ b/repo/xi/xib/xib.xibuild @@ -0,0 +1,12 @@ +#!/bin/sh + +MAKEDEPS="" +DEPS="xichroot xipkg xiutils git tar unzip" + +SOURCE=https://git.davidovski.xyz/xilinux/xib.git +DESC="The XiBuild system" + +package () { + 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 deleted file mode 100644 index 680262b..0000000 --- a/repo/xi/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/xichroot/xichroot.xibuild b/repo/xi/xichroot/xichroot.xibuild new file mode 100644 index 0000000..680262b --- /dev/null +++ b/repo/xi/xichroot/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/xipkg.xibuild b/repo/xi/xipkg.xibuild deleted file mode 100644 index be1e45f..0000000 --- a/repo/xi/xipkg.xibuild +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64 sort" - -PKG_VER=1.3.1 -SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git -BRANCH="v$PKG_VER" - -DESC="The xilinux package manager" - -build () { - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/xi/xipkg/xipkg.xibuild b/repo/xi/xipkg/xipkg.xibuild new file mode 100644 index 0000000..be1e45f --- /dev/null +++ b/repo/xi/xipkg/xipkg.xibuild @@ -0,0 +1,18 @@ +#!/bin/sh + +MAKEDEPS="make" +DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64 sort" + +PKG_VER=1.3.1 +SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git +BRANCH="v$PKG_VER" + +DESC="The xilinux package manager" + +build () { + make +} + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/xi/xiutils.xibuild b/repo/xi/xiutils.xibuild deleted file mode 100644 index 3d69986..0000000 --- a/repo/xi/xiutils.xibuild +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make gcc" -DEPS="musl sh" - -PKG_VER=1.3.1 -SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git -BRANCH="v$PKG_VER" - -DESC="Utilities required by various components of the xilinux system" - -build () { - make -} - -check () { - make check -} - -package () { - for dir in include bin lib; do - mkdir -p $PKG_DEST/usr/$dir - done - make DESTDIR=$PKG_DEST install -} diff --git a/repo/xi/xiutils/xiutils.xibuild b/repo/xi/xiutils/xiutils.xibuild new file mode 100644 index 0000000..3d69986 --- /dev/null +++ b/repo/xi/xiutils/xiutils.xibuild @@ -0,0 +1,25 @@ +#!/bin/sh + +MAKEDEPS="make gcc" +DEPS="musl sh" + +PKG_VER=1.3.1 +SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git +BRANCH="v$PKG_VER" + +DESC="Utilities required by various components of the xilinux system" + +build () { + make +} + +check () { + make check +} + +package () { + for dir in include bin lib; do + mkdir -p $PKG_DEST/usr/$dir + done + make DESTDIR=$PKG_DEST install +} -- cgit v1.2.1