linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
commit 0a6c6a6b9aeb2b6c88a300cfc8e78283f471b89e parent bc100104f5f298d97b219c4ffae80a02982e10b7 Author: Jul <jul@9o.is> Date: Sat, 8 Nov 2025 14:08:29 -0500 remove fspec and tpl configure scripts temporarily Diffstat:
| M | ninja/functions.sh | | | 177 | ++----------------------------------------------------------------------------- |
| M | pkg/ag/gen.sh | | | 1 | - |
| M | pkg/awk/gen.sh | | | 1 | - |
| M | pkg/b3sum/gen.sh | | | 1 | - |
| M | pkg/byacc/gen.sh | | | 1 | - |
| M | pkg/bzip2/gen.sh | | | 2 | -- |
| M | pkg/e2fsprogs/gen.sh | | | 6 | ------ |
| M | pkg/fe/gen.sh | | | 2 | -- |
| M | pkg/fspec-sync/gen.sh | | | 2 | -- |
| M | pkg/fzy/gen.sh | | | 1 | - |
| M | pkg/less/gen.sh | | | 2 | -- |
| M | pkg/lua/gen.sh | | | 4 | ---- |
| M | pkg/luaposix/gen.sh | | | 21 | --------------------- |
| M | pkg/mandoc/gen.sh | | | 6 | ------ |
| M | pkg/netbsd-curses/gen.sh | | | 6 | ------ |
| M | pkg/oksh/gen.sh | | | 2 | -- |
| M | pkg/pax/gen.sh | | | 1 | - |
| M | pkg/perp/gen.sh | | | 2 | -- |
| M | pkg/qubes-core-qrexec/gen.sh | | | 4 | ---- |
| M | pkg/rc/gen.sh | | | 1 | - |
| M | pkg/sbase/gen.sh | | | 1 | - |
| M | pkg/sinit/gen.sh | | | 4 | ---- |
| M | pkg/st/gen.sh | | | 8 | +------- |
| M | pkg/ubase/gen.sh | | | 3 | --- |
| M | pkg/util-linux/gen.sh | | | 2 | -- |
| M | pkg/vis/gen.sh | | | 11 | ----------- |
| M | pkg/xen/gen.sh | | | 3 | --- |
| M | pkg/xz/gen.sh | | | 3 | --- |
| M | pkg/zstd/gen.sh | | | 3 | --- |
29 files changed, 5 insertions(+), 276 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh @@ -117,39 +117,6 @@ ldflags() { setv ldflags '$ldflags' "$*" } -bin() { - _fn=${1##*/} - _out=$outdir/$_fn - _ninja_fspec /bin/$_fn reg 0755 0 0 $_out - - case $1 in - \$*) copy $_out $1;; - esac -} - -dir() { - _own=${3-0:0} - _uid=${_own%:*} - _gid=${_own#*:} - _ninja_fspec $1 dir ${2-0755} $_uid $_gid -} - -sym() { - _ninja_fspec $2 sym 0777 0 0 ./$1 -} - -reg() { - _ninja_prefix _out $outdir $1 - _ninja_fspec $2 reg ${3-0644} 0 0 $_out -} - -etc() { - _ninja_prefix _src $etcdir $1 - _out=$outdir/_files/etc/$1 - _ninja_fspec /etc/$1 ${3-reg} ${2-0644} 0 0 $_out - copy $_out $_src -} - man() { _src=$1 _sec=${2-} @@ -161,18 +128,11 @@ man() { _sec=${_src##*.} fi - _ninja_prefix _src $srcdir $_src - _ninja_prefix _out $outdir $_out - if [ "${GZMAN-}" = true ]; then - _out=$_out.gz - _rule=gzip + gzip $_out.gz $_src else - _rule=copy + copy $_out $_src fi - - _ninja_fspec $MANDIR/man$_sec/${_out##*/} reg 0644 0 0 $_out - $_rule $_out $_src } exe() { @@ -180,7 +140,7 @@ exe() { _ninja_compile $* if [ "$_objs" ] && [ "$_deps" ]; then - _rspfile=$outdir/_rsp/${_out##*/} + _rspfile=$outdir/_rsp/$_out awk $_rspfile $_deps '|' $basedir/ninja/rsp.awk bind expr '-f $basedir/ninja/rsp.awk' @@ -248,10 +208,6 @@ include() { done } -pkg() { - _ninja_fspec_file $* -} - fetch() { _fetchdir=$outdir/_fetch @@ -396,7 +352,7 @@ _ninja_initglobals() { _ninja_type=root _ninja_file=root.ninja ;; - pkg/*|tpl/*) + pkg/*) _ninja_type=${1%%/*} _ninja_gendir=$1 _ninja_name=${1#*/} @@ -416,8 +372,6 @@ _ninja_initglobals() { _ninja_buffer_subgen= _ninja_buffer_objs= - _ninja_buffer_fspec= - _ninja_buffer_fspec_files= _ninja_template= _ninja_default_target= } @@ -485,12 +439,6 @@ _ninja_setv_init() { setv srcdir $dir/repo setv objdir $outdir/_obj ;; - tpl) - setv dir $basedir/$gendir - setv outdir $builddir/$gendir - setv rootdir $outdir/root - setv etcdir $dir/etc - ;; esac } @@ -515,25 +463,6 @@ _ninja_prefix() { eval "$_var='$_vs'" } -_ninja_fspec() { - # path type mode uid gid src - _ninja_buffer_fspec="$_ninja_buffer_fspec$PREFIX$1 $2 $3 ${4-0} ${5-0} ${6-}\n" -} - -_ninja_fspec_file() { - _v1=$1; shift - - if [ ! "$*" ]; then - _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_fspec/ALL" - return - fi - - for _v in $*; do - _fspec=$pkgdir/$_v1/_fspec/$(printf ${_v#/} | tr '/' '-') - _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $_fspec" - done -} - _ninja_compile() { _srcs= _objs= @@ -617,53 +546,12 @@ _ninja_flush_build() { case $_ninja_type in root) - _subgens_pkg= - _subgens_tpl= - - for _v in $_subgens; do - case $_v in - \$tgtdir/pkg/*) _subgens_pkg="$_subgens_pkg $_v";; - \$tgtdir/tpl/*) _subgens_tpl="$_subgens_tpl $_v";; - esac - done - - phony build-pkgs $_subgens_pkg - phony build-tpls $_subgens_tpl phony build $_subgens - - _subgens_tpl_install= - for _v in $_subgens_tpl; do - _subgens_tpl_install="$_subgens_tpl_install ${_v%build}install" - done - phony install $_subgens_tpl_install ;; pkg) _ninja_save build $_subgens _ninja_target build _fetch/build ;; - tpl) - fspec_tar $outdir/root.tar.zstd '|' $hostdir/fspec-tar $outdir/_fspec/ALL - phony build $outdir/root.tar.zstd - - if [ "$_ninja_template" ]; then - set -- $_ninja_template - - if [ $# -lt 3 ]; then - qubes_fspec $outdir/qubes-installed '|' $basedir/ninja/qubes-fspec.sh $hostdir/pax $outdir/root.tar.zstd - bind template $1 - bind path $2 - bind tar $outdir/root.tar.zstd - else - qubes_install $outdir/qubes-installed '|' $basedir/ninja/qubes-install.sh $hostdir/pax $outdir/root.tar.zstd - bind template $1 - bind label $2 - bind size $3 - bind tar $outdir/root.tar.zstd - fi - - phony install $outdir/qubes-installed - fi - ;; esac } @@ -699,62 +587,6 @@ _ninja_flush_sync() { esac } -_ninja_flush_fspec() { - if [ ${_ninja_subninja-} ]; then - return - fi - - _srcs=$(printf "$_ninja_buffer_fspec" | while read -r line; do - set -- $line - path=$1 - type=$2 - mode=$3 - uid=$4 - gid=$5 - src=${6-} - - out=$outdir/_fspec/$(printf ${path#/} | tr '/' '-') - dep='| $basedir/ninja/fspec.sh $hostdir/fspec-hash' - - if [ $type = reg ]; then - fspec $out $src $dep - else - fspec $out $dep - fi - - bind path $path - bind type $type - bind mode $mode - bind uid $uid - bind gid $gid - - if [ $type = sym ]; then - bind target $src - fi - - printf "$out " - done) - - _subgens= - - for _v in $_ninja_buffer_subgen; do - _subgens="$_subgens \$tgtdir/$_v/fspec" - done - - case $_ninja_type in - root) phony fspec $_subgens;; - *) - if [ ! "$_srcs" ] && [ ! "$_ninja_buffer_fspec_files" ]; then - touch _fspec/ALL - else - cat _fspec/ALL $_srcs $_ninja_buffer_fspec_files - fi - - phony fspec $outdir/_fspec/ALL - ;; - esac -} - _ninja_flush_configure() { if [ ${_ninja_subninja-} ]; then return @@ -781,7 +613,6 @@ _ninja_flush() { _ninja_flush_subninjas _ninja_target deps _ninja_target headers - _ninja_flush_fspec _ninja_flush_sync _ninja_flush_build _ninja_flush_configure diff --git a/pkg/ag/gen.sh b/pkg/ag/gen.sh @@ -29,5 +29,4 @@ exe ag " $pkgdir/zlib/libz.a " -bin ag man doc/ag.1 diff --git a/pkg/awk/gen.sh b/pkg/awk/gen.sh @@ -41,5 +41,4 @@ exe awk " $yaccdir/proctab.c " -bin awk man awk.1 diff --git a/pkg/b3sum/gen.sh b/pkg/b3sum/gen.sh @@ -37,5 +37,4 @@ exe b3sum " $outdir/libblake3.a " -bin b3sum man b3sum.1 diff --git a/pkg/byacc/gen.sh b/pkg/byacc/gen.sh @@ -29,5 +29,4 @@ host() { } exe yacc $byacc_srcs -bin yacc man yacc.1 diff --git a/pkg/bzip2/gen.sh b/pkg/bzip2/gen.sh @@ -22,6 +22,4 @@ exe bzip2 " $outdir/libbz2.a " -bin bzip2 man bzip2.1 -sym bzip2 /bin/bzcat diff --git a/pkg/e2fsprogs/gen.sh b/pkg/e2fsprogs/gen.sh @@ -306,12 +306,6 @@ exe e4crypt " $pkgdir/util-linux/libuuid.a.d " -bin e2fsck -bin resize2fs -bin mke2fs -bin tune2fs -bin e4crypt - substman e2fsck/e2fsck.8.in substman e2fsck/e2fsck.conf.5.in substman resize/resize2fs.8.in diff --git a/pkg/fe/gen.sh b/pkg/fe/gen.sh @@ -16,5 +16,3 @@ exe fe " tty.c tty_interface.c " - -bin fe diff --git a/pkg/fspec-sync/gen.sh b/pkg/fspec-sync/gen.sh @@ -37,5 +37,3 @@ host() { lib libcommon.a $libcommon_srcs exe fspec-hash $fspec_hash_srcs $pkgdir/b3sum/libblake3.a exe fspec-tar $fspec_tar_srcs -bin fspec-hash -bin fspec-tar diff --git a/pkg/fzy/gen.sh b/pkg/fzy/gen.sh @@ -18,5 +18,4 @@ exe fzy " src/tty_interface.c " -bin fzy man fzy.1 diff --git a/pkg/less/gen.sh b/pkg/less/gen.sh @@ -66,8 +66,6 @@ exe lesskey " xbuf.c " -bin less -sym less /bin/more man less.nro 1 man lessecho.nro 1 man lesskey.nro 1 diff --git a/pkg/lua/gen.sh b/pkg/lua/gen.sh @@ -61,9 +61,5 @@ exe luac " $outdir/liblua.a " -reg lua /bin/lua5.4 0755 -sym lua5.4 /bin/lua -reg luac /bin/luac5.4 0755 -sym luac5.4 /bin/luac man doc/lua.1 man doc/luac.1 diff --git a/pkg/luaposix/gen.sh b/pkg/luaposix/gen.sh @@ -14,9 +14,6 @@ cflags " dep lua/headers -sed version.lua lib/posix/version.lua.in -bind expr '-e s,@package@,luaposix, -e s,@version2,36.2.1,' - lib libluaposix.a " ext/posix/ctype.c ext/posix/dirent.c @@ -47,21 +44,3 @@ lib libluaposix.a " ext/posix/unistd.c ext/posix/utime.c " - -luapfile() { - for v in $*; do - reg $srcdir/lib/posix/$v /share/lua/5.4/posix/$v - done -} - -luapfile " - _base.lua - _bitwise.lua - _strict.lua - compat.lua - init.lua - sys.lua - util.lua -" - -reg version.lua /share/lua/5.4/posix/version.lua diff --git a/pkg/mandoc/gen.sh b/pkg/mandoc/gen.sh @@ -94,12 +94,6 @@ exe demandoc " $pkgdir/zlib/libz.a " -bin mandoc -bin demandoc -sym mandoc /bin/apropos -sym mandoc /bin/man -sym mandoc /bin/whatis -sym mandoc /bin/makewhatis man mandoc.1 man demandoc.1 man man.1 diff --git a/pkg/netbsd-curses/gen.sh b/pkg/netbsd-curses/gen.sh @@ -201,12 +201,6 @@ exe tset " $outdir/libterminfo.a " -bin infocmp -bin tabs -bin tic -bin tput -bin tset -sym tset /bin/reset man usr.bin/infocmp/infocmp.1 man usr.bin/tabs/tabs.1 man usr.bin/tic/tic.1 diff --git a/pkg/oksh/gen.sh b/pkg/oksh/gen.sh @@ -54,7 +54,5 @@ exe ksh " vis.c " -bin ksh -sym ksh /bin/sh man sh.1 man ksh.1 diff --git a/pkg/pax/gen.sh b/pkg/pax/gen.sh @@ -14,4 +14,3 @@ host() { } exe pax pax.c -bin pax diff --git a/pkg/perp/gen.sh b/pkg/perp/gen.sh @@ -58,7 +58,6 @@ perp() { exe $src perp/$src.c $outdir/libasagna.a ;; esac - bin $src man perp/man/$src.8 done } @@ -66,7 +65,6 @@ perp() { runtools() { for src in $*; do exe $src runtools/$src.c $outdir/libasagna.a - bin $src case $src in [!cat]*) man runtools/man/$src.8;; diff --git a/pkg/qubes-core-qrexec/gen.sh b/pkg/qubes-core-qrexec/gen.sh @@ -53,7 +53,3 @@ exe qrexec-client-vm " $outdir/libqrexec-utils.a.d $pkgdir/qubes-core-vchan-xen/libvchanxen.a.d " - -bin qrexec-agent -bin qrexec-fork-server -bin qrexec-client-vm diff --git a/pkg/rc/gen.sh b/pkg/rc/gen.sh @@ -65,5 +65,4 @@ exe rc " $pkgdir/bestline/bestline.a " -bin rc man rc.1 diff --git a/pkg/sbase/gen.sh b/pkg/sbase/gen.sh @@ -90,7 +90,6 @@ dep $outdir/include/getconf.h exes() { for src in $*; do exe $src $src.c $outdir/libutil.a $outdir/libutf.a - bin $src man $src.1 done } diff --git a/pkg/sinit/gen.sh b/pkg/sinit/gen.sh @@ -10,8 +10,4 @@ cflags " exe sinit sinit.c exe shutdown $dir/shutdown.c - -bin sinit -sym sinit /bin/init man sinit.8 -bin shutdown diff --git a/pkg/st/gen.sh b/pkg/st/gen.sh @@ -31,11 +31,5 @@ setv ldflags " rule tic '$hostdir/tic -x -o $out $in' tic terminfo st.info -exe st " - st.c - x.c -" - -bin st +exe st st.c x.c man st.1 -reg terminfo /share/misc/terminfo diff --git a/pkg/ubase/gen.sh b/pkg/ubase/gen.sh @@ -41,7 +41,6 @@ exes() { *) src=$val exe $src $src.c $outdir/libutil.a - bin $src ;; esac done @@ -101,5 +100,3 @@ exes " watch 1 who 1 " - -bin $dir/mount.swap diff --git a/pkg/util-linux/gen.sh b/pkg/util-linux/gen.sh @@ -262,7 +262,5 @@ exe losetup " $outdir/libcommon.a " -bin fdisk -bin losetup man $dir/fdisk.8 man $dir/losetup.8 diff --git a/pkg/vis/gen.sh b/pkg/vis/gen.sh @@ -81,13 +81,6 @@ visman() { man $outdir/_man/$1 } -bin vis -bin vis-clipboard -bin vis-complete -bin vis-digraph -bin vis-menu -bin vis-open - visman vis.1 visman vis-clipboard.1 visman vis-complete.1 @@ -97,8 +90,4 @@ visman vis-open.1 for f in $(command cat $DIR/lua.txt | xargs); do copy lua/$f lua/$f - reg $outdir/lua/$f /share/vis/$f done - -sym lexers/lexer.lua /share/vis/lexer.lua -sym base-16.lua /share/vis/themes/default.lua diff --git a/pkg/xen/gen.sh b/pkg/xen/gen.sh @@ -433,6 +433,3 @@ exe xl " $pkgdir/zlib/libz.a $pkgdir/yajl/yajl.a " - -bin xl -bin xldevd diff --git a/pkg/xz/gen.sh b/pkg/xz/gen.sh @@ -153,7 +153,4 @@ exe xz " $outdir/liblzma.a " -bin xz man src/xz/xz.1 -sym xz /bin/unxz -sym xz /bin/xzcat diff --git a/pkg/zstd/gen.sh b/pkg/zstd/gen.sh @@ -54,7 +54,4 @@ exe zstd " $outdir/libzstd.a " -bin zstd -sym zstd unzstd -sym zstd zstdcat man programs/zstd.1