[PATCH] Include glib headers if custom glib routines aren't avaialable
by Adam Stokes
Signed-off-by: Adam Stokes <astokes(a)fedoraproject.org>
---
src/include/matahari/utilities.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/include/matahari/utilities.h b/src/include/matahari/utilities.h
index 89b9db7..70360d5 100644
--- a/src/include/matahari/utilities.h
+++ b/src/include/matahari/utilities.h
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <string.h>
+#include <glib.h>
extern const char *mh_uuid(void);
extern const char *mh_hostname(void);
--
1.7.6.1
12 years, 8 months
[PATCH] Build: Don't use class name in DBus XML file name
by Zane Bitter
A schema may contain multiple classes, so it makes no sense to name the XML
file generated for DBus after the first class in the file. Instead, just
name it after the package.
However, we have already created multiple daemons in the same package
namespace, so use the existing names when installing.
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
src/host/CMakeLists.txt | 4 ++--
src/network/CMakeLists.txt | 4 ++--
src/schema-to-dbus.xsl | 2 +-
src/service/CMakeLists.txt | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt
index 85e908f..dd92d3f 100644
--- a/src/host/CMakeLists.txt
+++ b/src/host/CMakeLists.txt
@@ -23,7 +23,7 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Host.xml)
+ generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml)
# Create src/dbus directory and generate DBus XML definition files into it
generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
@@ -47,7 +47,7 @@ if(WITH-DBUS)
# Install targets
# TODO: fix hardcoded paths, should go to libexec
install(TARGETS ${DBUS_AGENT} DESTINATION sbin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Host.xml DESTINATION share/dbus-1/interfaces)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml DESTINATION share/dbus-1/interfaces RENAME org.matahariproject.Host.xml)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Host.service DESTINATION share/dbus-1/system-services)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Host.conf DESTINATION /etc/dbus-1/system.d)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Host.policy DESTINATION share/polkit-1/actions)
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 188a10b..8f4313f 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -22,7 +22,7 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Network.xml)
+ generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml)
# Create src/dbus directory and generate DBus XML definition files into it
generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
@@ -51,7 +51,7 @@ if(WITH-DBUS)
# Install targets
# TODO: fix hardcoded paths, should go to libexec
install(TARGETS ${DBUS_AGENT} DESTINATION sbin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Network.xml DESTINATION share/dbus-1/interfaces)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml DESTINATION share/dbus-1/interfaces RENAME org.matahariproject.Network.xml)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Network.service DESTINATION share/dbus-1/system-services)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Network.conf DESTINATION /etc/dbus-1/system.d)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Network.policy DESTINATION share/polkit-1/actions)
diff --git a/src/schema-to-dbus.xsl b/src/schema-to-dbus.xsl
index 5ad73a5..d4c022e 100644
--- a/src/schema-to-dbus.xsl
+++ b/src/schema-to-dbus.xsl
@@ -16,7 +16,7 @@
<xsl:variable name="package">
<xsl:value-of select="schema/@package" />
</xsl:variable>
- <xsl:variable name="filename" select="concat($package, '.', schema/class/@name,'.xml')" />
+ <xsl:variable name="filename" select="concat($package, '.xml')" />
<exsl:document method="xml" indent="yes" version="1.0" encoding="utf-8" href="{$filename}">
<node>
<xsl:for-each select="schema/class">
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 3030a22..72c948e 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -27,7 +27,7 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Services.xml)
+ generate_dbus_headers(${BASE} ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml)
# Create src/dbus directory and generate DBus XML definition files into it
generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
@@ -56,7 +56,7 @@ if(WITH-DBUS)
# Install targets
# TODO: fix hardcoded paths, should go to libexec
install(TARGETS ${DBUS_AGENT} DESTINATION sbin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Services.xml DESTINATION share/dbus-1/interfaces)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.xml DESTINATION share/dbus-1/interfaces RENAME org.matahariproject.Services.xml)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Services.service DESTINATION share/dbus-1/system-services)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Services.conf DESTINATION /etc/dbus-1/system.d)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.matahariproject.Services.policy DESTINATION share/polkit-1/actions)
12 years, 8 months
v0.4 branch reminder
by Russell Bryant
Greetings,
I just wanted to remind all committers that the Matahari repo now has a
v0.4 release branch. When you are committing bug fixes, please commit
to the v0.4 branch and merge to master.
Thanks,
--
Russell Bryant
12 years, 8 months
Broker selection
by Zane Bitter
Just a quick summary for the record of how the broker is currently
selected, as I understand it...
Default (nothing specified):
- Look up DNS SRV record for local domain
- If not found, use localhost
Server Specified:
- Either in MATAHARI_BROKER environment variable or --broker option
- CLI option overrides the environment variable
- Use the specified server
Server Specified with DNS lookup:
- as above with --dns-srv option
- Look up DNS SRV record for specified 'broker' (really a domain)
- If not found, ignore --dns-srv option and treat 'broker' as a
hostname (this still seems a little odd to me, but OK)
DNS lookup only (no server specified):
- Same as default
The port can be specified using the MATAHARI_PORT environment variable
or the --port option. CLI overrides environment.
Once we have selected a broker, we keep trying until we can connect. So
there is no need to add anything to qpidd to indicate to systemd when it
has started listening for connections. (As it stands, systemd will start
the agents after the broker, but not wait for the broker to open its port.)
12 years, 8 months
[PATCH] Spec: rhbz#734981 - Make new brokerd script executable
by Zane Bitter
In the changeover to initialisation with systemd (729938f0695886a774a60f85c932e6e027d195a3)
the matahari-brokerd was changed from a symlink to qpidd to a shell script.
However, the execute permission was not being set on this script by the RPM
spec.
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
matahari.spec.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/matahari.spec.in b/matahari.spec.in
index 5031789..b6f2c2d 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -420,7 +420,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%attr(755, root, root) %{_initddir}/matahari-broker
%config(noreplace) %{_sysconfdir}/sysconfig/matahari-broker
%config(noreplace) %{_sysconfdir}/matahari-broker.conf
-%{_sbindir}/matahari-brokerd
+%attr(755, root, root) %{_sbindir}/matahari-brokerd
%doc AUTHORS COPYING
%if %{defined _unitdir}
12 years, 8 months
[IANA #483358] Application for port-number: matahari (Assigned)
by Pearl Liang via RT
Dear Zane Bitter:
Your request has been processed. We have assigned the following
TCP port to Matahari Project with you as the point of contact:
matahari49000tcpMatahari Broker[Matahari_Project][Zane_Bitter]2011-08-31
See:
http://www.iana.org/assignments/service-names-port-numbers/service-names-...
Please notify IANA if there is any change in contact information by
completing the following template:
http://www.iana.org/cgi-bin/mod_portno.pl
This ticket [IANA #483358] is considered resolved.
Regards,
Pearl Liang
IANA
***************************************************************
Internet Assigned Numbers Authority (IANA)
4676 Admiralty Way, Suite 330
Marina del Rey, California 90292
Voice: (310) 823-9358
FAX: (310) 823-8649
email: iana-ports(a)iana.org
***************************************************************
12 years, 8 months