From 30a1e0961e20810f410f119b64685a2e2abb7a53 Mon Sep 17 00:00:00 2001 From: l0rem1psum Date: Tue, 23 May 2023 22:28:24 +0000 Subject: [PATCH 1/3] update dependencies described in docs Signed-off-by: l0rem1psum --- README.md | 6 ++++-- Vagrantfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4641daaa..b38e8074 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,8 @@ $ sudo apt-get install \ build-essential \ libelf-dev \ libseccomp-dev \ - libclang-dev + libclang-dev \ + libssl-devel ``` ### Fedora, Centos, RHEL and related distributions @@ -165,7 +166,8 @@ $ sudo dnf install \ dbus-devel \ elfutils-libelf-devel \ libseccomp-devel \ - clang-devel + clang-devel \ + openssl-devel ``` ## Build diff --git a/Vagrantfile b/Vagrantfile index ea371889..a5c8dfe4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL set -e -u -o pipefail yum update -y - yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel + yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel wget openssl-devel grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0" service docker start SHELL From 830e4af0c537cd64b287e900e37e2dbbbb6db689 Mon Sep 17 00:00:00 2001 From: l0rem1psum Date: Wed, 24 May 2023 16:36:15 +0800 Subject: [PATCH 2/3] fix Ubuntu OpenSSL package name in README and update docs to reflect changes Signed-off-by: l0rem1psum --- README.md | 32 ++++++++++++++++---------------- Vagrantfile.root | 3 +-- docs/src/user/basic_setup.md | 32 +++++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index b38e8074..f2f268f3 100644 --- a/README.md +++ b/README.md @@ -146,27 +146,27 @@ For other platforms, please use the [Vagrantfile](#setting-up-vagrant) that we h ### Debian, Ubuntu and related distributions ```console -$ sudo apt-get install \ - pkg-config \ - libsystemd-dev \ - libdbus-glib-1-dev \ - build-essential \ - libelf-dev \ - libseccomp-dev \ - libclang-dev \ - libssl-devel +$ sudo apt-get install \ + pkg-config \ + libsystemd-dev \ + libdbus-glib-1-dev \ + build-essential \ + libelf-dev \ + libseccomp-dev \ + libclang-dev \ + libssl-dev ``` -### Fedora, Centos, RHEL and related distributions +### Fedora, CentOS, RHEL and related distributions ```console -$ sudo dnf install \ - pkg-config \ - systemd-devel \ - dbus-devel \ +$ sudo dnf install \ + pkg-config \ + systemd-devel \ + dbus-devel \ elfutils-libelf-devel \ - libseccomp-devel \ - clang-devel \ + libseccomp-devel \ + clang-devel \ openssl-devel ``` diff --git a/Vagrantfile.root b/Vagrantfile.root index e44047f9..0598bdc8 100644 --- a/Vagrantfile.root +++ b/Vagrantfile.root @@ -14,7 +14,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL set -e -u -o pipefail yum update -y - yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel + yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel wget openssl-devel grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0" service docker start curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y @@ -23,4 +23,3 @@ Vagrant.configure("2") do |config| config.ssh.username = 'root' config.ssh.insert_key = 'true' end - diff --git a/docs/src/user/basic_setup.md b/docs/src/user/basic_setup.md index 3f3f9d73..5860da84 100644 --- a/docs/src/user/basic_setup.md +++ b/docs/src/user/basic_setup.md @@ -17,26 +17,28 @@ To compile and run, Youki itself depends on some underlying libraries being inst #### Debian, Ubuntu and related distributions ```console -$ sudo apt-get install \ - pkg-config \ - libsystemd-dev \ - libdbus-glib-1-dev \ - build-essential \ - libelf-dev \ - libseccomp-dev \ - libclang-dev +$ sudo apt-get install \ + pkg-config \ + libsystemd-dev \ + libdbus-glib-1-dev \ + build-essential \ + libelf-dev \ + libseccomp-dev \ + libclang-dev \ + libssl-dev ``` -#### Fedora, Centos, RHEL and related distributions +#### Fedora, CentOS, RHEL and related distributions ```console -$ sudo dnf install \ - pkg-config \ - systemd-devel \ - dbus-devel \ +$ sudo dnf install \ + pkg-config \ + systemd-devel \ + dbus-devel \ elfutils-libelf-devel \ - libseccomp-devel \ - clang-devel + libseccomp-devel \ + clang-devel \ + openssl-devel ``` --- From 9e6dd548db0fd58e67814bb4205a73437de7f832 Mon Sep 17 00:00:00 2001 From: l0rem1psum Date: Wed, 24 May 2023 17:20:13 +0800 Subject: [PATCH 3/3] add missing dependencies in Vagrantfile Signed-off-by: l0rem1psum --- Vagrantfile | 2 +- Vagrantfile.root | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index a5c8dfe4..7e68fc9f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL set -e -u -o pipefail yum update -y - yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel wget openssl-devel + yum install -y git gcc docker wget pkg-config systemd-devel dbus-devel elfutils-libelf-devel libseccomp-devel clang-devel openssl-devel grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0" service docker start SHELL diff --git a/Vagrantfile.root b/Vagrantfile.root index 0598bdc8..8a622e27 100644 --- a/Vagrantfile.root +++ b/Vagrantfile.root @@ -14,7 +14,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL set -e -u -o pipefail yum update -y - yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel wget openssl-devel + yum install -y git gcc docker wget pkg-config systemd-devel dbus-devel elfutils-libelf-devel libseccomp-devel clang-devel openssl-devel grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0" service docker start curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y