diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-05 22:47:48 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-05 22:47:48 +0000 |
| commit | fa42accd367ffcd4ad05c19cd9bbb622de020485 (patch) | |
| tree | be028fd5fbd75fc8de671fefea66f5bc4a7993d7 /rules/dbus.in | |
| parent | d07c6d7733893765e40b4545c02bfbb5bda14d10 (diff) | |
| download | ptxdist-fa42accd367ffcd4ad05c19cd9bbb622de020485.tar.gz ptxdist-fa42accd367ffcd4ad05c19cd9bbb622de020485.tar.xz | |
[dbus] convert installation of config file to install_alternative
system.conf + session.conf are now installed with install_alternative
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10234 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/dbus.in')
| -rw-r--r-- | rules/dbus.in | 66 |
1 files changed, 13 insertions, 53 deletions
diff --git a/rules/dbus.in b/rules/dbus.in index 96f676084..20037e237 100644 --- a/rules/dbus.in +++ b/rules/dbus.in @@ -15,7 +15,7 @@ menuconfig DBUS if DBUS -config DBUS__SELINUX +config DBUS_SELINUX prompt "selinux support [BROKEN]" depends on BROKEN bool @@ -48,65 +48,25 @@ config DBUS_X help Enable this option to build dbus with support for X. -config ROOTFS_DBUS_SYSTEM_CONF +config DBUS_SYSTEM_CONF bool - prompt "/etc/dbus-1/system.conf" + prompt "install /etc/dbus-1/system.conf" default y help - Installs a /etc/dbus-1/system.conf file from a selectable source. + Installs (if present) the + "./projectroot/etc/dbus-1/system.conf" file from your + workspace, otherwise a generic one from the ptxdist + directory. - choice - prompt "Kind of /etc/dbus-1/system.conf" - depends on ROOTFS_DBUS_SYSTEM_CONF - default ROOTFS_GENERIC_DBUS_SYSTEM_CONF - - config ROOTFS_GENERIC_DBUS_SYSTEM_CONF - bool - prompt "Use generic" - help - This uses the generic configuration file for your dbus which is - shipped with the sources. This configuration is likely to fail - because it is thought for a desktop PC. - - config ROOTFS_USER_DBUS_SYSTEM_CONF - bool - prompt "User defined" - help - This uses a user defined /etc/dbus-1/system.conf. PTXdist - uses file projectroot/etc/dbus-1/system.conf in your local - project. - - endchoice - -config ROOTFS_DBUS_SESSION_CONF +config DBUS_SESSION_CONF bool - prompt "/etc/dbus-1/session.conf" + prompt "install /etc/dbus-1/session.conf" default y help - Installs a /etc/dbus-1/session.conf file from a selectable source. - - choice - prompt "Kind of /etc/dbus-1/session.conf" - depends on ROOTFS_DBUS_SESSION_CONF - default ROOTFS_GENERIC_DBUS_SESSION_CONF - - config ROOTFS_GENERIC_DBUS_SESSION_CONF - bool - prompt "Use generic" - help - This uses the generic configuration file for your dbus which is - shipped with the sources. This configuration is likely to fail - because it is thought for a desktop PC. - - config ROOTFS_USER_DBUS_SESSION_CONF - bool - prompt "User defined" - help - This uses a user defined /etc/dbus-1/session.conf. PTXdist - uses file projectroot/etc/dbus-1/session.conf in your local - project. - - endchoice + Installs (if present) the + "./projectroot/etc/dbus-1/session.conf" file from your + workspace, otherwise a generic one from the ptxdist + directory. # --enable-tests enable unit test code # --enable-ansi enable -ansi -pedantic gcc flags |