diff --git a/build.sh b/build.sh index 4aa1e24..b79d57d 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -x test "$1" = "--edit" && { EDIT="-ti -v $PWD/edit.sh:/root/edit.sh --entrypoint bash" @@ -10,10 +11,12 @@ test -d dist || mkdir dist test -d cache || mkdir cache rm -rf cache/* -docker images | grep buildroot || docker build -t buildroot . +OCI=$(which podman || which docker) -docker run \ - --rm \ +$OCI images | grep buildroot || $OCI build -t buildroot . + +#$OCI --conmon /usr/bin/false run \ +$OCI run \ --name build-v86 \ -v $PWD/dist:/build \ -v $PWD/buildroot-v86/:/buildroot-v86 ${EDIT} \ diff --git a/buildroot-v86/Config.in b/buildroot-v86/Config.in index 91ab7ac..7f03ea0 100644 --- a/buildroot-v86/Config.in +++ b/buildroot-v86/Config.in @@ -1,3 +1,2 @@ source "$BR2_EXTERNAL_v86_PATH/package/nled/Config.in" -source "$BR2_EXTERNAL_v86_PATH/package/execfuse/Config.in" source "$BR2_EXTERNAL_v86_PATH/package/fusescript/Config.in" diff --git a/buildroot-v86/board/v86/rootfs_overlay/etc/profile b/buildroot-v86/board/v86/rootfs_overlay/etc/profile index b822737..8a78eb3 100644 --- a/buildroot-v86/board/v86/rootfs_overlay/etc/profile +++ b/buildroot-v86/board/v86/rootfs_overlay/etc/profile @@ -39,7 +39,7 @@ help_tips(){ echo 'paste text ' "ctrl/cmd+shift+v'" echo 'paste text to file ' "ctrl/cmd+v'" echo 'import file to scene ' "drag-drop file or ctrl/cmd+v or type 'upload'" - echo 'import remote URL ' "type 'require '" + echo 'import remote URL ' "type 'require '" echo 'reset scene & shell ' "type 'reset'" echo 'js run ' "type 'js 'alert(\"hello\")'" echo 'js console.log: ' "type 'console document.baseURI" diff --git a/buildroot-v86/board/v86/rootfs_overlay/etc/profile.xrsh b/buildroot-v86/board/v86/rootfs_overlay/etc/profile.xrsh index 0f9e883..a13901d 100644 --- a/buildroot-v86/board/v86/rootfs_overlay/etc/profile.xrsh +++ b/buildroot-v86/board/v86/rootfs_overlay/etc/profile.xrsh @@ -47,7 +47,7 @@ test -d /dev/browser || { stty raw < /dev/ttyS1 mkfifo /var/run/ttyS1 cat /dev/ttyS1 > /var/run/ttyS1 & - /bin/sh < /var/run/ttyS1 + /bin/sh < /var/run/ttyS1 > /var/run/ttyS1 } setup_listen_homedir(){ diff --git a/buildroot-v86/board/v86/rootfs_overlay/root/hook.d/URI/fragment/exec.sh b/buildroot-v86/board/v86/rootfs_overlay/root/hook.d/URI/fragment/exec.sh index 0163b0f..52d2aed 100755 --- a/buildroot-v86/board/v86/rootfs_overlay/root/hook.d/URI/fragment/exec.sh +++ b/buildroot-v86/board/v86/rootfs_overlay/root/hook.d/URI/fragment/exec.sh @@ -1,6 +1,12 @@ #!/bin/sh source /etc/profile.sh # expose xrsh cmds like require etc +if [[ "$1" =~ pos=|t= ]] then + # we are dealing with XR or Media Fragments + exit # ignore for now +fi + +# otherwise execute echo "" # clear line $* # simply execute echo "$*" >> /tmp/frag.log diff --git a/dist/v86-linux.iso b/dist/v86-linux.iso index 68ce665..d5979d0 100644 Binary files a/dist/v86-linux.iso and b/dist/v86-linux.iso differ