summaryrefslogtreecommitdiffstats
path: root/remote/modules/dbus
diff options
context:
space:
mode:
authorMichael Neves2013-05-23 17:01:04 +0200
committerMichael Neves2013-05-23 17:01:04 +0200
commit655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7 (patch)
tree26e62638af3ae641fe0e561ba3ee19bdbb71e484 /remote/modules/dbus
parent[SUSE] vmchooser xml now found in correct dir (diff)
parentfix PATH for debug shell (diff)
downloadtm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.tar.gz
tm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.tar.xz
tm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/dbus')
-rw-r--r--remote/modules/dbus/dbus.build6
-rw-r--r--remote/modules/dbus/dbus.conf2
-rw-r--r--remote/modules/dbus/dbus.conf.zypper3
3 files changed, 3 insertions, 8 deletions
diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
index 7f6d663f..bcab63b0 100644
--- a/remote/modules/dbus/dbus.build
+++ b/remote/modules/dbus/dbus.build
@@ -13,11 +13,5 @@ build() {
}
post_copy() {
-
- # quick fix to get the unit files from the package
- # moved them from lib/systemd to usr/lib/systemd
- #cd "${BUILDDIR}"
- #tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
- #cd - &> /dev/null
:
}
diff --git a/remote/modules/dbus/dbus.conf b/remote/modules/dbus/dbus.conf
index 4a1bc6a5..c8fa050d 100644
--- a/remote/modules/dbus/dbus.conf
+++ b/remote/modules/dbus/dbus.conf
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="dbus"
+REQUIRED_CONTENT_PACKAGES="dbus"
REQUIRED_BINARIES=" dbus-cleanup-sockets
dbus-daemon
dbus-uuidgen
diff --git a/remote/modules/dbus/dbus.conf.zypper b/remote/modules/dbus/dbus.conf.zypper
index e34e47d8..ce3d5d08 100644
--- a/remote/modules/dbus/dbus.conf.zypper
+++ b/remote/modules/dbus/dbus.conf.zypper
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="dbus-1"
+REQUIRED_CONTENT_PACKAGES="dbus-1"
REQUIRED_BINARIES=" dbus-cleanup-sockets
dbus-daemon
dbus-uuidgen
@@ -8,3 +8,4 @@ REQUIRED_BINARIES=" dbus-cleanup-sockets
REQUIRED_DIRECTORIES=" /etc/dbus-1
/usr/lib/systemd"
REQUIRED_FILES=""
+