diff options
| author | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
| commit | 6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch) | |
| tree | b1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/modules/dbus | |
| parent | wrong kernel version variable used (diff) | |
| download | mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip | |
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/modules/dbus')
| -rw-r--r-- | core/modules/dbus/module.build | 4 | ||||
| -rw-r--r-- | core/modules/dbus/module.conf | 4 | ||||
| -rw-r--r-- | core/modules/dbus/module.conf.ubuntu | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/modules/dbus/module.build b/core/modules/dbus/module.build index c6b05a8a..71f6f783 100644 --- a/core/modules/dbus/module.build +++ b/core/modules/dbus/module.build @@ -7,10 +7,10 @@ fetch_source() { build() { COPYLIST="list_dpkg_output" [ -e "${COPYLIST}" ] && rm "${COPYLIST}" - + list_packet_files >> "${COPYLIST}" tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}" - + # Generate systemd files mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system" # This is ugly, as the command line arguments changed over time. Try to do the right thing (whatever that is) diff --git a/core/modules/dbus/module.conf b/core/modules/dbus/module.conf index 5e5dc4f8..529a1b0d 100644 --- a/core/modules/dbus/module.conf +++ b/core/modules/dbus/module.conf @@ -1,4 +1,4 @@ -REQUIRED_BINARIES=" +REQUIRED_BINARIES=" dbus-cleanup-sockets dbus-daemon dbus-uuidgen @@ -6,7 +6,7 @@ REQUIRED_BINARIES=" dbus-send dbus-daemon-launch-helper dbus-launch - " +" REQUIRED_DIRECTORIES=" /etc/dbus-1 " diff --git a/core/modules/dbus/module.conf.ubuntu b/core/modules/dbus/module.conf.ubuntu index 558eea7f..3f390d20 100644 --- a/core/modules/dbus/module.conf.ubuntu +++ b/core/modules/dbus/module.conf.ubuntu @@ -1,5 +1,6 @@ REQUIRED_CONTENT_PACKAGES=" dbus + dbus-x11 " REQUIRED_FILES+=" /etc/default/dbus |