mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

cherokee: only install configured.py once

Browse Source 
Both the two rules install-adminpyDATA and install-generatedDATA will
install the configured.py to the same location, they can run parallel,
and they use "install -m", which would might build failures:

/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory

This is because the first install is setting the permission while the
second install is removing the file an re-install.

Only install the configured.py once will fix the problem, I think that
there is no side effect since it installed the same file to the same
location twice in the past.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
This commit is contained in:
Robert Yang
2014-04-03 22:08:22 +08:00
committed by Paul Eggleton
parent a60bf8c73a
commit 4b2a4dac0f
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
+40
View File
@@ -0,0 +1,40 @@
From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 3 Apr 2014 21:33:25 +0800
Subject: [PATCH] admin/Makefile.am: only install configured.py once
Both the two rules install-adminpyDATA and install-generatedDATA will
install the configured.py to the same location, they can run parallel,
and they use "install -m", which would might build failures:
/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
This is because the first install is setting the permission while the
second install is removing the file an re-install.
Only install the configured.py once will fix the problem, I think that
there is no side effect since it installed the same file to the same
location twice in the past.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
admin/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/admin/Makefile.am b/admin/Makefile.am
index ce5937b..6f96934 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -73,7 +73,6 @@ SystemStatsWidgets.py \
Wizard.py \
XMLServerDigest.py \
config_version.py \
-configured.py \
consts.py \
util.py \
popen.py \
--
1.8.2.1
meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+1
View File
@@ -12,6 +12,7 @@ DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'li
SRC_URI = "http://www.cherokee-project.de/mirrors/cherokee/1.2/${PV}/cherokee-${PV}.tar.gz \
file://cherokee.init \
file://cherokee.service \
file://cherokee-install-configured.py-once.patch \
"
SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb"
SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d"