summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2015-06-09 13:37:51 -0700
committerDarren Hart <dvhart@linux.intel.com>2015-06-17 12:31:20 -0700
commit56bb386c360e884e7b5918ae864b8e2b7165a872 (patch)
tree3d07f0a5f3acf64e7fce3e50edf21745d2fd88da /recipes-devtools
parentf5316f730d78701a560cb2f1f3a504fed7e70058 (diff)
downloadmeta-systemdev-56bb386c360e884e7b5918ae864b8e2b7165a872.tar.gz
meta-systemdev-56bb386c360e884e7b5918ae864b8e2b7165a872.tar.bz2
meta-systemdev-56bb386c360e884e7b5918ae864b8e2b7165a872.zip
php: separate php-cli and php packages to fix install
The contents of php package only exists when pear is enabled. Since we disabled pear the package is empty. The php binary forms part of php-cli which is what we are most interested in to support the phoronix test suite in the systemdev images. We also need to build sdk images and for these the *-dev variants of packages are needed. For php-cli this currently reverts to being php-dev (since PN in its package config is php). This causes failures during rootfs creation since php-dev depends on php, which is empty because of pear being disabled. We work around this by moving the contents of php-dev to a new php-cli-dev so that we can have the right content in the sdk images we create. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/php/php_5.5.21.bbappend12
1 files changed, 12 insertions, 0 deletions
diff --git a/recipes-devtools/php/php_5.5.21.bbappend b/recipes-devtools/php/php_5.5.21.bbappend
index b556e19..8d94a83 100644
--- a/recipes-devtools/php/php_5.5.21.bbappend
+++ b/recipes-devtools/php/php_5.5.21.bbappend
@@ -13,6 +13,18 @@ EXTRA_OECONF += " --without-pear"
#for its installation to succeed
RDEPENDS_${PN}-cli_remove = "${PN}"
+#The SDK image seeks *-dev packages and if we do not provide one for
+#php-cli then it will revert to trying to install php-dev, which in turn
+#depends on package php that is empty due to pear being disabled. As a
+#workaround we provide a dev package for php-cli that contains all that is
+#in php-dev (since php-cli contains the php binary anyway)
+PACKAGES += "${PN}-cli-dev"
+FILES_${PN}-cli-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \
+ ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \
+ ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \
+ ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test"
+FILES_${PN}-dev = ""
+
# the do_install_append and do_install_prepend tasks are cumulative so we
# cannot overwrite the do_install_append_ph-php() task that is already in
# the main recipe (meta-openembedded/meta-oe/recipes-devtools/php/php.inc).