diff options
author | Ross Burton <ross.burton@intel.com> | 2016-01-06 15:49:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 17:37:33 +0000 |
commit | a9f2e87bd52fb4c884bd8603531ff3ff6340f03b (patch) | |
tree | f944c7ade54a08a66b74da3765c8b7c5b308738b | |
parent | de0848fc04276762301ee73571f448d410a5ee99 (diff) | |
download | poky-a9f2e87bd52fb4c884bd8603531ff3ff6340f03b.tar.gz |
postinst-intercepts: always use set -e
If a postinst has a problem (say, qemu crashes) and set -e isn't in operation,
the only mention of the problem is a single line in the rootfs log that doesn't
trigger any warnings.
(From OE-Core rev: 072800f89a136bb5da44627f25599d3060cca0a1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 2 | ||||
-rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache index 2e6daedeb5..bf65e19a41 100644 --- a/scripts/postinst-intercepts/update_font_cache +++ b/scripts/postinst-intercepts/update_font_cache | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | set -e | ||
4 | |||
3 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \ | 5 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \ |
4 | -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} | 6 | -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} |
5 | chown -R root:root $D${fontconfigcachedir} | 7 | chown -R root:root $D${fontconfigcachedir} |
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index a8b4001069..5d44075fb4 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | set -e | ||
4 | |||
3 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders | 5 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders |
4 | export GDK_PIXBUF_FATAL_LOADER=1 | 6 | export GDK_PIXBUF_FATAL_LOADER=1 |
5 | 7 | ||