From b1a1ff59e8ef2ad88df6a9332470d84fd0663922 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 1 Mar 2015 23:40:33 +0100 Subject: [PATCH] rootfsinstall: fixes for dual rpi/rpi2 support --- src/rootfsinstall.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh index d57f3b5..cc1dc56 100755 --- a/src/rootfsinstall.sh +++ b/src/rootfsinstall.sh @@ -159,7 +159,7 @@ case $TARGETDEVICE in BOOTFSSIZE=40M BOOTFSSTART=0 [ "$USEKERNEL" ] || USEKERNEL="zImage-*-rpi" - [ "$USEKERNEL2" ] || USEKERNEL="zImage-*-rpi2" + [ "$USEKERNEL2" ] || USEKERNEL2="zImage-*-rpi2" KERNELDEST="@BOOT@/kernel.img" KERNELDEST2="@BOOT@/kernel7.img" INSTALLPACKAGES="kernel-rpi kernel-rpi-modules raspberrypi-firmware \ @@ -322,7 +322,8 @@ fi if [ "$INSTALLPACKAGES" ]; then mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall cp /etc/resolv.conf $ROOTMP/etc/resolv.conf - chroot $ROOTMP smart channel --enable devel-kernel + chroot $ROOTMP bash -c /etc/profile.d/gpg-key-openmamba.sh + #chroot $ROOTMP smart channel --enable devel-kernel chroot $ROOTMP smart update || { echo "ERROR: error running chroot command 'smart update'; aborting." exit 1 @@ -331,7 +332,7 @@ if [ "$INSTALLPACKAGES" ]; then echo "ERROR: error running chroot command 'smart install $INSTALLPACKAGES'; aborting." exit 1 } - chroot $ROOTMP smart channel --disable devel-kernel + #chroot $ROOTMP smart channel --disable devel-kernel mv $ROOTMP/etc/resolv.conf.rootfsinstall $ROOTMP/etc/resolv.conf fi @@ -357,7 +358,7 @@ _EOF elif [ "$TARGETDEVICE" = "rpi" ]; then # fetch and install firmware files if missing RPI_FIRMWARE_FILES="bootcode.bin fixup_x.dat start_x.elf \ - bcm2708-rpi-b-plus.dtb bcm2708-rpi-b-plus.dtb bcm2709-rpi-2-b.dtb" + bcm2708-rpi-b.dtb bcm2708-rpi-b-plus.dtb bcm2709-rpi-2-b.dtb" for f in $RPI_FIRMWARE_FILES; do if [ -e $ROOTMP/boot/$f ]; then cp $ROOTMP/boot/$f $BOOTMP/$f