openmamba/usbinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rootfsinstall: fixes for dual rpi/rpi2 support

Browse Source
This commit is contained in:
Silvan Calarco 2015-03-01 23:40:33 +01:00
parent 74b2fad4e0
commit b1a1ff59e8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rootfsinstall.sh
View File

@ -159,7 +159,7 @@ case $TARGETDEVICE in
BOOTFSSIZE=40M BOOTFSSIZE=40M
BOOTFSSTART=0 BOOTFSSTART=0
[ "$USEKERNEL" ] || USEKERNEL="zImage-*-rpi" [ "$USEKERNEL" ] || USEKERNEL="zImage-*-rpi"
[ "$USEKERNEL2" ] || USEKERNEL="zImage-*-rpi2" [ "$USEKERNEL2" ] || USEKERNEL2="zImage-*-rpi2"
KERNELDEST="@BOOT@/kernel.img" KERNELDEST="@BOOT@/kernel.img"
KERNELDEST2="@BOOT@/kernel7.img" KERNELDEST2="@BOOT@/kernel7.img"
INSTALLPACKAGES="kernel-rpi kernel-rpi-modules raspberrypi-firmware \ INSTALLPACKAGES="kernel-rpi kernel-rpi-modules raspberrypi-firmware \
@ -322,7 +322,8 @@ fi
if [ "$INSTALLPACKAGES" ]; then if [ "$INSTALLPACKAGES" ]; then
mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall
cp /etc/resolv.conf $ROOTMP/etc/resolv.conf 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 || { chroot $ROOTMP smart update || {
echo "ERROR: error running chroot command 'smart update'; aborting." echo "ERROR: error running chroot command 'smart update'; aborting."
exit 1 exit 1
@ -331,7 +332,7 @@ if [ "$INSTALLPACKAGES" ]; then
echo "ERROR: error running chroot command 'smart install $INSTALLPACKAGES'; aborting." echo "ERROR: error running chroot command 'smart install $INSTALLPACKAGES'; aborting."
exit 1 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 mv $ROOTMP/etc/resolv.conf.rootfsinstall $ROOTMP/etc/resolv.conf
fi fi
@ -357,7 +358,7 @@ _EOF
elif [ "$TARGETDEVICE" = "rpi" ]; then elif [ "$TARGETDEVICE" = "rpi" ]; then
# fetch and install firmware files if missing # fetch and install firmware files if missing
RPI_FIRMWARE_FILES="bootcode.bin fixup_x.dat start_x.elf \ 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 for f in $RPI_FIRMWARE_FILES; do
if [ -e $ROOTMP/boot/$f ]; then if [ -e $ROOTMP/boot/$f ]; then
cp $ROOTMP/boot/$f $BOOTMP/$f cp $ROOTMP/boot/$f $BOOTMP/$f