Verified Commit 5064885a authored by Dan Johansen's avatar Dan Johansen
Browse files

[buildarmpkg] use provided pacstrap script instead of basestrap from...

[buildarmpkg] use provided pacstrap script instead of basestrap from manjaro-tools-base. Also update readme with a couple of new devices and editions.
parent f6d846ca
......@@ -12,7 +12,6 @@ Check the [Issues](
## Dependencies
These scripts rely on certain packages, other than what's in the `base` package group, to be able to function. These packages are:
* parted (arch repo)
* manjaro-tools-base (manjaro repo)
* libarchive (arch repo)
* git (arch repo)
* binfmt-user-static (AUR) or manjaro-arm-qemu-static (manjaro repo)
......@@ -81,7 +80,9 @@ Default package destination is `/var/cache/manjaro-arm-tools/pkg/`.
## buildarmimg
**Supported devices:**
* edgev
* nanopc-t4
* nanopi-neo-plus2
* oc2
* oc4
* on2
......@@ -111,6 +112,8 @@ Default package destination is `/var/cache/manjaro-arm-tools/pkg/`.
* i3
* sway
* gnome (experimental)
* plasma-mobile (experimental)
* phosh (experimental)
* cubocore (not complete yet)
* server (not complete yet, unmaintained)
......@@ -160,7 +160,7 @@ create_rootfs_pkg() {
mkdir -p $BUILDDIR/$ARCH
# basescrap the rootfs filesystem
sed -i s/"arm-stable"/"$BRANCH"/g $LIBDIR/pacman.conf.$ARCH
basestrap -G -C $LIBDIR/pacman.conf.$ARCH $BUILDDIR/$ARCH base-devel
$LIBDIR/pacstrap -G -M -C $LIBDIR/pacman.conf.$ARCH $BUILDDIR/$ARCH base-devel
sed -i s/"Branch = arm-stable"/"Branch = $BRANCH"/g $BUILDDIR/$ARCH/etc/pacman-mirrors.conf
echo "Server = $BUILDSERVER/$BRANCH/\$repo/\$arch" > $BUILDDIR/$ARCH/etc/pacman.d/mirrorlist
sed -i s/"$BRANCH"/"arm-stable"/g $LIBDIR/pacman.conf.$ARCH
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