From 9e800232dc2e552110008c0b5f8901d56301c539 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 19 Jan 2016 15:33:52 +0100 Subject: [PATCH] meta-tizen: config-image: Test existance of file/dir before changing it Change-Id: I13178f9adc0e79c2124c2c486fed39ab45a2ffff (From meta-tizen rev: 97c5e4b1aa22df2ce78887ec1e31227e83505219) Signed-off-by: Philippe Coval Signed-off-by: Leon Anavi --- .../recipes-image/config-image/config-image.bb | 25 ++++++++-------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/meta-tizen/meta-tizen-common-base/recipes-image/config-image/config-image.bb b/meta-tizen/meta-tizen-common-base/recipes-image/config-image/config-image.bb index 2e7281c..74b6ba8 100644 --- a/meta-tizen/meta-tizen-common-base/recipes-image/config-image/config-image.bb +++ b/meta-tizen/meta-tizen-common-base/recipes-image/config-image/config-image.bb @@ -48,7 +48,9 @@ EOF pkg_preinst_${PN}() { # fix TIVI-2291 - sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" $D/etc/modprobe.d/blacklist.conf + file="$D/etc/modprobe.d/blacklist.conf" + [ ! -w "$file" ] \ + || sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" "$file" } @@ -70,21 +72,12 @@ pkg_postinst_${PN} () { mkdir -p $D${sysconfdir}/profile.d if [ "x$D" != "x" ]; then - cp -fra $D${localstatedir}/log $D${localstatedir}/volatile - #cp -fra $D/sbin $D/usr - #cp -fra $D/bin $D/usr - - #rm -fr $D/lib - #rm -fr $D/sbin - #rm -fr $D/bin - rm -fr $D${localstatedir}/log - - #ln -s usr/lib $D/lib - #ln -s usr/sbin $D/sbin - #ln -s usr/bin $D/bin - ln -s volatile/log $D${localstatedir}/log - - fi + if [ -e "$D${localstatedir}/log" ] ; then + cp -fra $D${localstatedir}/log $D${localstatedir}/volatile + rm -fr $D${localstatedir}/log + ln -s volatile/log $D${localstatedir}/log + fi + fi [ "x$D" != "x" ] && exit 1 mkdir -p $D/etc/profile.d -- 2.7.4