Merge branch 'main' of github.sec.samsung.net:j-kryszyn/partition_tools

diff --cc .gitignore
index 6345e0c270e7da52bbd2c16eda327ef7a91607cb,eae354e37ad15cc90a13351ba99fe2b253ba738e..128efc21ce41761925112c3d8af2074cb2fb40bd
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,9 @@@
  bin/
  .project
  .vscode/
++<<<<<<< HEAD
 +build/
++=======
+ *.o
+ /lib/lib
++>>>>>>> caeaf2b26983e18245146d2368c5718f08a21729

diff --cc README.md
index 492d13a6122773f98bee5a5d68188dbad481c202,cc56b56fa0541f064466697991d4b860f9d20961..9ecaf1211bd19a8facadadb1ebb51490dff0035a
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,22 -1,23 +1,30 @@@
 +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.
 -
++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:
 -./make.sh $ARCH
  
 -where $ARCH:
 -- x86_64 (default, can be ommited)
 -- i686
 -- arm7hf
 -- arm7vl (though it doesn't compile for now)
 -- aarch64
 +```
 +mkdir build
 +cd build
 +cmake ../
 +make
 +
 +```
 +
 +or you can use original makefile:
  
 -source code from aosp
 +```
 +make
 +```