From: Nadav Har'El <n...@scylladb.com>
Committer: GitHub <nore...@github.com>
Branch: master
Merge pull request #915 from problame/patch-1
README: Arch Linux: dependencies, lua + openssl-1.0, python3
---
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -50,7 +50,24 @@ apt-get install build-essential libboost-all-dev
genromfs autoconf libtool openj
**Arch Linux**
```
-pacman -S base-devel git python apache-ant maven qemu gdb boost yaml-cpp
+pacman -S base-devel git python apache-ant maven qemu gdb boost yaml-cpp
unzip openssl-1.0
+```
+
+Apply the following patch to make it work with openssl-1.0
+```
+diff --git a/modules/lua/Makefile b/modules/lua/Makefile
+index 9676f349..ddb6a075 100644
+--- a/modules/lua/Makefile
++++ b/modules/lua/Makefile
+@@ -123,7 +123,7 @@ $(CDIR)/ssl.lua: $(LUA_ROCKS_BIN)
+
+ # Workaround because LuaRocks ignores /lib64
+ ifneq ("$(wildcard /usr/lib64/libssl.so*)", "")
+- out/bin/luarocks install LuaSec 0.5 OPENSSL_LIBDIR=/usr/lib64
++ out/bin/luarocks install LuaSec 0.5
OPENSSL_LIBDIR=/usr/lib/openssl-1.0 OPENSSL_INCDIR=/usr/include/openssl-1.0
+ else
+ out/bin/luarocks install LuaSec 0.5
+ endif
```
Before start building OSv, you'll need to add your account to kvm group.
diff --git a/scripts/upload_manifest.py b/scripts/upload_manifest.py
--- a/scripts/upload_manifest.py
+++ b/scripts/upload_manifest.py
@@ -8,6 +8,7 @@
# This works on Python 2
StringIO = StringIO.StringIO
except ImportError:
+ import io
# This works on Python 3
StringIO = io.StringIO
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
