From 57c6107be3cc7419a032f38829d9ddb23496ebc7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 14 Jan 2017 18:41:15 +0100 Subject: [PATCH] mkrootfs.sh.in/mkimage.sh.in: add rpi3. --- mkimage.sh.in | 2 +- mkrootfs.sh.in | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mkimage.sh.in b/mkimage.sh.in index 88f46c4..f288063 100644 --- a/mkimage.sh.in +++ b/mkimage.sh.in @@ -113,7 +113,7 @@ fi # double check PLATFORM is supported... case "$PLATFORM" in - bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|usbarmory|*-musl);; + bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|usbarmory|*-musl);; *) die "The $PLATFORM is not supported, exiting..." esac diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index 6817a96..17b3245 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -47,7 +47,9 @@ Usage: $PROGNAME [options] Supported platforms: i686, i686-musl, x86_64, x86_64-musl, dockstar, bananapi, beaglebone, cubieboard2, cubietruck, - odroid-c2, odroid-u2, rpi, rpi2 (armv7), usbarmory, ci20 + odroid-c2, odroid-u2, rpi, rpi2 (armv7), rpi3 (aarch64), + usbarmory, ci20 + Options -b Set an alternative base-system package (defaults to base-system) @@ -139,6 +141,8 @@ case "$PLATFORM" in dockstar) _TARGET_ARCH="armv5tel"; _ARCH="armv5tel";; rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";; rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";; + rpi3-musl) _TARGET_ARCH="aarch64-musl"; _ARCH="aarch64";; + rpi3) _TARGET_ARCH="aarch64"; _ARCH="aarch64";; ci20-musl) _TARGET_ARCH="mipselhf-musl"; _ARCH="mipsel-musl";; ci20) _TARGET_ARCH="mipselhf"; _ARCH="mipsel";; odroid-c2-musl) _TARGET_ARCH="aarch64-musl"; _ARCH="aarch64";; @@ -147,7 +151,7 @@ case "$PLATFORM" in *) _TARGET_ARCH="armv7l"; _ARCH="armv7l";; esac -: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current} +: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://repo.voidlinux.eu/current/musl --repository=http://repo.voidlinux.eu/current/aarch64} : ${XBPS_CACHEDIR:=--cachedir=$PWD/xbps-cachedir-${_TARGET_ARCH}} case "$PLATFORM" in i686*|x86_64*) PKGBASE="base-voidstrap";; @@ -166,6 +170,7 @@ case "$PLATFORM" in cubieboard2*|cubietruck*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;; dockstar*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;; odroid-u2*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;; + rpi3*) SUBPLATFORM=rpi3; QEMU_BIN=qemu-aarch64-static;; rpi2*) SUBPLATFORM=rpi; QEMU_BIN=qemu-arm-static;; rpi*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;; usbarmory*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;