Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Thu, 3 Apr 2014 21:33:25 +0800 |
| 4 | Subject: [PATCH] admin/Makefile.am: only install configured.py once |
| 5 | |
| 6 | Both the two rules install-adminpyDATA and install-generatedDATA will |
| 7 | install the configured.py to the same location, they can run parallel, |
| 8 | and they use "install -m", which would might build failures: |
| 9 | |
| 10 | /usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory |
| 11 | |
| 12 | This is because the first install is setting the permission while the |
| 13 | second install is removing the file an re-install. |
| 14 | |
| 15 | Only install the configured.py once will fix the problem, I think that |
| 16 | there is no side effect since it installed the same file to the same |
| 17 | location twice in the past. |
| 18 | |
| 19 | Upstream-Status: Pending |
| 20 | |
| 21 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 22 | --- |
| 23 | admin/Makefile.am | 1 - |
| 24 | 1 file changed, 1 deletion(-) |
| 25 | |
| 26 | diff --git a/admin/Makefile.am b/admin/Makefile.am |
| 27 | index ce5937b..6f96934 100644 |
| 28 | --- a/admin/Makefile.am |
| 29 | +++ b/admin/Makefile.am |
| 30 | @@ -73,7 +73,6 @@ SystemStatsWidgets.py \ |
| 31 | Wizard.py \ |
| 32 | XMLServerDigest.py \ |
| 33 | config_version.py \ |
| 34 | -configured.py \ |
| 35 | consts.py \ |
| 36 | util.py \ |
| 37 | popen.py \ |
| 38 | -- |
| 39 | 1.8.2.1 |
| 40 | |