diff --git a/Containerfile.jp b/Containerfile.jp index ea7b0ce..69d8d50 100644 --- a/Containerfile.jp +++ b/Containerfile.jp @@ -27,7 +27,6 @@ ARG RECIPE=recipe-framework-13.yml # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). COPY usr/ /usr COPY ${USER_DIR}/ /usr -RUN ls /usr # Copy the recipe that we're building. COPY ${RECIPE} /usr/share/ublue-os/recipe.yml diff --git a/recipe-desktop.yml b/recipe-desktop.yml index d089320..ff120e4 100644 --- a/recipe-desktop.yml +++ b/recipe-desktop.yml @@ -12,6 +12,7 @@ scripts: - setup-selinux-dockersock.sh - autorun.sh - setup-desktop-audio.sh + - install-codelldb.sh rpm: # A list of urls of ".repo" files that should be added to your system. # This is the proper way to add custom COPR repos to your image. diff --git a/recipe-framework-13.yml b/recipe-framework-13.yml index 4188760..3eaac8f 100644 --- a/recipe-framework-13.yml +++ b/recipe-framework-13.yml @@ -12,6 +12,7 @@ scripts: - setup-selinux-dockersock.sh - autorun.sh - setup-framework-13.sh + - install-codelldb.sh rpm: # A list of urls of ".repo" files that should be added to your system. # This is the proper way to add custom COPR repos to your image. diff --git a/scripts/install-codelldb.sh b/scripts/install-codelldb.sh new file mode 100644 index 0000000..31bcb0b --- /dev/null +++ b/scripts/install-codelldb.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -euo pipefail + +cd /usr/bin/ + +curl -L "https://github.com/vadimcn/vscode-lldb/releases/download/v1.7.0/codelldb-x86_64-linux.vsix" -o "codelldb-x86_64-linux.zip" + +unzip "codelldb-x86_64-linux.zip" "extension/adapter/*" "extension/lldb/*" + +rm -f "codelldb-x86_64-linux.zip" + +mv extension/ codelldb_adapter + +ln -s $(pwd)/codelldb_adapter/adapter/codelldb /usr/bin/codelldb + +codelldb -h > /dev/null \ No newline at end of file diff --git a/usr-jp/local/etc/lldb_vscode_rustc_primer.py b/usr-jp/local/etc/lldb_vscode_rustc_primer.py deleted file mode 100644 index b808b84..0000000 --- a/usr-jp/local/etc/lldb_vscode_rustc_primer.py +++ /dev/null @@ -1,12 +0,0 @@ -import subprocess -import pathlib -import lldb - -# determine the sysroot for the active rust interpreter -rustlib_etc = pathlib.Path(subprocess.getoutput('rustc --print sysroot')) / 'lib' / 'rustlib' / 'etc' -if not rustlib_etc.exists(): - raise RuntimeError('Unable to determine rustc sysroot') - -# load lldb_lookup.py and execute lldb_commands with the correct path -lldb.debugger.HandleCommand(f"""command script import "{rustlib_etc / 'lldb_lookup.py'}" """) -lldb.debugger.HandleCommand(f"""command source -s 0 "{rustlib_etc / 'lldb_commands'}" """) \ No newline at end of file