Merge branch 'master' into actions-test

build.sh

@@ -2,4 +2,5 @@
 
 cd ../buildroot || exit
 core_count=$(grep -c   "^processor" /proc/cpuinfo)
+make -j "$core_count"
 make -j "$core_count"

package/byondvm-controller/0001-Adds-optimizations-to-the-profile.patch

@@ -12,9 +12,9 @@ index c19308e..5aed987 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -14,3 +14,8 @@ tokio = { version = "1", features = ["full"] }
- strum = "0.23"
- strum_macros = "0.23"
- phf = { version = "0.10", features = ["macros"] }
+ strum = "0.24"
+ strum_macros = "0.24"
+ phf = { version = "0.11", features = ["macros"] }
 +
 +[profile.release]
 +lto = true

package/byondvm-controller/byondvm-controller.hash

@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 144693e8c4a01b68f0449dae344b09cb325e2b4098f6645f4b2beaef5194f58d  byondvm-controller-v1.0.0.tar.gz
+sha256 d09600274ffdbbf620f31ebfa78e8d9c57f27ae46925ba2ff107580d13fcec33 byondvm-controller-v1.1.1.tar.gz

package/byondvm-controller/byondvm-controller.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BYONDVM_CONTROLLER_VERSION = v1.0.0
+BYONDVM_CONTROLLER_VERSION = v1.1.1
 BYONDVM_CONTROLLER_SITE = $(call github,spacestation13,dm-playground_controller,$(BYONDVM_CONTROLLER_VERSION))
 BYONDVM_CONTROLLER_LICENSE = ISC
 

setup.sh

@@ -11,13 +11,13 @@ mkdir temp
 wget https://buildroot.org/downloads/buildroot-2022.05.1.tar.gz -O temp/buildroot.tar.gz
 tar -xvf temp/buildroot.tar.gz
 rm temp/buildroot.tar.gz
-mv temp/buildroot-* ../buildroot
+mv buildroot-* ../buildroot
 rmdir temp
 
 #Setup symlink
-ln -s ../byondvm ../buildroot/byondvm
+ln -s "$(pwd)" ../buildroot/byondvm
 
 #Load default config and do initial build
 cd ../buildroot || exit
 make defconfig byondvm_defconfig BR2_EXTERNAL=byondvm
-./build.sh
+./byondvm/build.sh