| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From 8a8305c78143438e2bd497d55188a0da3442db08 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 27 Apr 2022 09:11:38 -0700 |
| 4 | Subject: [PATCH] scripts: Do not check for files on build host |
| 5 | |
| 6 | This will result in varied behaviour depending upon what kind of host is |
| 7 | used to build it. We dont want that. Instead check for these files and |
| 8 | dirs in staging area and create these markers in recipe via a |
| 9 | do_install_prepend to aide install piece a bit here ( systemd vs |
| 10 | sysvinit ) etc. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [OE-Specific] |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | client/scripts/Makefile.am | 10 +++++----- |
| 17 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 18 | |
| 19 | diff --git a/client/scripts/Makefile.am b/client/scripts/Makefile.am |
| 20 | index 2a53203d84..62a0defa93 100644 |
| 21 | --- a/client/scripts/Makefile.am |
| 22 | +++ b/client/scripts/Makefile.am |
| 23 | @@ -2,21 +2,21 @@ |
| 24 | |
| 25 | install-exec-hook: |
| 26 | chmod +x boinc-client |
| 27 | - if [ -d /etc/init.d ] ; then \ |
| 28 | + if [ -d $(DESTDIR)/etc/init.d ] ; then \ |
| 29 | $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d ; \ |
| 30 | $(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client ; \ |
| 31 | fi |
| 32 | - if [ -d /usr/lib/systemd/system ] ; then \ |
| 33 | + if [ -d $(DESTDIR)/usr/lib/systemd/system ] ; then \ |
| 34 | $(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system/ ; \ |
| 35 | $(INSTALL_DATA) boinc-client.service $(DESTDIR)/usr/lib/systemd/system/boinc-client.service ; \ |
| 36 | - elif [ -d /lib/systemd/system ] ; then \ |
| 37 | + elif [ -d $(DESTDIR)/lib/systemd/system ] ; then \ |
| 38 | $(INSTALL) -d $(DESTDIR)/lib/systemd/system/ ; \ |
| 39 | $(INSTALL_DATA) boinc-client.service $(DESTDIR)/lib/systemd/system/boinc-client.service ; \ |
| 40 | fi |
| 41 | - if [ -d /etc/sysconfig ] ; then \ |
| 42 | + if [ -d $(DESTDIR)/etc/sysconfig ] ; then \ |
| 43 | $(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig ; \ |
| 44 | $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \ |
| 45 | - elif [ -d /etc/default ] ; then \ |
| 46 | + elif [ -d $(DESTDIR)/etc/default ] ; then \ |
| 47 | $(INSTALL) -d $(DESTDIR)$(sysconfdir)/default ; \ |
| 48 | $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \ |
| 49 | else \ |
| 50 | -- |
| 51 | 2.36.0 |
| 52 | |