diff options
author | Sabin Floares <sabin.floares@intel.com> | 2016-08-22 17:22:47 +0300 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-28 12:09:46 -0700 |
commit | 94e6f4da18fb0c4ee17a8e4b95f92d5de7f2f526 (patch) | |
tree | 7d68f64b4cac65efc2cb7dc2dae86595314aec57 /Makefile | |
parent | 2222e7f3b756bdc3fb7825727c85302b75a892df (diff) | |
download | adhd-94e6f4da18fb0c4ee17a8e4b95f92d5de7f2f526.tar.gz |
cras: Adding systemd unit files.
Renamed "upstart" dir to "init". Pulled the main script to a separate
file which is shared between systemd and Upstart.
BUG=chromium:583671
CQ-DEPEND=CL:373478
TEST=Checked that the sound works.
Change-Id: I643b1fd151f22e9c6a56cfb96eea6fa9d6556eb7
Reviewed-on: https://chromium-review.googlesource.com/373379
Commit-Ready: Sabin Floares <sabin.floares@intel.com>
Tested-by: Sabin Floares <sabin.floares@intel.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 40 |
1 files changed, 34 insertions, 6 deletions
@@ -19,9 +19,36 @@ cras-scripts: $(INSTALL) --mode 755 -D $(ADHD_DIR)/scripts/audio_diagnostics \ $(DESTDIR)usr/bin/ -$(DESTDIR)/etc/init/cras.conf: $(ADHD_DIR)/upstart/cras.conf - $(ECHO) "Installing '$<' to '$@'" - $(INSTALL) --mode 644 -D $< $@ +cras_init_upstart: $(ADHD_DIR)/init/cras.conf + $(ECHO) "Installing upstart file" + $(INSTALL) --mode 644 -D $< $(DESTDIR)/etc/init/cras.conf + +cras_init_scripts: $(ADHD_DIR)/init/cras.sh + $(INSTALL) --mode 644 -D $< $(DESTDIR)/usr/share/cros/init/cras.sh + +SYSTEMD_UNIT_DIR := /usr/lib/systemd/system/ +SYSTEMD_TMPFILESD_DIR := /usr/lib/tmpfiles.d/ + +cras_init_systemd: $(ADHD_DIR)/init/cras.service \ + $(ADHD_DIR)/init/cras-directories.conf + $(ECHO) "Installing systemd files" + $(INSTALL) --mode 644 -D $(ADHD_DIR)/init/cras.service \ + $(DESTDIR)/$(SYSTEMD_UNIT_DIR)/cras.service + $(INSTALL) --mode 755 -d $(DESTDIR)/$(SYSTEMD_UNIT_DIR)/system-services.target.wants + $(LINK) -s ../cras.service \ + $(DESTDIR)/$(SYSTEMD_UNIT_DIR)/system-services.target.wants/cras.service + $(INSTALL) --mode 644 -D $(ADHD_DIR)/init/cras-directories.conf \ + $(DESTDIR)/$(SYSTEMD_TMPFILESD_DIR)/cras-directories.conf + +ifeq ($(strip $(SYSTEMD)), yes) + +cras_init: cras_init_systemd cras_init_scripts + +else + +cras_init: cras_init_upstart cras_init_scripts + +endif $(DESTDIR)/etc/cras/device_blacklist: $(ADHD_DIR)/cras-config/device_blacklist $(ECHO) "Installing '$<' to '$@'" @@ -51,10 +78,11 @@ install: $(DESTDIR)/lib/firmware/$(BOARD)_alsa.fw endif -install: $(DESTDIR)/etc/init/cras.conf \ - $(DESTDIR)/etc/cras/device_blacklist \ +install: $(DESTDIR)/etc/cras/device_blacklist \ cras-scripts \ - cras_install + cras_install \ + cras_init + clean: @rm -rf $(ADHD_BUILD_DIR) |