From 9ae9ba00413e3bc08997b39e4debaface9b49e13 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 25 Mar 2022 19:10:20 +0100 Subject: [PATCH] Disabled building the linux x86 templates with the build all script, as fedora seems to be having some issues installing libstdc++.i686 right now. --- misc/build-containers/build_containers.sh | 2 ++ misc/build-containers/podman_build_all.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/misc/build-containers/build_containers.sh b/misc/build-containers/build_containers.sh index c63cee7cc..470b0491e 100755 --- a/misc/build-containers/build_containers.sh +++ b/misc/build-containers/build_containers.sh @@ -17,6 +17,8 @@ export podman_build="$podman build --build-arg img_version=${img_version}" $podman build -v ${files_root}:/root/files -t pandemonium-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log $podman_build -t pandemonium-linux:${img_version} -f Dockerfile.linux . 2>&1 | tee logs/linux.log +#Todo, fedora has some issues installing libstdc++;.i686 right now +#$podman_build -t pandemonium-linux32:${img_version} -f Dockerfile.linux32 . 2>&1 | tee logs/linux32.log $podman_build -t pandemonium-windows:${img_version} -f Dockerfile.windows --ulimit nofile=65536 . 2>&1 | tee logs/windows.log $podman_build -t pandemonium-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log $podman_build -t pandemonium-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log diff --git a/misc/build-containers/podman_build_all.sh b/misc/build-containers/podman_build_all.sh index c58332257..6b479a505 100755 --- a/misc/build-containers/podman_build_all.sh +++ b/misc/build-containers/podman_build_all.sh @@ -40,8 +40,8 @@ rm -f modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/linux_ed_64.log rm -f modules/modules_enabled.gen.h # Linux editor 32 bit -$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_ed_32.log -rm -f modules/modules_enabled.gen.h +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_ed_32.log +#rm -f modules/modules_enabled.gen.h # Linux templates 64 bit $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/linux_template_rd_64.log @@ -50,10 +50,10 @@ $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux: rm -f modules/modules_enabled.gen.h # Linux templates 32 bit -$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_template_rd_32.log -rm -f modules/modules_enabled.gen.h -$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_template_r_32.log -rm -f modules/modules_enabled.gen.h +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_template_rd_32.log +#rm -f modules/modules_enabled.gen.h +#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/linux_template_r_32.log +#rm -f modules/modules_enabled.gen.h # Linux headless (editor) 64bit $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 -j4 . 2>&1 | tee logs/headless.log