diff --git a/bootstrap.sh b/bootstrap.sh index fa59f6c..9750968 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -171,7 +171,10 @@ freebsd() install_freebsd_pkg "wget" install_freebsd_pkg "texinfo" install_freebsd_pkg "python" - install_freebsd_pkg "sha256sum" + install_freebsd_pkg "automake" + install_freebsd_pkg "gettext" + install_freebsd_pkg "bison" + install_freebsd_pkg "gperf" set +xe } @@ -548,6 +551,7 @@ boot() MAKE="make" if [[ "$(uname)" -eq FreeBSD ]]; then MAKE="gmake" + echo "kldload fuse.ko # This loads the kernel module for fuse" fi echo "$MAKE all" echo "$MAKE virtualbox or qemu" diff --git a/config/desktop.toml b/config/desktop.toml index cfa80e9..3597545 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -86,7 +86,7 @@ logd = {} #ncursesw = {} netdb = {} netstack = {} -netsurf = {} +#netsurf = {} netutils = {} #neverball = {} #newlib = {} diff --git a/cookbook b/cookbook index 50c3f86..5097c70 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 50c3f8642cce2f541da9854a8e2c3bf677604269 +Subproject commit 5097c70245514908477c1d032f7399390c089292 diff --git a/mk/config.mk b/mk/config.mk index 5140291..ac4b113 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -15,18 +15,21 @@ UNAME := $(shell uname) ifeq ($(UNAME),Darwin) FUMOUNT=sudo umount export NPROC=sysctl -n hw.ncpu + export REDOX_MAKE=make PREFIX_BINARY=0 VB_AUDIO=coreaudio VBM=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage else ifeq ($(UNAME),FreeBSD) FUMOUNT=sudo umount export NPROC=sysctl -n hw.ncpu + export REDOX_MAKE=gmake PREFIX_BINARY=0 VB_AUDIO=pulse # To check, will probaly be OSS on most setups VBM=VBoxManage else FUMOUNT=fusermount -u export NPROC=nproc + export REDOX_MAKE=make VB_AUDIO=pulse VBM=VBoxManage endif diff --git a/mk/qemu.mk b/mk/qemu.mk index d325894..462c2b5 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -45,8 +45,13 @@ endif #,int,pcall #-device intel-iommu +ifeq ($(UNAME),Linux) build/extra.bin: fallocate --posix --length 1G $@ +else +build/extra.bin: + truncate -s 1g $@ +endif qemu: build/harddrive.bin build/extra.bin $(QEMU) $(QEMUFLAGS) \