Browse Source

Prep v235: Update root files to upstream commit 896bbe7

undefined
Sven Eden 3 years ago
parent
commit
852a2106db
6 changed files with 37 additions and 311 deletions
  1. +4
    -298
      .gitignore
  2. +1
    -0
      .mailmap
  3. +5
    -0
      Makefile
  4. +0
    -7
      TODO
  5. +21
    -0
      configure
  6. +6
    -6
      meson.build

+ 4
- 298
.gitignore View File

@@ -1,329 +1,35 @@
*.a
*.cache
*.gch
*.la
*.lo
*.log
*.o
*.plist
*.py[co]
*.stamp
*.swp
*.trs
*~
.config.args
.deps/
.dirstamp
.libs/
/*.gcda
/*.gcno
/*.tar.bz2
/*.tar.gz
/*.tar.xz
/30-systemd-environment-d-generator
/GPATH
/GRTAGS
/GSYMS
/GTAGS
/Makefile
/TAGS
/ata_id
/bootctl
/build*
/busctl
/cdrom_id
/collect
/coredumpctl
/coverage/
/defined
/exported
/exported-*
/hostnamectl
/image.raw
/image.raw.cache-pre-dev
/image.raw.cache-pre-inst
/install-tree
/journalctl
/libtool
/linuxx64.efi.stub
/localectl
/loginctl
/machinectl
/mtd_probe
/networkctl
/scsi_id
/systemctl
/systemd
/systemd-ac-power
/systemd-analyze
/systemd-ask-password
/systemd-backlight
/systemd-binfmt
/systemd-bootx64.efi
/systemd-cat
/systemd-cgls
/systemd-cgroups-agent
/systemd-cgtop
/systemd-coredump
/systemd-cryptsetup
/systemd-cryptsetup-generator
/systemd-dbus1-generator
/systemd-debug-generator
/systemd-delta
/systemd-detect-virt
/systemd-dissect
/systemd-escape
/systemd-export
/systemd-firstboot
/systemd-fsck
/systemd-fstab-generator
/systemd-getty-generator
/systemd-gpt-auto-generator
/systemd-hibernate-resume
/systemd-hibernate-resume-generator
/systemd-hostnamed
/systemd-hwdb
/systemd-import
/systemd-importd
/systemd-inhibit
/systemd-initctl
/systemd-journal-gatewayd
/systemd-journal-remote
/systemd-journal-upload
/systemd-journald
/systemd-localed
/systemd-logind
/systemd-machine-id-setup
/systemd-machined
/systemd-modules-load
/systemd-mount
/systemd-networkd
/systemd-networkd-wait-online
/systemd-notify
/systemd-nspawn
/systemd-path
/systemd-pull
/systemd-quotacheck
/systemd-random-seed
/systemd-rc-local-generator
/systemd-remount-fs
/systemd-reply-password
/systemd-resolve
/systemd-resolved
/systemd-rfkill
/systemd-run
/systemd-shutdown
/systemd-sleep
/systemd-socket-activate
/systemd-socket-proxyd
/systemd-stdio-bridge
/systemd-sysctl
/systemd-system-update-generator
/systemd-sysusers
/systemd-sysv-generator
/systemd-timedated
/systemd-timesyncd
/systemd-tmpfiles
/systemd-tty-ask-password-agent
/systemd-udevd
/systemd-update-done
/systemd-update-utmp
/systemd-user-sessions
/systemd-vconsole-setup
/systemd-veritysetup
/systemd-veritysetup-generator
/systemd-volatile-root
/mkosi.builddir/
/tags
/test-acd
/test-acl-util
/test-af-list
/test-alloc-util
/test-architecture
/test-arphrd-list
/test-ask-password-api
/test-async
/test-audit-type
/test-barrier
/test-bitmap
/test-boot-timestamps
/test-btrfs
/test-bus-benchmark
/test-bus-chat
/test-bus-cleanup
/test-bus-creds
/test-bus-error
/test-bus-gvariant
/test-bus-introspect
/test-bus-kernel
/test-bus-kernel-bloom
/test-bus-marshal
/test-bus-match
/test-bus-objects
/test-bus-policy
/test-bus-server
/test-bus-signature
/test-bus-track
/test-bus-vtable
/test-bus-vtable-cc
/test-bus-zero-copy
/test-calendarspec
/test-cap-list
/test-capability
/test-catalog
/test-cgroup
/test-cgroup-mask
/test-cgroup-util
/test-clock
/test-compress
/test-compress-benchmark
/test-condition
/test-conf-files
/test-conf-parser
/test-copy
/test-coredump-vacuum
/test-cpu-set-util
/test-daemon
/test-date
/test-device-nodes
/test-dnssec-complex
/test-dhcp-client
/test-dhcp-option
/test-dhcp-server
/test-dhcp6-client
/test-dissect-image
/test-dns-domain
/test-dns-packet
/test-dnssec
/test-efi-disk.img
/test-ellipsize
/test-engine
/test-env-util
/test-escape
/test-event
/test-exec-util
/test-execute
/test-extract-word
/test-fd-util
/test-fdset
/test-fileio
/test-firewall-util
/test-fs-util
/test-fstab-util
/test-glob-util
/test-hash
/test-hashmap
/test-hexdecoct
/test-hostname
/test-hostname-util
/test-id128
/test-inhibit
/test-install
/test-install-root
/test-io-util
/test-ipcrm
/test-ipv4ll
/test-ipv4ll-manual
/test-job-type
/test-journal
/test-journal-enum
/test-journal-flush
/test-journal-importer
/test-journal-init
/test-journal-interleaving
/test-journal-match
/test-journal-send
/test-journal-stream
/test-journal-syslog
/test-journal-verify
/test-keymap-util
/test-libsystemd-sym*
/test-libudev
/test-libudev-sym*
/test-list
/test-lldp
/test-local-addresses
/test-locale-util
/test-log
/test-login
/test-login-shared
/test-login-tables
/test-loopback
/test-machine-tables
/test-mmap-cache
/test-mount-util
/test-namespace
/test-ndisc-rs
/test-netlink
/test-netlink-manual
/test-networkd-conf
/test-network
/test-network-tables
/test-ns
/test-nss
/test-parse-util
/test-patch-uid
/test-path
/test-path-lookup
/test-path-util
/test-prioq
/test-proc-cmdline
/test-process-util
/test-pty
/test-qcow2
/test-random-util
/test-ratelimit
/test-replace-var
/test-resolve
/test-resolve-tables
/test-resolved-packet
/test-ring
/test-rlimit-util
/test-sched-prio
/test-sd-dhcp-lease
/test-seccomp
/test-selinux
/test-set
/test-sizeof
/test-sigbus
/test-signal-util
/test-siphash24
/test-sleep
/test-socket-util
/test-stat-util
/test-strbuf
/test-string-util
/test-strip-tab-ansi
/test-strv
/test-strxcpyx
/test-tables
/test-terminal-util
/test-time
/test-timesync
/test-tmpfiles
/test-udev
/test-uid-range
/test-unaligned
/test-unit-file
/test-unit-name
/test-user-util
/test-utf8
/test-util
/test-verbs
/test-watchdog
/test-web-util
/test-xattr-util
/test-xml
/timedatectl
/udevadm
/undefined
/v4l_id
Makefile.in
__pycache__/
*.py[co]
aclocal.m4
config.h
config.h.in
config.log
config.status
configure
stamp-*

# elogind specific
/elogind


+ 1
- 0
.mailmap View File

@@ -123,3 +123,4 @@ Federico Di Pierro <nierro92@gmail.com>
Josef Andersson <josef.andersson@fripost.org>
Josef Andersson <l10nl18nsweja@gmail.com>
Hendrik Westerberg <hendrik@gestorf.com>
Stefan Pietsch <mail.ipv4v6@gmail.com>

+ 5
- 0
Makefile View File

@@ -0,0 +1,5 @@
all:
ninja -C build

install:
DESTDIR=$(DESTDIR) ninja -C build

+ 0
- 7
TODO View File

@@ -435,25 +435,18 @@ Features:
* sd-bus:
- EBADSLT handling
- GetAllProperties() on a non-existing object does not result in a failure currently
- kdbus: process fd=-1 for incoming msgs
- port to sd-resolve for connecting to TCP dbus servers
- kdbus: maybe add controlling tty metadata fields
- see if we can introduce a new sd_bus_get_owner_machine_id() call to retrieve the machine ID of the machine of the bus itself
- when kdbus does not take our message without memfds, try again with memfds
- see if we can drop more message validation on the sending side
- add API to clone sd_bus_message objects
- make AddMatch calls on dbus1 transports async?
- kdbus: matches against source or destination pids for an "strace -p"-like feel. Problem: The PID info needs to be available in userspace too...
- longer term: priority inheritance
- dbus spec updates:
- kdbus mapping
- NameLost/NameAcquired obsolete
- GVariant
- path escaping
- update systemd.special(7) to mention that dbus.socket is only about the compatibility socket now
- test bloom filter generation indexes
- kdbus: introduce a concept of "send-only" connections
- kdbus: add counter for refused unicast messages that is passed out via the RECV ioctl. SImilar to the counter for dropped multicast messages we already have.

* sd-event
- allow multiple signal handlers per signal?


+ 21
- 0
configure View File

@@ -0,0 +1,21 @@
#!/bin/bash -e

cflags=CFLAGS="$CFLAGS"
cxxflags=CXXFLAGS="$CXXFLAGS"
declare -a args
j=0
for i in "$@"; do
case "$i" in
CFLAGS=*)
cflags="$i";;
CXXFLAGS=*)
cxxflags="$i";;
*)
args[$j]="$i"
j=$((j+1))
esac
done

export "$cflags" "$cxxflags"
set -x
exec meson build "${args[@]}"

+ 6
- 6
meson.build View File

@@ -26,16 +26,17 @@ m4_defines = []

#####################################################################
#if 0 /// elogind does not need this
# elogind Note: We use precompiler masks for two reasons:
# 1) The masking is consistent with the sources
# 2) The git patch creator we use for preparing upstream patches
# manipulates commits to not take those masks out. Therefore
# it can be used to add commits updating the meson files, too.
# # Try to install the git pre-commit hook
# git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh'))
# if git_hook.returncode() == 0
# message(git_hook.stdout().strip())
# endif
#else
# elogind Note: We use precompiler masks for two reasons:
# 1) The masking is consistent with the sources
# 2) The git patch creator we use for preparing upstream patches
# manipulates commits to not take those masks out. Therefore
# it can be used to add commits updating the meson files, too.
#endif // 0
#####################################################################

@@ -189,7 +190,6 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysc
# conf.set_quoted('USER_DATA_UNIT_PATH', userunitdir)
# conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root'))
# conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database'))
#endif // 0
# conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
# conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd'))
# conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck'))


Loading…
Cancel
Save