From 34cd2c20de45bc86cb78b86324a4889bd577fcf7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 4 Nov 2017 12:17:35 +0000 Subject: [PATCH] Add a architecture check for the DT kernel setup --- 10-devicetree.install | 61 +++++++++++++++++++++++-------------------- sources | 2 +- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/10-devicetree.install b/10-devicetree.install index 72bcf2a..76b7d26 100755 --- a/10-devicetree.install +++ b/10-devicetree.install @@ -1,5 +1,7 @@ #!/bin/bash +# set -x + COMMAND="$1" KERNEL_VERSION="$2" #BOOT_DIR_ABS="$3" @@ -17,33 +19,36 @@ KERNEL_VERSION="$2" # device progresses, it should never make backward incompatible changes. # So it should always be safe to use a newer dtb with an older kernel. -list_dtb_versions() { - excluded_version="$1" - for dtbdir in /boot/dtb-*; do - dtbver=${dtbdir#*-} - if [ "$dtbver" != "$excluded_version" ]; then - echo $dtbver - fi - done -} +if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then -setup_dtb_link() { - ver=`list_dtb_versions $1 | sort -r --sort=version | head -1` - if [ -h /boot/dtb ]; then - rm -f /boot/dtb - fi - ln -s dtb-$ver /boot/dtb -} + list_dtb_versions() { + excluded_version="$1" + for dtbdir in /boot/dtb-*; do + dtbver=${dtbdir#*-} + if [ "$dtbver" != "$excluded_version" ]; then + echo $dtbver + fi + done + } -ret=0 -case "$COMMAND" in - add) - setup_dtb_link - ret=$? - ;; - remove) - setup_dtb_link $KERNEL_VERSION - ret=$? - ;; -esac -exit $ret + setup_dtb_link() { + ver=`list_dtb_versions $1 | sort -r --sort=version | head -1` + if [ -h /boot/dtb ]; then + rm -f /boot/dtb + fi + ln -s dtb-$ver /boot/dtb + } + + ret=0 + case "$COMMAND" in + add) + setup_dtb_link + ret=$? + ;; + remove) + setup_dtb_link $KERNEL_VERSION + ret=$? + ;; + esac + exit $ret +fi diff --git a/sources b/sources index e2451a9..4cd1c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2017.11-rc2.tar.bz2) = 881c53e2888a591046d033e06631a2011aef3afb9e809b3419653e2595ebc362b855c43efbb67813fb815673df1e7692f27ce11334353527cb0cb94bc2057672 +SHA512 (u-boot-2017.11-rc3.tar.bz2) = 3bc05d9b9c65dac0be2945e2909556655a2b02bc3b720f67af8ae30c08f08a97c91d9da0e99596178190056ef2fe33a88223048a82125d9e2b539342d06dff0f