summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Kryszyn <j.kryszyn@samsung.com>2023-08-21 16:01:07 +0200
committerJacek Kryszyn <j.kryszyn@samsung.com>2023-08-21 16:01:07 +0200
commit6d09d75c481f8149009f3e26e352da5b945fe4f2 (patch)
tree7c85dfbccf7ba0a9f4a016821f35c3c5a4ca8a97
parentad62a14c88e8f7ad7044bd64841f33369c0e6ff2 (diff)
parentcaeaf2b26983e18245146d2368c5718f08a21729 (diff)
downloaddynpart-tools-6d09d75c481f8149009f3e26e352da5b945fe4f2.tar.gz
dynpart-tools-6d09d75c481f8149009f3e26e352da5b945fe4f2.tar.bz2
dynpart-tools-6d09d75c481f8149009f3e26e352da5b945fe4f2.zip
Merge branch 'main' of github.sec.samsung.net:j-kryszyn/partition_tools
-rw-r--r--.gitignore5
-rwxr-xr-xREADME.md10
2 files changed, 14 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6345e0c..128efc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
bin/
.project
.vscode/
+<<<<<<< HEAD
build/
+=======
+*.o
+/lib/lib
+>>>>>>> caeaf2b26983e18245146d2368c5718f08a21729
diff --git a/README.md b/README.md
index 492d13a..9ecaf12 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,15 @@ Original project: https://github.com/LonelyFool/lpunpack_and_lpmake
Copied from commit 7ec860cfa95ed83dec579ab0459aad1c35ad48e4
# lpunpack and lpmake
-To cross-compile you need `crossbuild-essential-arm64`/`crossbuild-essential-armel`/`crossbuild-essential-armhf` (sudo apt install $package).
+To compile x86_64 you need:
+- clang (sudo apt install clang)
+- zlib (sudo apt install zlib1g-dev)
+
+To cross-compile you need:
+- Ubuntu 22.04: `crossbuild-essential-arm64`/`crossbuild-essential-armel`/`crossbuild-essential-armhf` (sudo apt install $package).
+- Ubuntu 20.04: `sudo apt install gcc-10-aarch64-linux-gnu` and `sudo apt install g++-aarch64-linux-gnu`
+
+On Ubuntu 20.04 `crossbuild-essential-arm64`` uses gcc 9.x which gives an internal error during build. This is why gcc-10 version has to be installed explicitly.
``
build: