core87: work arround u-boot folder detection bug.

[ipfire-2.x.git] / config / rootfiles / core / 86 / update.sh

diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/update.sh
index bb7453f5ce713921d53d39de2cd6651e9c310310..8a820e26bbd2dd36d4a13d5144d837840538719b 100644 (file)
--- a/config/rootfiles/core/86/update.sh
+++ b/config/rootfiles/core/86/update.sh
@@ -69,7 +69,7 @@ fi
 echo
 echo Update Kernel to $KVER ...
 #
-# Remove old kernel, configs, initrd, modules ...
+# Remove old kernel, configs, initrd, modules, dtb's ...
 #
 rm -rf /boot/System.map-*
 rm -rf /boot/config-*
@@ -78,6 +78,7 @@ rm -rf /boot/initramfs-*
 rm -rf /boot/vmlinuz-*
 rm -rf /boot/uImage-ipfire-*
 rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
 rm -rf /lib/modules
 
 case "$(uname -m)" in
@@ -88,7 +89,18 @@ case "$(uname -m)" in
                # Remove all files that belong to GRUB-legacy
                rm -rfv /boot/grub
                ;;
+       armv*)
+               # Backup uEnv.txt if exist
+               if [ -e /boot/uEnv.txt ]; then
+                       cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+               fi
+
+               # work around the u-boot folder detection bug
+               mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+               mkdir -pv /boot/dtb-$KVER-ipfire-multi
+               ;;
 esac
+
 #
 #Stop services
 /etc/init.d/snort stop
@@ -113,6 +125,8 @@ if [ $BOOTSPACE -lt 1000 ]; then
                        # Special handling for old kirkwood images.
                        # (install only kirkwood kernel)
                        rm -rf /boot/*
+                       # work around the u-boot folder detection bug
+                       mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
                        tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
                                --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
                        ;;
@@ -180,18 +194,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
        fi
 fi
 
-# Force reinstall xen kernel if it was installed
-if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
-       echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
-       echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
-       echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-xen
-       echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
-       echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
-       echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-xen
-       # Add xvc0 to /etc/securetty
-       echo "xvc0" >> /etc/securetty
-fi
-
 #
 # After pakfire has ended run it again and update the lists and do upgrade
 #