Commit 6873fe87 authored by Dan Johansen's avatar Dan Johansen

Update readme

And rename create_zip to compress, since we are not actually using zip anymore.
Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent d9f998c8
......@@ -42,7 +42,7 @@ Run `sudo pacman -Syyu manjaro-strit-keyring && sudo pacman -S manjaro-arm-tools
* Create `/var/lib/manjaro-arm-tools/tmp` folder.
* Create `/var/cache/manjaro-arm-tools/img` folder.
* Create `/var/cache/manjaro-arm-tools/pkg` folder.
* Install `binfmt-qemu-static` package.
* Install `binfmt-qemu-static` package and make sure `systemd-binfmt` is running
# Usage
## buildarmpkg
......@@ -72,6 +72,7 @@ sudo buildarmpkg -p package -a any
The built packages will be copied to `$PKGDIR` as specified in `/usr/share/manjaro-arm-tools/lib/manjaro-arm-tools.conf` and placed in a subdirectory for the respective architecture.
Default package destination is `/var/cache/manjaro-arm-tools/pkg/`.
## deployarmpkg
This script is only for package maintainers of Manjaro-ARM.
......@@ -127,12 +128,12 @@ and remove the local files.
* mate
* xfce
* i3
* gnome (experimental
* gnome (experimental)
* cubocore (not complete yet)
* server (not complete yet, unmaintained)
This script will zip up the image file and place it in `/var/cache/manjaro-arm-tools/img/`
This script will compress the image file and place it in `/var/cache/manjaro-arm-tools/img/`
Profiles that gets used are on the [Gitlab.com](https://gitlab.com/Strit/arm-profiles) website, so they are easier to fork and create merge requests.
......@@ -203,7 +204,6 @@ This results in a .tar.gz file in /var/cache/manjaro-arm-tools/img/ that contain
## deployarmimg
This script will create checksums for and upload the newly generated image. It assumes you have upload access to our OSDN server.
If you don't, you can't use this.
PS: The torrents will not have a tracker, until Manjaro comes up with a solution. So torrents won't be useful untl that happens.
**Syntax**
......@@ -214,7 +214,7 @@ deployarmimg -i image [-d device] [-e edition] [-v version] -k email@server.org
To upload an image to the raspberry pi minimal 18.07 folder use with torrent:
```
deployarmimg -i Manjaro-ARM-minimal-rpi3-18.07.zip -d rpi3 -e minimal -v 18.07 -k email@server.org -t
deployarmimg -i Manjaro-ARM-minimal-rpi3-18.07.img.xz -d rpi3 -e minimal -v 18.07 -k email@server.org -t
```
## getarmprofiles
......
......@@ -87,8 +87,8 @@ echo "Please use buildarmoem instead!"
#if [[ "$EXTRACTED" = "true" ]]; then
#info "Image not compressed, because you supplied the -x option!"
#else
# Create the .zip file, from the .img file which will get deleted.
#create_zip
# Create the compressed file, from the .img file which will get deleted.
#compress
#fi
# show timer
#show_elapsed_time "${FUNCNAME}" "${timer_start}"
......@@ -79,8 +79,8 @@ create_img
if [[ "$EXTRACTED" = "true" ]]; then
info "Image not compressed, because you supplied the -x option!"
else
# Create the .zip file, from the .img file which will get deleted.
create_zip
# Create the compressed file, from the .img file which will get deleted.
compress
fi
# show timer
......
......@@ -87,8 +87,8 @@ create_img
if [[ "$EXTRACTED" = "true" ]]; then
info "Image not compressed, because you supplied the -x option!"
else
# Create the .zip file, from the .img file which will get deleted.
create_zip
# Create the compressed file, from the .img file which will get deleted.
compress
fi
# show timer
......
......@@ -88,7 +88,7 @@ create_mobilefs
if [[ "$EXTRACTED" = "true" ]]; then
info "Image not compressed, because you supplied the -x option!"
else
# Create the .zip file, from the .img file which will get deleted.
# Create the compressed file, from the .img file which will get deleted.
compress_rootfs
fi
......
......@@ -913,9 +913,9 @@ create_img() {
chmod 666 $IMGDIR/$IMGNAME.img
}
create_zip() {
compress() {
info "Compressing $IMGNAME.img..."
#zip img
#compress img
cd $IMGDIR
xz -zv --threads=0 $IMGNAME.img
chmod 666 $IMGDIR/$IMGNAME.img.xz
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment