diff --git a/scripts/log_wrapper.sh b/scripts/log_wrapper.sh index 8da76fae7e..16e871210a 100755 --- a/scripts/log_wrapper.sh +++ b/scripts/log_wrapper.sh @@ -15,5 +15,5 @@ if [ $sessionCreated -eq 0 ]; then lttng destroy msquic babeltrace --names all $dirname/data > $dirname/quic.babel.txt - ./submodules/clog/src/clog2text/clog2text_lttng/bin/Release/net6.0/publish/clog2text_lttng -i $dirname/quic.babel.txt -s ./src/manifest/clog.sidecar -o $dirname/quic.log --showTimestamp --showCpuInfo + ./submodules/clog/src/clog2text/clog2text_lttng/bin/Debug/net6.0/publish/clog2text_lttng -i $dirname/quic.babel.txt -s ./src/manifest/clog.sidecar -o $dirname/quic.log --showTimestamp --showCpuInfo fi diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index 738cf476c8..8b5eb8810a 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -459,7 +459,23 @@ function Install-DotnetTool { } } +function Install-Dotnet { + if (!$IsLinux) { + Write-Host "Linux only" + } + + Write-Host "Installing dotnet" + # known issue https://learn.microsoft.com/en-us/dotnet/core/install/linux-package-mixup?pivots=os-linux-ubuntu + sudo bash -c "echo 'Package: dotnet* aspnet* netstandard*' >> /etc/apt/preferences" + sudo bash -c "echo 'Pin: origin packages.microsoft.com' >> /etc/apt/preferences" + sudo bash -c "echo 'Pin-Priority: -10' >> /etc/apt/preferences" + sudo apt-get update -y + sudo apt-get install dotnet-sdk-6.0 aspnetcore-runtime-6.0 dotnet-runtime-6.0 +} + function Install-Clog2Text { + Install-Dotnet + Write-Host "Initializing clog submodule" git submodule init $RootDir/submodules/clog git submodule update