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

rootfsinstall: remove kernel-mamba-arm in targets which instll another arm kernel

Browse Source
This commit is contained in:
Silvan Calarco 2016-12-16 10:49:30 +01:00
parent 03ec2d3473
commit 78ac8ec488
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rootfsinstall.sh
View File

@ -164,6 +164,7 @@ case $TARGETDEVICE in
[ "$USEKERNEL" ] || USEKERNEL=uImage-sunxi
KERNELDEST="@BOOT@/kernel.img"
INSTALLPACKAGES="kernel-sunxi kernel-sunxi-modules u-boot-sunxi-Bananapi $INSTALLPACKAGES"
REMOVEPACKAGES="kernel-mamba-arm"
FSTAB_ROOT_DEVICE="/dev/mmcblk0p2"
;;
rpi) ARCH=arm
@ -177,6 +178,7 @@ case $TARGETDEVICE in
INSTALLPACKAGES="kernel-rpi kernel-rpi-modules raspberrypi-firmware \
kernel-rpi-v7 kernel-rpi-v7-modules \
raspberrypi-utils raspi-config $INSTALLPACKAGES"
REMOVEPACKAGES="kernel-mamba-arm"
RPI_FIRMWARE_FILES="bootcode.bin fixup_x.dat start_x.elf \
bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb bcm2709-rpi-2-b.dtb bcm2710-rpi-3-b.dtb \
cmdline.txt config.txt"
@ -189,6 +191,7 @@ cmdline.txt config.txt"
[ "$USEKERNEL" ] || USEKERNEL=uImage-3.6.9-cubox
KERNELDEST="@BOOT@/uImage"
INSTALLPACKAGES="kernel-cubox kernel-cubox-modules xf86-video-dove $INSTALLPACKAGES"
REMOVEPACKAGES="kernel-mamba-arm"
;;
*) BOOTFSTYPE=
if [ "$USEKERNEL" ]; then
@ -355,6 +358,13 @@ if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" ]; then
mv $ROOTMP/etc/resolv.conf.rootfsinstall $ROOTMP/etc/resolv.conf
fi
if [ "$REMOVEPACKAGES" ]; then
chroot $ROOTMP smart remove -y $REMOVEPACKAGES || {
echo "ERROR: error running chroot command 'smart remove $REMOVEPACKAGES'; aborting."
exit 1
}
fi
KERNELDEST=`echo $KERNELDEST | sed "s|@BOOT@|$BOOTMP|g"`
KERNELDEST2=`echo $KERNELDEST2 | sed "s|@BOOT@|$BOOTMP|g"`