diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-11 15:04:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:21:58 +0200 |
| commit | 362e6471a2b39837c08ccb21efe3b68ecd82616e (patch) | |
| tree | f73b6001e11882a315df630a101fcd6363d26756 | |
| parent | a7242dba71b87875995742c0caa80f842aa9f99a (diff) | |
| download | ptxdist-362e6471a2b39837c08ccb21efe3b68ecd82616e.tar.gz ptxdist-362e6471a2b39837c08ccb21efe3b68ecd82616e.tar.xz | |
connman: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | projectroot/usr/lib/systemd/connman-ignore (renamed from projectroot/lib/systemd/connman-ignore) | 0 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/connman-ignore.service (renamed from projectroot/lib/systemd/system/connman-ignore.service) | 2 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/connman.service (renamed from projectroot/lib/systemd/system/connman.service) | 0 | ||||
| -rw-r--r-- | rules/connman.make | 12 |
4 files changed, 7 insertions, 7 deletions
diff --git a/projectroot/lib/systemd/connman-ignore b/projectroot/usr/lib/systemd/connman-ignore index fe72c5567..fe72c5567 100755 --- a/projectroot/lib/systemd/connman-ignore +++ b/projectroot/usr/lib/systemd/connman-ignore diff --git a/projectroot/lib/systemd/system/connman-ignore.service b/projectroot/usr/lib/systemd/system/connman-ignore.service index ac80f517c..b31df07fb 100644 --- a/projectroot/lib/systemd/system/connman-ignore.service +++ b/projectroot/usr/lib/systemd/system/connman-ignore.service @@ -6,7 +6,7 @@ ConditionPathExists=!/run/connman-ignore [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/lib/systemd/connman-ignore +ExecStart=/usr/lib/systemd/connman-ignore [Install] WantedBy=connman.service diff --git a/projectroot/lib/systemd/system/connman.service b/projectroot/usr/lib/systemd/system/connman.service index 4353276b5..4353276b5 100644 --- a/projectroot/lib/systemd/system/connman.service +++ b/projectroot/usr/lib/systemd/system/connman.service diff --git a/rules/connman.make b/rules/connman.make index b8ed35a00..7e1cf64d9 100644 --- a/rules/connman.make +++ b/rules/connman.make @@ -63,7 +63,7 @@ CONNMAN_CONF_OPT := \ --$(call ptx/endis, PTXCONF_CONNMAN_CLIENT)-client \ --enable-datafiles \ --with-dbusconfdir=/usr/share \ - --with-systemdunitdir=/lib/systemd/system + --with-systemdunitdir=/usr/lib/systemd/system CONNMAN_TESTS := \ backtrace \ @@ -150,15 +150,15 @@ endif endif ifdef PTXCONF_CONNMAN_SYSTEMD_UNIT @$(call install_alternative, connman, 0, 0, 0644, \ - /lib/systemd/system/connman.service) + /usr/lib/systemd/system/connman.service) @$(call install_link, connman, ../connman.service, \ - /lib/systemd/system/multi-user.target.wants/connman.service) + /usr/lib/systemd/system/multi-user.target.wants/connman.service) @$(call install_alternative, connman, 0, 0, 0644, \ - /lib/systemd/system/connman-ignore.service) + /usr/lib/systemd/system/connman-ignore.service) @$(call install_link, connman, ../connman-ignore.service, \ - /lib/systemd/system/connman.service.wants/connman-ignore.service) + /usr/lib/systemd/system/connman.service.wants/connman-ignore.service) @$(call install_alternative, connman, 0, 0, 0755, \ - /lib/systemd/connman-ignore) + /usr/lib/systemd/connman-ignore) endif ifdef PTXCONF_CONNMAN_POLKIT @$(call install_alternative, connman, 0, 0, 0644, \ |