diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-07-07 08:46:51 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-07-11 02:08:43 -0400 |
commit | 9fb9242725cc5b188393aaf11523bccae2050dfc (patch) | |
tree | caa38c2a6d65a3b2486818313bb0b35409a79347 /meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus | |
parent | 585f3993a934509e9bf5142bd5d6a744b3b3ed46 (diff) | |
download | talos-openbmc-9fb9242725cc5b188393aaf11523bccae2050dfc.tar.gz talos-openbmc-9fb9242725cc5b188393aaf11523bccae2050dfc.zip |
Remove second bus from sdbus example
There probably aren't any use cases for this and it is
harder to support.
Remove to make things slightly less confusing.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c | 8 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf (renamed from meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf) | 4 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf | 8 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb | 3 |
4 files changed, 4 insertions, 19 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c index a66bb555c..769a2081f 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c @@ -79,13 +79,7 @@ int main(int argc, char *argv[]) { } /* Take a well-known service name so that clients can find us */ - r = sd_bus_request_name(bus, "org.openbmc.examples.SDBusService0", 0); - if (r < 0) { - fprintf(stderr, "Failed to acquire service name: %s\n", strerror(-r)); - goto finish; - } - - r = sd_bus_request_name(bus, "org.openbmc.examples.SDBusService1", 0); + r = sd_bus_request_name(bus, "org.openbmc.examples.SDBusService", 0); if (r < 0) { fprintf(stderr, "Failed to acquire service name: %s\n", strerror(-r)); goto finish; diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf index 45af4f4b6..86e2a53fa 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf @@ -2,7 +2,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.openbmc.examples.SDBusService0"/> - <allow send_destination="org.openbmc.examples.SDBusService0"/> + <allow own="org.openbmc.examples.SDBusService"/> + <allow send_destination="org.openbmc.examples.SDBusService"/> </policy> </busconfig> diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf deleted file mode 100644 index 5a7bfb84e..000000000 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy user="root"> - <allow own="org.openbmc.examples.SDBusService1"/> - <allow send_destination="org.openbmc.examples.SDBusService1"/> - </policy> -</busconfig> diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb index f1a9eb962..9a3018d37 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb @@ -3,8 +3,7 @@ DESCRIPTION = "Phosphor OpenBMC QEMU BSP example implementation." PR = "r1" DBUS_SERVICES = " \ - org.openbmc.examples.SDBusService0 \ - org.openbmc.examples.SDBusService1 \ + org.openbmc.examples.SDBusService \ " S = "${WORKDIR}" |