From 5684607fceb8069658a276543da48bc8e37b6dcd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Feb 2015 14:00:15 +0100 Subject: mkrootfs: generate rpi2 tarballs with a proper name. --- mkrootfs.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mkrootfs.sh.in') diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index 7f1a20d..2300283 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -121,12 +121,14 @@ done shift $(($OPTIND - 1)) PLATFORM="$1" +SUBPLATFORM=$PLATFORM if [ -z "$PLATFORM" ]; then echo "$PROGNAME: platform was not set!" usage; exit 1 fi + case "$PLATFORM" in bananapi) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; beaglebone) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; @@ -135,7 +137,7 @@ case "$PLATFORM" in i686-musl) _ARCH="i686-musl"; QEMU_BIN=qemu-i386-static;; odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; rpi) _ARCH="armv6l"; QEMU_BIN=qemu-arm-static;; - rpi2) PLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; + rpi2) SUBPLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; x86_64) _ARCH="x86_64"; QEMU_BIN=qemu-x86_64-static;; x86_64-musl) _ARCH="x86_64-musl"; QEMU_BIN=qemu-x86_64-static;; *) die "$PROGNAME: invalid platform!";; @@ -172,7 +174,7 @@ chmod 755 $rootfs case "$PLATFORM" in i686*|x86_64*) PKGS="${PKGBASE} grub" ;; - *) PKGS="${PKGBASE} ${PLATFORM}-base" ;; + *) PKGS="${PKGBASE} ${SUBPLATFORM}-base" ;; esac [ -n "$EXTRA_PKGS" ] && PKGS="${PKGS} ${EXTRA_PKGS}" -- cgit 1.4.1