updated file structure

.devcontainer/files/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Start supervisord in the background and redirect its output to /dev/null
+
+# open supervisord in tmux
+tmux new-session -d -s supervisord
+tmux send-keys -t supervisord "/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf" C-m
+
+# End of entrypoint
+# -----------------

.devcontainer/files/gcc/config.gcc.patch

@@ -0,0 +1,10 @@
+--- config.gcc	2016-04-11 03:14:59.000000000 -0700
++++ config.gcc.new	2016-04-27 13:47:22.444331746 -0700
+@@ -1420,6 +1420,7 @@
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
+ 	;;
+ x86_64-*-elf*)
++	tmake_file="${tmake_file} i386/t-x86_64-elf" # include the new multilib configuration
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
+ 	;;
+ x86_64-*-rtems*)

.devcontainer/files/gcc/t-x86_64-elf

@@ -0,0 +1,4 @@
+# Add libgcc multilib variant without red-zone requirement
+
+MULTILIB_OPTIONS += mno-red-zone
+MULTILIB_DIRNAMES += no-red-zone

.devcontainer/files/src/build-binutils.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+BINUTILS_VERSION=$1
+
+
+export PREFIX=$2
+#export TARGET=x86_64-elf
+export TARGET=i686-elf
+export PATH="$PREFIX/bin:$PATH"
+
+cd $PREFIX/src
+mkdir build-binutils
+cd build-binutils
+../binutils-${BINUTILS_VERSION}/configure --target=$TARGET --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror
+make -j `nproc`
+make install
+
+cd $PREFIX/src
+#rm -rf build-binutils.sh binutils-${BINUTILS_VERSION}
+# rm -rf build-binutils

.devcontainer/files/src/build-gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+GCC_VERSION=$1
+
+export PREFIX=$2
+#export TARGET=x86_64-elf
+export TARGET=i686-elf
+export PATH="$PREFIX/bin:$PATH"
+
+cd $PREFIX/src/gcc-${GCC_VERSION}/gcc
+patch < config.gcc.patch
+
+cd $PREFIX/src
+mkdir build-gcc
+cd build-gcc
+../gcc-${GCC_VERSION}/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
+make -j `nproc` all-gcc
+make -j `nproc` all-target-libgcc
+make install-gcc
+make install-target-libgcc
+
+cd $PREFIX/src
+#rm -rf build-gcc.sh gcc-${GCC_VERSION}
+# rm -rf build-gcc

.devcontainer/files/supervisor/supervisord.conf

@@ -0,0 +1,46 @@
+[supervisord]
+nodaemon=true
+childlogdir=/home/osdev/supervisor/
+logfile=/home/osdev/supervisor/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+pidfile=/home/osdev/supervisor/supervisord.pid
+
+
+[inet_http_server]
+port=9001
+
+
+[program:novnc]
+priority=49
+command=/opt/noVNC/utils/novnc_proxy --vnc localhost:%(ENV_VNC_PORT)s --listen %(ENV_NO_VNC_PORT)s
+user=osdev
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:vncserver]
+priority=50
+command=/usr/bin/Xtigervnc %(ENV_DISPLAY)s -depth %(ENV_VNC_COL_DEPTH)s -geometry %(ENV_VNC_RESOLUTION)s -SecurityTypes None -localhost no
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:xfce4]
+priority=50
+command=/usr/bin/startxfce4
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+

.devcontainer/files/supervisor/websockify.conf

@@ -0,0 +1,8 @@
+[program:websockify]
+command=/usr/bin/python3 /opt/noVNC/utils/websockify/run --web /opt/noVNC/ ${NO_VNC_PORT} localhost:${VNC_PORT}
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0