linux: Make kernel symlinks relative so they can be copied/moved and still work

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2908 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/linux/linux-gta01.inc b/meta/packages/linux/linux-gta01.inc
index 909d7459b7bb928dc73b64d5440be1de4d1e4c13..4f4dc13fd218eca7817598b1139ed69b3182c34d 100644 (file)
--- 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 a912b038e5690b69934e3f48ac27d1f16afee99e..1bec2535db46036455eeddd1dabdfa24eea6d17a 100644 (file)
--- 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 65dc85478ba271a3f81baf59a160b922a11d5733..ad4d0405426c0b50c26e9e6e33741c229e2ca100 100644 (file)
--- 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 526d652124fa0cf54f44ee9a0d244bd62d50158c..a63ea20a1ea371eb328d448dba9634252f49a657 100644 (file)
--- 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      
 }