4 files changed, 7 insertions, 7 deletions

diff --git a/meta/packages/linux/linux-gta01.inc b/meta/packages/linux/linux-gta01.inc
index 909d7459b7..4f4dc13fd2 100644
--- a/meta/packages/linux/linux-gta01.inc
+++ b/meta/packages/linux/linux-gta01.inc
@@ -94,7 +94,8 @@ do_deploy() {
         rm -f linux.bin.gz
         gzip -9 linux.bin
         ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
-        ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
+        cd ${DEPLOY_DIR_IMAGE}
+        ln -sf uImage-${PV}-${PR}-${MACHINE}.bin uImage-${MACHINE}-latest.bin
         rm -f linux.bin.gz
 }
 
diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc
index a912b038e5..1bec2535db 100644
--- a/meta/packages/linux/linux-mx31.inc
+++ b/meta/packages/linux/linux-mx31.inc
@@ -31,8 +31,8 @@ do_configure_prepend() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
+        cd ${DEPLOY_DIR_IMAGE}
+        ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib      
 }
 
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta/packages/linux/linux-nokia800.inc
index 65dc85478b..ad4d040542 100644
--- a/meta/packages/linux/linux-nokia800.inc
+++ b/meta/packages/linux/linux-nokia800.inc
@@ -35,8 +35,8 @@ do_configure_prepend() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
+        cd ${DEPLOY_DIR_IMAGE}
+        ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib      
 }
 
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc
index 526d652124..a63ea20a1e 100644
--- a/meta/packages/linux/linux-rp.inc
+++ b/meta/packages/linux/linux-rp.inc
@@ -164,8 +164,7 @@ do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
         cd ${DEPLOY_DIR_IMAGE}
-        rm -f ${KERNEL_SYMLINK_NAME}
-        ln -s ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
+        ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib      
 }