diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb | 3 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb index 9179bcacb1..a221e1da75 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r0" +PR = "r1" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://server-makefile.patch \ @@ -16,6 +16,7 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://apache-configure_perlbin.patch \ file://replace-lynx-to-curl-in-apachectl-script.patch \ file://apache-ssl-ltmain-rpath.patch \ + file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \ file://init" LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" diff --git a/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch b/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch new file mode 100644 index 0000000000..b948753b48 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch @@ -0,0 +1,21 @@ +Upstream-Status: Pending + +fix following race issue when do parallel install +| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists +... +| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists +| make[1]: *** [install-man] Error 1 +| make[1]: *** Waiting for unfinished jobs.... + +-Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> +--- httpd-2.4.3/build/mkdir.sh.orig 2013-01-25 03:47:21.565255420 -0600 ++++ httpd-2.4.3/build/mkdir.sh 2013-01-25 03:46:17.833051230 -0600 +@@ -39,7 +39,7 @@ + esac + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" 1>&2 +- mkdir "$pathcomp" || errstatus=$? ++ mkdir -p "$pathcomp" || errstatus=$? + fi + pathcomp="$pathcomp/" + done |