diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2024-05-16 18:52:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 18:52:36 +0200 |
| commit | 59d19a8b539801b0b0ed614f343f12d22a762f07 (patch) | |
| tree | 0d972c9f9c3c1dc84696b474cd2c82bd63dd38fd | |
| parent | 0ff334c7e0cfa4b66404831e15ef846ccbf47144 (diff) | |
| parent | ab653555f6aa0ec57e1b23a590fb3061929fdc30 (diff) | |
| download | NorthstarLauncher-59d19a8b539801b0b0ed614f343f12d22a762f07.tar.gz NorthstarLauncher-59d19a8b539801b0b0ed614f343f12d22a762f07.zip | |
Merge branch 'main' into feat/whitelist-safeio-file-extensions
| -rw-r--r-- | BUILD.md | 12 | ||||
| -rw-r--r-- | primedev/plugins/plugins.cpp | 8 |
2 files changed, 15 insertions, 5 deletions
@@ -40,7 +40,7 @@ Developers who can work a command line may be interested in using [Visual Studio - Run `cmake . -G "Ninja"` to generate build files. - Run `cmake --build .` to build the project. - + ## Linux ### Steps 1. Clone the GitHub repo @@ -49,3 +49,13 @@ Developers who can work a command line may be interested in using [Visual Studio * `docker build --rm -t northstar-build-fedora .` * `docker run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build northstar-build-fedora cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Windows -G "Ninja"` * `docker run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build northstar-build-fedora cmake --build .` + +#### Podman + +When using [`podman`](https://podman.io/) instead of Docker on an SELinux enabled distro, make sure to add the `z` flag when mounting the directory to correctly label it to avoid SELinux denying access. + +As such the corresponding commands are + +* `podman build --rm -t northstar-build-fedora .` +* `podman run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build,z northstar-build-fedora cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Windows -G "Ninja"` +* `podman run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build,z northstar-build-fedora cmake --build .` diff --git a/primedev/plugins/plugins.cpp b/primedev/plugins/plugins.cpp index eddaa8ac..ae6fd0cb 100644 --- a/primedev/plugins/plugins.cpp +++ b/primedev/plugins/plugins.cpp @@ -69,10 +69,6 @@ Plugin::Plugin(std::string path) : m_location(path) m_runOnServer = context & PluginContext::DEDICATED; m_runOnClient = context & PluginContext::CLIENT; - m_name = std::string(name); - m_logName = std::string(logName); - m_dependencyName = std::string(dependencyName); - if (!name) { NS::log::PLUGINSYS->error("Could not load name of plugin at '{}'", path); @@ -91,6 +87,10 @@ Plugin::Plugin(std::string path) : m_location(path) return; } + m_name = std::string(name); + m_logName = std::string(logName); + m_dependencyName = std::string(dependencyName); + if (!isValidSquirrelIdentifier(m_dependencyName)) { NS::log::PLUGINSYS->error("Dependency name \"{}\" of plugin {} is not valid", dependencyName, name); |