linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
commit f93a31639620a4e6f1157d55ecfe6339c8258961 parent 060f75579b32a6a5ad316e13ca484fd31affe422 Author: Jul <jul@9o.is> Date: Wed, 30 Jul 2025 00:34:59 -0400 install packages to out/ beside local installs Diffstat:
| M | build | | | 10 | ++++------ |
| M | pkg/abduco/build | | | 3 | +-- |
| M | pkg/ag/build | | | 3 | +-- |
| M | pkg/dvtm/build | | | 5 | +---- |
| M | pkg/fzy/build | | | 4 | +--- |
| M | pkg/noice/build | | | 4 | +--- |
| M | pkg/st/build | | | 12 | ++++-------- |
| M | pkg/vis/build | | | 13 | ++++++++----- |
| M | pkg/yash/build | | | 20 | ++++++++++++-------- |
9 files changed, 33 insertions(+), 41 deletions(-)
diff --git a/build b/build @@ -84,10 +84,8 @@ for target in ${targets[*]}; do $srcdir/build - if [ "$local_install" != "true" ]; then - managedir="/rw/sync/manage/sync/$target" - sudo rm -rf "$managedir" - sudo cp -r "$outdir" "$managedir" - sudo chown -R sync-manage:sftponly "$managedir" - fi + managedir="/rw/sync/manage/sync/$target" + sudo rm -rf "$managedir" + sudo cp -r "$outdir" "$managedir" + sudo chown -R sync-manage:sftponly "$managedir" done diff --git a/pkg/abduco/build b/pkg/abduco/build @@ -11,9 +11,8 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir" make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install if [ "$local_install" == "true" ]; then sudo make -C "$repodir" install -else - make DESTDIR="$outdir" -C "$repodir" install fi diff --git a/pkg/ag/build b/pkg/ag/build @@ -27,9 +27,8 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir/src/config.h" make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install if [ "$local_install" == "true" ]; then sudo make -C "$repodir" install -else - make DESTDIR="$outdir" -C "$repodir" install fi diff --git a/pkg/dvtm/build b/pkg/dvtm/build @@ -17,12 +17,9 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir" cp "$srcdir/config.mk" "$repodir" - make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install if [ "$local_install" == "true" ]; then sudo make -C "$repodir" install -else - export DESTDIR="$outdir" - make -C "$repodir" install fi diff --git a/pkg/fzy/build b/pkg/fzy/build @@ -7,10 +7,8 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir" make -C "$repodir" +make DESTDIR="$outdir" PREFIX=/usr -C "$repodir" install if [ "$local_install" == "true" ]; then sudo make -C "$repodir" PREFIX=/usr install -else - export DESTDIR="$outdir" - make -C "$repodir" PREFIX=/usr install fi diff --git a/pkg/noice/build b/pkg/noice/build @@ -8,11 +8,9 @@ cp "$srcdir/noiceconf.h" "$repodir" cp "$srcdir/nopenconf.h" "$repodir" make -C "$repodir" +make DESTDIR="$outdir" PREFIX=/usr -C "$repodir" install if [ "$local_install" == "true" ]; then sudo make -C "$repodir" PREFIX=/usr install -else - export DESTDIR="$outdir" - make -C "$repodir" PREFIX=/usr install fi diff --git a/pkg/st/build b/pkg/st/build @@ -21,10 +21,13 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir" cp "$srcdir/config.mk" "$repodir" -export DESTDIR="$outdir" export TERMINFO="$outdir/usr/share/terminfo" make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install + +cp "$srcdir/terminal" "$outdir/usr/bin/terminal" +chmod +x "$outdir/usr/bin/terminal" if [ "$local_install" == "true" ]; then export TERMINFO="/usr/share/terminfo" @@ -32,11 +35,4 @@ if [ "$local_install" == "true" ]; then sudo make -C "$repodir" install sudo cp "$srcdir/terminal" /usr/bin/terminal sudo chmod +x /usr/bin/terminal -else - export DESTDIR="$outdir" - export TERMINFO="$outdir/usr/share/terminfo" - - make -C "$repodir" install - cp "$srcdir/terminal" "$outdir/usr/bin/terminal" - chmod +x "$outdir/usr/bin/terminal" fi diff --git a/pkg/vis/build b/pkg/vis/build @@ -6,7 +6,6 @@ set -euo pipefail # - lua-devel repodir="$srcdir/repo" -configdir="$outdir/home/user/.config/vis" ( cd $repodir @@ -18,13 +17,17 @@ configdir="$outdir/home/user/.config/vis" rm -rf "$outdir" make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install + +configdir="$outdir/home/user/.config/vis" +mkdir -p "$configdir" +cp -r "$srcdir"/config/* "$configdir" if [ "$local_install" == "true" ]; then sudo make -C "$repodir" install + configdir="/home/user/.config/vis" -else - make DESTDIR="$outdir" -C "$repodir" install + mkdir -p "$configdir" + cp -r "$srcdir"/config/* "$configdir" fi -mkdir -p "$configdir" -cp -r "$srcdir"/config/* "$configdir" diff --git a/pkg/yash/build b/pkg/yash/build @@ -5,7 +5,6 @@ # asciidoc repodir="$srcdir/repo" -configdir="$outdir/home/user/.config/yash" ( cd $repodir @@ -16,15 +15,20 @@ rm -rf "$outdir" cp "$srcdir/config.h" "$repodir" make -C "$repodir" +make DESTDIR="$outdir" -C "$repodir" install -if [ "$local_install" == "true" ]; then - sudo make -C "$repodir" install - configdir="/home/user/.config/yash" -else - make DESTDIR="$outdir" -C "$repodir" install -fi - +configdir="$outdir/home/user/.config/yash" mkdir -p "$configdir/rc.d" cp "$srcdir/config/rc" "$configdir" cp "$srcdir/config/00-general" "$configdir/rc.d" cp "$srcdir/config/10-git" "$configdir/rc.d" + +if [ "$local_install" == "true" ]; then + sudo make -C "$repodir" install + + configdir="/home/user/.config/yash" + mkdir -p "$configdir/rc.d" + cp "$srcdir/config/rc" "$configdir" + cp "$srcdir/config/00-general" "$configdir/rc.d" + cp "$srcdir/config/10-git" "$configdir/rc.d" +fi