mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 05:22:48 +07:00
Joachim Wiberg
127049d925
The other dbus-*.sh tests drive libink's own client, so the wire format was only ever checked against the implementation that wrote it, and the broker path had no coverage at all. Every bug found in it so far was found by hand on a target. Let the dbus plugin bring up a real dbus-daemon, wait for Finit to claim org.finit, then talk to Finit with dbus-send, which shares no code with us. The privileged call is the interesting one: it can only be answered by parking the call and asking the broker who sent it. The bus reads the policy Finit installs, so a malformed org.finit.conf fails here rather than on a target. Tests no longer build --with-libsystemd. Our replacement carries the real soname but only the sd_notify() symbols, so in the test root it shadowed the libsystemd the host's libdbus-1 wants and dbus-daemon died on a missing sd_is_socket. Nothing under test needs the shared library: serv is the only consumer and it compiles sd-daemon.c straight in, which it now does regardless of the flag so notify.sh keeps testing notify:systemd either way. Staged from the host by lib/sysroot.mk like any other binary, and skipped when the host has neither program. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
102 lines
4.1 KiB
Makefile
102 lines
4.1 KiB
Makefile
# Root file system for test environment.
|
|
#
|
|
# Copyright (c) 2021 Jacques de Laval <jacques@de-laval.se>
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in
|
|
# all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
# THE SOFTWARE.
|
|
|
|
srcdir ?= ../
|
|
SKEL ?= $(srcdir)/skel
|
|
DEST ?= ../sysroot
|
|
|
|
CACHE ?= ~/.cache
|
|
ARCH ?= x86_64
|
|
|
|
FINITBIN ?= ./sbin/finit
|
|
|
|
BBVER ?= 1_35_0
|
|
BBBIN = busybox-$(ARCH)
|
|
BBHOME ?= https://github.com/troglobit/busybox-builder/releases/download
|
|
BBURL ?= $(BBHOME)/$(BBVER)/$(BBBIN)
|
|
|
|
# glibc dlopen()s NSS modules at runtime, so ldd does not list them, but
|
|
# without libnss_files getpwnam() cannot resolve users inside the chroot
|
|
_libs_nss := $(firstword $(wildcard /lib/$(ARCH)-linux-gnu/libnss_files.so.2 \
|
|
/usr/lib/$(ARCH)-linux-gnu/libnss_files.so.2 \
|
|
/lib64/libnss_files.so.2 /lib/libnss_files.so.2))
|
|
# A real broker and a real client, staged when the host has them, so
|
|
# one test can check Finit against dbus-daemon instead of only against
|
|
# libink's own client. Absent is fine, dbus-broker.sh skips.
|
|
dbus_bins := $(foreach b,dbus-daemon dbus-send,$(firstword $(wildcard /usr/bin/$(b) /bin/$(b))))
|
|
# Given several binaries ldd prefixes each with a 'path:' header, and
|
|
# that trailing colon would land in a make target. Excluding it here
|
|
# is enough, no need for one ldd per binary.
|
|
_libs_dbus := $(if $(dbus_bins),$(shell ldd $(dbus_bins) | grep -Eo '/[^ :]+'))
|
|
|
|
# The binaries stage exactly like the libraries: same host path, same
|
|
# path under DEST, copied by the rule below.
|
|
_libs_src := $(shell ldd $(FINITBIN) | grep -Eo '/[^ ]+') $(_libs_nss) \
|
|
$(_libs_dbus) $(dbus_bins)
|
|
libs := $(foreach path,$(sort $(_libs_src)),$(abspath $(DEST))$(path))
|
|
|
|
all: $(libs) $(DEST)/bin/$(BBBIN)
|
|
@(cd $(DEST); \
|
|
for prg in `./bin/$(BBBIN) --list-full`; do \
|
|
case $$prg in \
|
|
usr/bin/* | usr/sbin/*) \
|
|
ln -sf ../../bin/$(BBBIN) $$prg;; \
|
|
bin/* | sbin/*) \
|
|
ln -sf ../bin/$(BBBIN) $$prg;; \
|
|
*) \
|
|
ln -sf bin/$(BBBIN) $$prg;; \
|
|
esac; \
|
|
done)
|
|
|
|
$(DEST)/bin/$(BBBIN).sha256:
|
|
@mkdir -p $(DEST)
|
|
@cp -a $(SKEL)/* $(DEST)/
|
|
@chmod -R u+w $(DEST)/
|
|
@find $(DEST) -name .empty -delete
|
|
|
|
$(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).sha256
|
|
@(cd $(dir $@); \
|
|
if ! sha256sum --status -c $(BBBIN).sha256 2>/dev/null; then \
|
|
if [ -d $(CACHE) ]; then \
|
|
echo "Cannot find $(BBBIN), checking $(CACHE) ..."; \
|
|
cd $(CACHE); \
|
|
cp -v $(DEST)/bin/$(BBBIN).sha256 .; \
|
|
if ! sha256sum --status -c $(BBBIN).sha256; then \
|
|
echo "No $(BBBIN), downloading $(BBURL) ..."; \
|
|
wget -O $(BBBIN) $(BBURL); \
|
|
else \
|
|
echo "Found valid $(BBBIN) in cache!"; \
|
|
fi; \
|
|
cp $(BBBIN) $@; \
|
|
cd $(dir $@); \
|
|
else \
|
|
echo "Cannot find $(BBBIN), downloading ..."; \
|
|
wget -O $@ $(BBURL); \
|
|
fi; \
|
|
sha256sum -c $(BBBIN).sha256 || (rm $@; false); \
|
|
fi)
|
|
@chmod +x $@
|
|
|
|
$(libs): $(DEST)/bin/$(BBBIN).sha256
|
|
mkdir -p $(dir $@)
|
|
cp $(patsubst $(abspath $(DEST))%,%,$@) $@
|