logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 2b4c100bb9854b9ca07dedc864e9dfaa314b7e9c
parent cf6d26accc3c9e47df1cc1ab3d724fd31ea5dc44
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun,  8 Sep 2024 00:20:33 +0200

restore sbase for utilities missing in utils-std

Diffstat:

Mpkg/sbase/gen.lua59+----------------------------------------------------------
Msets.lua1+
2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/pkg/sbase/gen.lua b/pkg/sbase/gen.lua @@ -70,103 +70,50 @@ rule('getconf', '$srcdir/getconf.sh >$out') build('getconf', '$outdir/getconf.h', {'|', '$srcdir/getconf.sh'}) local cmds = { - 'basename', 'cal', - 'cat', - 'chgrp', - 'chmod', - 'chown', - 'chroot', - 'cksum', - 'cmp', 'cols', 'comm', 'cp', 'cron', - 'cut', - 'date', 'dd', - 'dirname', 'du', - 'echo', 'ed', - 'env', 'expand', - 'expr', - 'false', 'find', 'flock', 'fold', 'getconf', 'grep', - 'head', 'hostname', - 'install', - 'join', 'kill', - 'link', - 'ln', 'logger', - 'logname', 'ls', 'md5sum', - 'mkdir', - 'mkfifo', - 'mknod', - 'mktemp', - 'mv', - 'nice', 'nl', - 'nohup', 'od', 'paste', - 'pathchk', 'printenv', - 'printf', - 'pwd', - 'readlink', 'renice', 'rev', - 'rm', - 'rmdir', 'sed', - 'seq', 'setsid', - 'sha1sum', 'sha224sum', 'sha256sum', 'sha384sum', 'sha512-224sum', 'sha512-256sum', 'sha512sum', - 'sleep', 'sort', - 'split', 'sponge', - -- use strings from binutils - 'sync', 'tail', -- use tar from OpenBSD - 'tee', - 'test', 'tftp', - 'time', - 'touch', - 'tr', - 'true', 'tsort', - 'tty', - 'uname', 'unexpand', - 'uniq', - 'unlink', 'uudecode', 'uuencode', - 'wc', - 'which', 'whoami', 'xargs', - 'yes', } for _, cmd in ipairs(cmds) do local src = cmd @@ -178,13 +125,9 @@ for _, cmd in ipairs(cmds) do deps = {'$outdir/getconf.h'} end file('bin/'..cmd, '755', exe(cmd, {src..'.c', 'libutil.a', 'libutf.a'}, deps)) - local out = '$outdir/'..cmd..'.1.gz' - build('gzip', out, '$srcdir/'..src..'.1') - file('share/man/man1/'..cmd..'.1.gz', '644', out) + man{'$srcdir/'..src..'.1'} end -sym('bin/[', 'test') - -- TODO: binutils' config/lib-ld.m4 should use AC_REQUIRE([AC_PROG_EGREP]) and -- $EGREP instead of egrep. file('bin/egrep', '755', '$dir/egrep') diff --git a/sets.lua b/sets.lua @@ -22,6 +22,7 @@ return { 'pigz', 'rc', 'samurai', + 'sbase', 'sdhcp', 'sinit', 'skeleton',