summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-24 00:41:07 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-24 00:44:21 -0300
commit9d36ec0982a975d2192e33f4d1934e6cc6bce7ca (patch)
tree8704a56f45559380ff860712eb5887ce6478a332
parent793cb60761137cc88b04fefab17de604f7223604 (diff)
linux-libre{,-lts,-pck}: fix conditionals for multi-platform architectures in linux.install
-rw-r--r--libre-testing/linux-libre-lts/linux.install18
-rw-r--r--libre-testing/linux-libre-pck/linux.install18
-rw-r--r--libre-testing/linux-libre/linux.install18
-rw-r--r--libre/linux-libre/linux.install22
4 files changed, 38 insertions, 38 deletions
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
diff --git a/libre/linux-libre/linux.install b/libre/linux-libre/linux.install
index 2f90d8bf6..90924fe35 100644
--- a/libre/linux-libre/linux.install
+++ b/libre/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
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
- else
+ 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}
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
@@ -25,7 +29,7 @@ post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux-libre${KERNEL_NAME}
if [ $(vercmp $2 3.13) -lt 0 ]; then
@@ -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