aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Maynard <steve.maynard@twcable.com>2014-11-25 10:57:43 -0700
committerKhem Raj <raj.khem@gmail.com>2014-12-09 14:32:47 -0800
commit5fd4c0d36f214aef0244b2acc814e4c25562b851 (patch)
tree2ecbdf7571d660d2196607b5f9703aaa5b987c59
parentd3d14d3fcca7fcde362cf0b31411dc4eea6d20aa (diff)
downloadmeta-openembedded-contrib-5fd4c0d36f214aef0244b2acc814e4c25562b851.tar.gz
meta-openembedded-contrib-5fd4c0d36f214aef0244b2acc814e4c25562b851.tar.bz2
meta-openembedded-contrib-5fd4c0d36f214aef0244b2acc814e4c25562b851.zip
RDKSYSINTSW-1318: create RDK-B image recipes
Reason for change: Add qemuarmbroadband as next step towards Puma-6MG support (build RDK-B for ARM) Test Procedure: build qemux86hyb image for RDK, qemux86broadband and qemuarmbroadband images for RDK-B; run all in qemu Risks: No side effects for RDK build Signed-off-by: Steve Maynard <steve.maynard@twcable.com> Change-Id: Iba5ff1eb79f0160052d99cd02f5b843db222938e
-rw-r--r--meta-oe/recipes-devtools/php/php.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 1e2aa7264f..0a919217ae 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -81,7 +81,9 @@ do_install_append_pn-php() {
rm -rf ${D}/.[a-z]*
rm -rf ${D}/var
rm -f ${D}/${sysconfdir}/php-fpm.conf.default
- sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
+ if [ -s ${D}/${sysconfdir}/pear.conf ];then
+ sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
+ fi
install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
install -d ${D}/${sysconfdir}/apache2/conf.d
install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
@@ -92,7 +94,9 @@ do_install_append_pn-php() {
install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
TMP=`dirname ${D}/${TMPDIR}`
while test ${TMP} != ${D}; do
- rmdir ${TMP}
+ if [ -s ${TMP} ];then
+ rm -r ${TMP}
+ fi
TMP=`dirname ${TMP}`;
done
}