diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-11 11:39:15 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:19:55 +0200 |
| commit | e6cb3372c01cd19a67f52eace782a1bb9b90d3bd (patch) | |
| tree | 02bd798961a48052da8d1fc959176b7ad9b0bfc4 | |
| parent | 7927a359337d859b3f67228b5a0005f9ac86c799 (diff) | |
| download | ptxdist-e6cb3372c01cd19a67f52eace782a1bb9b90d3bd.tar.gz ptxdist-e6cb3372c01cd19a67f52eace782a1bb9b90d3bd.tar.xz | |
mysql: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | projectroot/usr/lib/systemd/system/mysqld.service (renamed from projectroot/lib/systemd/system/mysqld.service) | 0 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/mysqldinit.service (renamed from projectroot/lib/systemd/system/mysqldinit.service) | 0 | ||||
| -rw-r--r-- | projectroot/usr/sbin/mysqlinit (renamed from projectroot/sbin/mysqlinit) | 0 | ||||
| -rw-r--r-- | rules/mysql.make | 10 |
4 files changed, 5 insertions, 5 deletions
diff --git a/projectroot/lib/systemd/system/mysqld.service b/projectroot/usr/lib/systemd/system/mysqld.service index f92d49b90..f92d49b90 100644 --- a/projectroot/lib/systemd/system/mysqld.service +++ b/projectroot/usr/lib/systemd/system/mysqld.service diff --git a/projectroot/lib/systemd/system/mysqldinit.service b/projectroot/usr/lib/systemd/system/mysqldinit.service index d7aefcc03..d7aefcc03 100644 --- a/projectroot/lib/systemd/system/mysqldinit.service +++ b/projectroot/usr/lib/systemd/system/mysqldinit.service diff --git a/projectroot/sbin/mysqlinit b/projectroot/usr/sbin/mysqlinit index 72b6d1f10..72b6d1f10 100644 --- a/projectroot/sbin/mysqlinit +++ b/projectroot/usr/sbin/mysqlinit diff --git a/rules/mysql.make b/rules/mysql.make index 83f170c09..73f94b617 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -125,14 +125,14 @@ $(STATEDIR)/mysql.targetinstall: # # server stuff @$(call install_copy, mysql, 0, 0, 0755, -, /usr/bin/mysqld) - @$(call install_alternative, mysql, 0, 0, 0755, /sbin/mysqlinit) + @$(call install_alternative, mysql, 0, 0, 0755, /usr/sbin/mysqlinit) ifdef PTXCONF_MYSQL_SYSTEMD - @$(call install_alternative, mysql, 0, 0, 0644, /lib/systemd/system/mysqldinit.service) + @$(call install_alternative, mysql, 0, 0, 0644, /usr/lib/systemd/system/mysqldinit.service) @$(call install_link, mysql, ../mysqldinit.service, \ - /lib/systemd/system/multi-user.target.wants/mysqldinit.service) - @$(call install_alternative, mysql, 0, 0, 0644, /lib/systemd/system/mysqld.service) + /usr/lib/systemd/system/multi-user.target.wants/mysqldinit.service) + @$(call install_alternative, mysql, 0, 0, 0644, /usr/lib/systemd/system/mysqld.service) @$(call install_link, mysql, ../mysqld.service, \ - /lib/systemd/system/multi-user.target.wants/mysqld.service) + /usr/lib/systemd/system/multi-user.target.wants/mysqld.service) endif @$(call install_alternative, mysql, 0, 0, 0644, /etc/mysql/my.cnf) @$(call install_copy, mysql, 0, 0, 0644, -, /usr/lib/plugin/keyring_file.so) |