summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2016-05-20 22:14:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:24:56 +0100
commit72fb52eb12ce45e535eb057b7daabf05cc6371cd (patch)
tree2376c18d1c349ea0c4a6c523879f35082714ca74
parent22a55ba6dd000a578c0feddecb7d5cecb3d8d40d (diff)
downloadpoky-72fb52eb12ce45e535eb057b7daabf05cc6371cd.tar.gz
build-appliance-image: use 'lnr' instead of 'ln -sr'
For portability, not all hosts are running sufficiently new coreutils. (From OE-Core rev: b06d9ad6c235584f3cb12244bc5437ca7977a0c8) Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/images/build-appliance-image_14.0.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_14.0.0.bb b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
index 2a1a56b617..d6de67c8c8 100644
--- a/meta/recipes-core/images/build-appliance-image_14.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
@@ -54,7 +54,7 @@ fakeroot do_populate_poky_src () {
54 cp ${WORKDIR}/README_VirtualBox_Guest_Additions.txt ${IMAGE_ROOTFS}/home/builder/ 54 cp ${WORKDIR}/README_VirtualBox_Guest_Additions.txt ${IMAGE_ROOTFS}/home/builder/
55 55
56 # Create a symlink, needed for out-of-tree kernel modules build 56 # Create a symlink, needed for out-of-tree kernel modules build
57 ln -snr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build 57 lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
58 58
59 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone 59 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
60 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf 60 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
@@ -84,7 +84,7 @@ fakeroot do_populate_poky_src () {
84 echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers 84 echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
85 85
86 # Load tap/tun at startup 86 # Load tap/tun at startup
87 ln -sr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables 87 lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
88 echo "tun" >> ${IMAGE_ROOTFS}/etc/modules 88 echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
89 89
90 # Use Clearlooks GTK+ theme 90 # Use Clearlooks GTK+ theme