From 9d36ec0982a975d2192e33f4d1934e6cc6bce7ca Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 24 Sep 2015 00:41:07 -0300 Subject: linux-libre{,-lts,-pck}: fix conditionals for multi-platform architectures in linux.install --- libre-testing/linux-libre-lts/linux.install | 18 +++++++++--------- libre-testing/linux-libre-pck/linux.install | 18 +++++++++--------- libre-testing/linux-libre/linux.install | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'libre-testing') diff --git a/libre-testing/linux-libre-lts/linux.install b/libre-testing/linux-libre-lts/linux.install index 2b93dd8e5..90924fe35 100644 --- a/libre-testing/linux-libre-lts/linux.install +++ b/libre-testing/linux-libre-lts/linux.install @@ -8,16 +8,20 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + echo "NOTE: Using this kernel requires an updated U-Boot!" + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} - else - echo "NOTE: Using this kernel requires an updated U-Boot!" fi } post_upgrade() { - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi @@ -33,14 +37,10 @@ post_upgrade() { echo ">>> In order to use your keyboard during early init, you MUST" echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." fi - else - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} fi } -if [ $(uname -m) != armv7h ]; then +if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then post_remove() { # also remove the compat symlinks rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img diff --git a/libre-testing/linux-libre-pck/linux.install b/libre-testing/linux-libre-pck/linux.install index 2b93dd8e5..90924fe35 100644 --- a/libre-testing/linux-libre-pck/linux.install +++ b/libre-testing/linux-libre-pck/linux.install @@ -8,16 +8,20 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + echo "NOTE: Using this kernel requires an updated U-Boot!" + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} - else - echo "NOTE: Using this kernel requires an updated U-Boot!" fi } post_upgrade() { - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi @@ -33,14 +37,10 @@ post_upgrade() { echo ">>> In order to use your keyboard during early init, you MUST" echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." fi - else - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} fi } -if [ $(uname -m) != armv7h ]; then +if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then post_remove() { # also remove the compat symlinks rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img diff --git a/libre-testing/linux-libre/linux.install b/libre-testing/linux-libre/linux.install index 2b93dd8e5..90924fe35 100644 --- a/libre-testing/linux-libre/linux.install +++ b/libre-testing/linux-libre/linux.install @@ -8,16 +8,20 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + echo "NOTE: Using this kernel requires an updated U-Boot!" + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} - else - echo "NOTE: Using this kernel requires an updated U-Boot!" fi } post_upgrade() { - if [ $(uname -m) != armv7h ]; then + if [ "$(uname -m)" = "armv7h" ]; then + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi @@ -33,14 +37,10 @@ post_upgrade() { echo ">>> In order to use your keyboard during early init, you MUST" echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." fi - else - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} fi } -if [ $(uname -m) != armv7h ]; then +if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then post_remove() { # also remove the compat symlinks rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img -- cgit v1.2.3