mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
bus: remove static introspection file export
This commit is contained in:
parent
af8601fa8b
commit
ca2871d9b0
4
.gitignore
vendored
4
.gitignore
vendored
@ -17,10 +17,6 @@
|
||||
/loginctl
|
||||
/machinectl
|
||||
/mtd_probe
|
||||
/org.freedesktop.hostname1.xml
|
||||
/org.freedesktop.locale1.xml
|
||||
/org.freedesktop.systemd1.*.xml
|
||||
/org.freedesktop.timedate1.xml
|
||||
/scsi_id
|
||||
/systemadm
|
||||
/systemctl
|
||||
|
55
Makefile.am
55
Makefile.am
@ -63,7 +63,6 @@ LIBSYSTEMD_JOURNAL_AGE=11
|
||||
dbuspolicydir=@dbuspolicydir@
|
||||
dbussessionservicedir=@dbussessionservicedir@
|
||||
dbussystemservicedir=@dbussystemservicedir@
|
||||
dbusinterfacedir=@dbusinterfacedir@
|
||||
pamlibdir=@pamlibdir@
|
||||
pamconfdir=@pamconfdir@
|
||||
pkgconfigdatadir=$(datadir)/pkgconfig
|
||||
@ -127,7 +126,6 @@ nodist_udevrules_DATA =
|
||||
dist_pkgsysconf_DATA =
|
||||
dist_pkgdata_DATA =
|
||||
dist_dbuspolicy_DATA =
|
||||
dbusinterface_DATA =
|
||||
dist_dbussystemservice_DATA =
|
||||
check_PROGRAMS =
|
||||
check_DATA =
|
||||
@ -499,8 +497,7 @@ EXTRA_DIST += \
|
||||
units/initrd-cleanup.service.in \
|
||||
units/initrd-udevadm-cleanup-db.service.in \
|
||||
units/initrd-switch-root.service.in \
|
||||
units/systemd-nspawn@.service.in \
|
||||
introspect.awk
|
||||
units/systemd-nspawn@.service.in
|
||||
|
||||
CLEANFILES += \
|
||||
units/console-shell.service.m4 \
|
||||
@ -1078,29 +1075,9 @@ dist_dbuspolicy_DATA += \
|
||||
dist_dbussystemservice_DATA += \
|
||||
src/core/org.freedesktop.systemd1.service
|
||||
|
||||
dbusinterface_DATA += \
|
||||
org.freedesktop.systemd1.Manager.xml \
|
||||
org.freedesktop.systemd1.Job.xml \
|
||||
org.freedesktop.systemd1.Unit.xml \
|
||||
org.freedesktop.systemd1.Service.xml \
|
||||
org.freedesktop.systemd1.Socket.xml \
|
||||
org.freedesktop.systemd1.Timer.xml \
|
||||
org.freedesktop.systemd1.Target.xml \
|
||||
org.freedesktop.systemd1.Device.xml \
|
||||
org.freedesktop.systemd1.Mount.xml \
|
||||
org.freedesktop.systemd1.Automount.xml \
|
||||
org.freedesktop.systemd1.Snapshot.xml \
|
||||
org.freedesktop.systemd1.Swap.xml \
|
||||
org.freedesktop.systemd1.Path.xml
|
||||
|
||||
polkitpolicy_in_in_files += \
|
||||
src/core/org.freedesktop.systemd1.policy.in.in
|
||||
|
||||
org.freedesktop.systemd1.%.xml: systemd
|
||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
|
||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
||||
|
||||
pkgconfigdata_DATA = \
|
||||
src/core/systemd.pc
|
||||
|
||||
@ -3483,14 +3460,6 @@ dist_dbussystemservice_DATA += \
|
||||
polkitpolicy_files += \
|
||||
src/hostname/org.freedesktop.hostname1.policy
|
||||
|
||||
dbusinterface_DATA += \
|
||||
org.freedesktop.hostname1.xml
|
||||
|
||||
org.freedesktop.hostname1.xml: systemd-hostnamed
|
||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
|
||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
||||
|
||||
SYSTEM_UNIT_ALIASES += \
|
||||
systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
|
||||
|
||||
@ -3553,14 +3522,6 @@ dist_dbussystemservice_DATA += \
|
||||
polkitpolicy_files += \
|
||||
src/locale/org.freedesktop.locale1.policy
|
||||
|
||||
dbusinterface_DATA += \
|
||||
org.freedesktop.locale1.xml
|
||||
|
||||
org.freedesktop.locale1.xml: systemd-localed
|
||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
|
||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
||||
|
||||
SYSTEM_UNIT_ALIASES += \
|
||||
systemd-localed.service dbus-org.freedesktop.locale1.service
|
||||
|
||||
@ -3628,14 +3589,6 @@ nodist_systemunit_DATA += \
|
||||
polkitpolicy_files += \
|
||||
src/timedate/org.freedesktop.timedate1.policy
|
||||
|
||||
org.freedesktop.timedate1.xml: systemd-timedated
|
||||
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
|
||||
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
||||
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
||||
|
||||
dbusinterface_DATA += \
|
||||
org.freedesktop.timedate1.xml
|
||||
|
||||
INSTALL_DIRS += \
|
||||
$(prefix)/lib/systemd/ntp-units.d \
|
||||
$(sysconfdir)/systemd/ntp-units.d
|
||||
@ -4400,11 +4353,6 @@ EXTRA_DIST += \
|
||||
man/custom-man.xsl
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
|
||||
|
||||
CLEANFILES += \
|
||||
$(dbusinterface_DATA)
|
||||
|
||||
if HAVE_SYSV_COMPAT
|
||||
sysvinit_DATA = \
|
||||
docs/sysvinit/README
|
||||
@ -4538,7 +4486,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
|
||||
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
|
||||
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
|
||||
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
|
||||
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
|
||||
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
|
||||
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
|
||||
|
@ -94,7 +94,6 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1])
|
||||
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
|
||||
enable_introspection=no])
|
||||
|
||||
AC_CHECK_TOOL(OBJCOPY, objcopy)
|
||||
AC_CHECK_TOOL(STRINGS, strings)
|
||||
AC_CHECK_TOOL(GPERF, gperf)
|
||||
if test -z "$GPERF" ; then
|
||||
|
@ -1,13 +0,0 @@
|
||||
BEGIN {
|
||||
print "<!DOCTYPE node PUBLIC DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"
|
||||
print "DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER>"
|
||||
print "<node>"
|
||||
}
|
||||
|
||||
// {
|
||||
print
|
||||
}
|
||||
|
||||
END {
|
||||
print "</node>"
|
||||
}
|
@ -118,20 +118,6 @@
|
||||
configuration items understood in unit
|
||||
definition files.</para></listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><option>--introspect=</option></term>
|
||||
|
||||
<listitem><para>Extract D-Bus
|
||||
interface introspection data. This is
|
||||
mostly useful at install time
|
||||
to generate data suitable for the
|
||||
D-Bus interfaces
|
||||
repository. Optionally the interface
|
||||
name for the introspection data may be
|
||||
specified. If omitted, the
|
||||
introspection data for all interfaces
|
||||
is dumped.</para></listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><option>--unit=</option></term>
|
||||
|
||||
|
@ -47,7 +47,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Automount\0"
|
||||
|
||||
const char bus_automount_interface[] _introspect_("Automount") = BUS_AUTOMOUNT_INTERFACE;
|
||||
const char bus_automount_interface[] = BUS_AUTOMOUNT_INTERFACE;
|
||||
|
||||
const char bus_automount_invalidating_properties[] =
|
||||
"Result\0";
|
||||
|
@ -43,7 +43,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Device\0"
|
||||
|
||||
const char bus_device_interface[] _introspect_("Device") = BUS_DEVICE_INTERFACE;
|
||||
const char bus_device_interface[] = BUS_DEVICE_INTERFACE;
|
||||
|
||||
const char bus_device_invalidating_properties[] =
|
||||
"SysFSPath\0";
|
||||
|
@ -45,7 +45,7 @@
|
||||
BUS_INTROSPECTABLE_INTERFACE \
|
||||
"</node>\n"
|
||||
|
||||
const char bus_job_interface[] _introspect_("Job") = BUS_JOB_INTERFACE;
|
||||
const char bus_job_interface[] = BUS_JOB_INTERFACE;
|
||||
|
||||
#define INTERFACES_LIST \
|
||||
BUS_GENERIC_INTERFACES_LIST \
|
||||
|
@ -321,7 +321,7 @@
|
||||
BUS_GENERIC_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Manager\0"
|
||||
|
||||
const char bus_manager_interface[] _introspect_("Manager") = BUS_MANAGER_INTERFACE;
|
||||
const char bus_manager_interface[] = BUS_MANAGER_INTERFACE;
|
||||
|
||||
static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_exec_output, exec_output, ExecOutput);
|
||||
|
||||
|
@ -62,7 +62,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Mount\0"
|
||||
|
||||
const char bus_mount_interface[] _introspect_("Mount") = BUS_MOUNT_INTERFACE;
|
||||
const char bus_mount_interface[] = BUS_MOUNT_INTERFACE;
|
||||
|
||||
const char bus_mount_invalidating_properties[] =
|
||||
"What\0"
|
||||
|
@ -50,7 +50,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Path\0"
|
||||
|
||||
const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
|
||||
const char bus_path_interface[] = BUS_PATH_INTERFACE;
|
||||
|
||||
const char bus_path_invalidating_properties[] =
|
||||
"Result\0";
|
||||
|
@ -51,7 +51,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Scope\0"
|
||||
|
||||
const char bus_scope_interface[] _introspect_("Scope") = BUS_SCOPE_INTERFACE;
|
||||
const char bus_scope_interface[] = BUS_SCOPE_INTERFACE;
|
||||
|
||||
static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_scope_append_scope_result, scope_result, ScopeResult);
|
||||
|
||||
|
@ -81,7 +81,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Service\0"
|
||||
|
||||
const char bus_service_interface[] _introspect_("Service") = BUS_SERVICE_INTERFACE;
|
||||
const char bus_service_interface[] = BUS_SERVICE_INTERFACE;
|
||||
|
||||
const char bus_service_invalidating_properties[] =
|
||||
"ExecStartPre\0"
|
||||
|
@ -47,7 +47,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Slice\0"
|
||||
|
||||
const char bus_slice_interface[] _introspect_("Slice") = BUS_SLICE_INTERFACE;
|
||||
const char bus_slice_interface[] = BUS_SLICE_INTERFACE;
|
||||
|
||||
DBusHandlerResult bus_slice_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
|
||||
Slice *s = SLICE(u);
|
||||
|
@ -44,7 +44,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Snapshot\0"
|
||||
|
||||
const char bus_snapshot_interface[] _introspect_("Snapshot") = BUS_SNAPSHOT_INTERFACE;
|
||||
const char bus_snapshot_interface[] = BUS_SNAPSHOT_INTERFACE;
|
||||
|
||||
static const BusProperty bus_snapshot_properties[] = {
|
||||
{ "Cleanup", bus_property_append_bool, "b", offsetof(Snapshot, cleanup) },
|
||||
|
@ -87,7 +87,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Socket\0"
|
||||
|
||||
const char bus_socket_interface[] _introspect_("Socket") = BUS_SOCKET_INTERFACE;
|
||||
const char bus_socket_interface[] = BUS_SOCKET_INTERFACE;
|
||||
|
||||
const char bus_socket_invalidating_properties[] =
|
||||
"ExecStartPre\0"
|
||||
|
@ -59,7 +59,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Swap\0"
|
||||
|
||||
const char bus_swap_interface[] _introspect_("Swap") = BUS_SWAP_INTERFACE;
|
||||
const char bus_swap_interface[] = BUS_SWAP_INTERFACE;
|
||||
|
||||
const char bus_swap_invalidating_properties[] =
|
||||
"What\0"
|
||||
|
@ -44,7 +44,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Target\0"
|
||||
|
||||
const char bus_target_interface[] _introspect_("Target") = BUS_TARGET_INTERFACE;
|
||||
const char bus_target_interface[] = BUS_TARGET_INTERFACE;
|
||||
|
||||
DBusHandlerResult bus_target_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
|
||||
const BusBoundProperties bps[] = {
|
||||
|
@ -51,7 +51,7 @@
|
||||
BUS_UNIT_INTERFACES_LIST \
|
||||
"org.freedesktop.systemd1.Timer\0"
|
||||
|
||||
const char bus_timer_interface[] _introspect_("Timer") = BUS_TIMER_INTERFACE;
|
||||
const char bus_timer_interface[] = BUS_TIMER_INTERFACE;
|
||||
|
||||
const char bus_timer_invalidating_properties[] =
|
||||
"TimersMonotonic\0"
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include "path-util.h"
|
||||
#include "fileio.h"
|
||||
|
||||
const char bus_unit_interface[] _introspect_("Unit") = BUS_UNIT_INTERFACE;
|
||||
const char bus_unit_interface[] = BUS_UNIT_INTERFACE;
|
||||
|
||||
#define INVALIDATING_PROPERTIES \
|
||||
"LoadState\0" \
|
||||
|
@ -735,7 +735,6 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
ARG_SHOW_STATUS,
|
||||
ARG_DESERIALIZE,
|
||||
ARG_SWITCHED_ROOT,
|
||||
ARG_INTROSPECT,
|
||||
ARG_DEFAULT_STD_OUTPUT,
|
||||
ARG_DEFAULT_STD_ERROR
|
||||
};
|
||||
@ -758,7 +757,6 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
{ "show-status", optional_argument, NULL, ARG_SHOW_STATUS },
|
||||
{ "deserialize", required_argument, NULL, ARG_DESERIALIZE },
|
||||
{ "switched-root", no_argument, NULL, ARG_SWITCHED_ROOT },
|
||||
{ "introspect", optional_argument, NULL, ARG_INTROSPECT },
|
||||
{ "default-standard-output", required_argument, NULL, ARG_DEFAULT_STD_OUTPUT, },
|
||||
{ "default-standard-error", required_argument, NULL, ARG_DEFAULT_STD_ERROR, },
|
||||
{ NULL, 0, NULL, 0 }
|
||||
@ -930,27 +928,6 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
arg_switched_root = true;
|
||||
break;
|
||||
|
||||
case ARG_INTROSPECT: {
|
||||
const char * const * i = NULL;
|
||||
|
||||
for (i = bus_interface_table; *i; i += 2)
|
||||
if (!optarg || streq(i[0], optarg)) {
|
||||
fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
|
||||
"<node>\n", stdout);
|
||||
fputs(i[1], stdout);
|
||||
fputs("</node>\n", stdout);
|
||||
|
||||
if (optarg)
|
||||
break;
|
||||
}
|
||||
|
||||
if (!i[0] && optarg)
|
||||
log_error("Unknown interface %s.", optarg);
|
||||
|
||||
arg_action = ACTION_DONE;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'h':
|
||||
arg_action = ACTION_HELP;
|
||||
break;
|
||||
@ -1013,7 +990,6 @@ static int help(void) {
|
||||
" -h --help Show this help\n"
|
||||
" --test Determine startup sequence, dump it and exit\n"
|
||||
" --dump-configuration-items Dump understood unit configuration items\n"
|
||||
" --introspect[=INTERFACE] Extract D-Bus interface data\n"
|
||||
" --unit=UNIT Set default unit\n"
|
||||
" --system Run a system instance, even if PID != 1\n"
|
||||
" --user Run a user instance\n"
|
||||
|
@ -78,7 +78,7 @@
|
||||
BUS_GENERIC_INTERFACES_LIST \
|
||||
"org.freedesktop.locale1\0"
|
||||
|
||||
const char locale_interface[] _introspect_("locale1") = INTERFACE;
|
||||
const char locale_interface[] = INTERFACE;
|
||||
|
||||
enum {
|
||||
/* We don't list LC_ALL here on purpose. People should be
|
||||
@ -1336,14 +1336,6 @@ int main(int argc, char *argv[]) {
|
||||
label_init("/etc");
|
||||
umask(0022);
|
||||
|
||||
if (argc == 2 && streq(argv[1], "--introspect")) {
|
||||
fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
|
||||
"<node>\n", stdout);
|
||||
fputs(locale_interface, stdout);
|
||||
fputs("</node>\n", stdout);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (argc != 1) {
|
||||
log_error("This program takes no arguments.");
|
||||
r = -EINVAL;
|
||||
|
@ -44,7 +44,6 @@
|
||||
#define _public_ __attribute__ ((visibility("default")))
|
||||
#define _hidden_ __attribute__ ((visibility("hidden")))
|
||||
#define _weakref_(x) __attribute__((weakref(#x)))
|
||||
#define _introspect_(x) __attribute__((section("introspect." x)))
|
||||
#define _alignas_(x) __attribute__((aligned(__alignof(x))))
|
||||
#define _cleanup_(x) __attribute__((cleanup(x)))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user