Jorijn van der Graaf
2fe991a14e
An upgrade left the old imsd and imsd-ofonod running until they were next restarted, while a changed bus policy is live the moment apk writes it: dbus-broker-launch reloads on its own. A policy that relies on a check inside the daemons would face the old daemons in between. Mark imsd.service and imsd-ofonod.service needs-restart in post-upgrade scripts; the systemd trigger restarts them once the transaction is done (enqueue-marked). A call in progress ends. The same scripts run as post-install: `apk del` removes a package's files and leaves its daemon running, so a later `apk add` of the package is this upgrade for that daemon — and apk runs the post-install script, not post-upgrade, for a package it adds. GNOME Calls 50.0 dials nothing after imsd-ofonod restarts under it until it restarts too, so imsd-ofonod's ExecStartPost restarts the Calls daemon of each user running one — not at the unit's first start since boot, when a Calls that runs already is left alone. A daemon older than 0.3.10 kept its bring-up throttle wait in memory only, so a restart lost it. imsd's post-upgrade records that daemon's invocation, and imsd-handover.sh, an ExecStartPre after ims-pdn-up.sh, reads the invocation's journal and, while the fresh-SA throttle's wait it finds there still runs (`spi-s=0`; the old daemon's other deferrals are not handed over), writes what is left of it to the holds file when this start's LOCAL is the address the wait was earned on, or when that address cannot be read; when LOCAL is another address, only the verdict that the old registration is gone. Tested on the dev phone (KPN) in builds of this series; not every path has run there.
162 lines
6.5 KiB
Makefile
162 lines
6.5 KiB
Makefile
# SPDX-License-Identifier: GPL-3.0-only
|
|
# SPDX-FileCopyrightText: Copyright (C) 2026 Catcrafts®
|
|
#
|
|
# Distro-packaging build path. project.cpp (crafter-build) remains the
|
|
# canonical build description; this Makefile mirrors it for environments
|
|
# where crafter-build isn't packaged — same clang module pipeline, same
|
|
# flags. Keep the two in sync when products, module partitions or link
|
|
# flags change.
|
|
#
|
|
# make -> build/make/{imsd,imsd-media,imsd-dialerd,imsd-ofonod}
|
|
# make check -> build + run the 7 unit-test suites
|
|
# make install -> DESTDIR/PREFIX staged install (binaries + systemd
|
|
# units, D-Bus policies, dialerd autostart, the GNOME
|
|
# Calls plugin override, the imsd-ofono preset, and the libexec scripts
|
|
# ims-pdn-up.sh, imsd-handover.sh, imsd-ofono-restart-calls.sh)
|
|
#
|
|
# Requires clang++ with libc++ and the libc++ std module sources
|
|
# (std.cppm — Alpine: llvm-runtimes, Arch: libc++). Override STD_CPPM if
|
|
# yours lives elsewhere.
|
|
|
|
# make's builtin default is CXX=g++, and distro build environments (abuild)
|
|
# export CXX=c++ — both gcc, which has no --precompile. This build requires
|
|
# clang: the file assignment deliberately ignores the environment while still
|
|
# yielding to an explicit `make CXX=...`.
|
|
CXX = clang++
|
|
AR ?= ar
|
|
PKG_CONFIG ?= pkg-config
|
|
STD_CPPM ?= /usr/share/libc++/v1/std.cppm
|
|
|
|
O ?= build/make
|
|
PCM = $(O)/pcm
|
|
OBJ = $(O)/obj
|
|
|
|
OPT ?= -O3
|
|
# One flag set for every TU: BMIs are rejected on compiler-option mismatch,
|
|
# so per-target extras are limited to -I/-D (compile) and -l/-L (link).
|
|
ALL_CXXFLAGS = -std=c++26 -stdlib=libc++ $(OPT) $(CXXFLAGS)
|
|
ALL_LDFLAGS = -fuse-ld=lld $(LDFLAGS)
|
|
|
|
# pkg-config gio-2.0: only -I/-D pass through — it also emits -pthread,
|
|
# which would config-mismatch the shared std BMI (project.cpp filters
|
|
# identically). pthread lives in libc on every platform we target.
|
|
GIO_CFLAGS := $(filter -I% -D%,$(shell $(PKG_CONFIG) --cflags gio-2.0))
|
|
GIO_LIBS := $(filter -l% -L%,$(shell $(PKG_CONFIG) --libs gio-2.0))
|
|
ifeq ($(strip $(GIO_LIBS)),)
|
|
GIO_LIBS := -lgio-2.0 -lgobject-2.0 -lglib-2.0
|
|
endif
|
|
|
|
# Imsd module partitions, plus the primary interface last. The BMI file
|
|
# names must stay <module>-<partition>.pcm — that is how clang resolves
|
|
# `import :Part;` under -fprebuilt-module-path.
|
|
PARTITIONS = Imsd-Util Imsd-Sip Imsd-Sdp Imsd-Aka Imsd-Ipsec \
|
|
Imsd-Messages Imsd-Engine
|
|
CORE_MODULES = $(PARTITIONS) Imsd
|
|
CORE_OBJS = $(CORE_MODULES:%=$(OBJ)/%.o)
|
|
|
|
TESTS = Util Aka Ipsec Messages Engine Sip Sdp
|
|
|
|
all: $(O)/imsd $(O)/imsd-media $(O)/imsd-dialerd $(O)/imsd-ofonod
|
|
|
|
# ---- module BMIs ----------------------------------------------------------
|
|
|
|
$(PCM)/std.pcm: $(STD_CPPM) | $(PCM)
|
|
$(CXX) $(ALL_CXXFLAGS) -Wno-reserved-identifier \
|
|
-Wno-reserved-module-identifier --precompile $< -o $@
|
|
|
|
$(PCM)/%.pcm: interfaces/%.cppm $(PCM)/std.pcm | $(PCM)
|
|
$(CXX) $(ALL_CXXFLAGS) -fprebuilt-module-path=$(PCM) --precompile $< -o $@
|
|
|
|
# partition import graph (see the `import :X;` lines in interfaces/)
|
|
$(PCM)/Imsd-Aka.pcm $(PCM)/Imsd-Ipsec.pcm: $(PCM)/Imsd-Util.pcm
|
|
$(PCM)/Imsd-Messages.pcm: $(PCM)/Imsd-Util.pcm $(PCM)/Imsd-Aka.pcm \
|
|
$(PCM)/Imsd-Sip.pcm
|
|
$(PCM)/Imsd-Engine.pcm: $(PCM)/Imsd-Util.pcm $(PCM)/Imsd-Sip.pcm \
|
|
$(PCM)/Imsd-Sdp.pcm $(PCM)/Imsd-Messages.pcm
|
|
$(PCM)/Imsd.pcm: $(PARTITIONS:%=$(PCM)/%.pcm)
|
|
|
|
# ---- imsd-core (static lib of the pure-C++ engine modules) ----------------
|
|
|
|
$(OBJ)/%.o: $(PCM)/%.pcm | $(OBJ)
|
|
$(CXX) $(ALL_CXXFLAGS) -fprebuilt-module-path=$(PCM) -c $< -o $@
|
|
|
|
$(O)/libimsd-core.a: $(CORE_OBJS)
|
|
$(AR) rcs $@ $^
|
|
|
|
# ---- executables -----------------------------------------------------------
|
|
|
|
$(OBJ)/main.o: implementations/main.cpp $(PCM)/Imsd.pcm | $(OBJ)
|
|
$(CXX) $(ALL_CXXFLAGS) $(GIO_CFLAGS) -fprebuilt-module-path=$(PCM) \
|
|
-c $< -o $@
|
|
|
|
$(O)/imsd: $(OBJ)/main.o $(O)/libimsd-core.a
|
|
$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ $(GIO_LIBS) -lpthread -o $@
|
|
|
|
$(OBJ)/media.o: implementations/media.cpp $(PCM)/std.pcm | $(OBJ)
|
|
$(CXX) $(ALL_CXXFLAGS) -fprebuilt-module-path=$(PCM) -c $< -o $@
|
|
|
|
$(O)/imsd-media: $(OBJ)/media.o
|
|
$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ -ldl -lpthread -o $@
|
|
|
|
$(OBJ)/dialerd.o: implementations/dialerd.cpp $(PCM)/std.pcm | $(OBJ)
|
|
$(CXX) $(ALL_CXXFLAGS) $(GIO_CFLAGS) -fprebuilt-module-path=$(PCM) \
|
|
-c $< -o $@
|
|
|
|
$(O)/imsd-dialerd: $(OBJ)/dialerd.o
|
|
$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ $(GIO_LIBS) -o $@
|
|
|
|
$(OBJ)/ofonod.o: implementations/ofonod.cpp $(PCM)/std.pcm | $(OBJ)
|
|
$(CXX) $(ALL_CXXFLAGS) $(GIO_CFLAGS) -fprebuilt-module-path=$(PCM) \
|
|
-c $< -o $@
|
|
|
|
$(O)/imsd-ofonod: $(OBJ)/ofonod.o
|
|
$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ $(GIO_LIBS) -o $@
|
|
|
|
# ---- tests -----------------------------------------------------------------
|
|
|
|
$(O)/tests/%: tests/%/main.cpp $(PCM)/Imsd.pcm $(O)/libimsd-core.a | $(O)/tests
|
|
$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) -fprebuilt-module-path=$(PCM) \
|
|
$< $(O)/libimsd-core.a -lpthread -o $@
|
|
|
|
check: $(TESTS:%=$(O)/tests/%)
|
|
@fail=0; for t in $(TESTS); do \
|
|
echo "== $$t"; $(O)/tests/$$t || fail=1; \
|
|
done; exit $$fail
|
|
|
|
# ---- install ----------------------------------------------------------------
|
|
|
|
PREFIX ?= /usr
|
|
|
|
install: all
|
|
install -Dm755 $(O)/imsd $(DESTDIR)$(PREFIX)/bin/imsd
|
|
install -Dm755 $(O)/imsd-dialerd $(DESTDIR)$(PREFIX)/bin/imsd-dialerd
|
|
install -Dm755 $(O)/imsd-ofonod $(DESTDIR)$(PREFIX)/bin/imsd-ofonod
|
|
install -Dm755 $(O)/imsd-media $(DESTDIR)$(PREFIX)/libexec/imsd-media
|
|
install -Dm755 packaging/ims-pdn-up.sh \
|
|
$(DESTDIR)$(PREFIX)/libexec/ims-pdn-up.sh
|
|
install -Dm755 packaging/imsd-handover.sh \
|
|
$(DESTDIR)$(PREFIX)/libexec/imsd-handover.sh
|
|
install -Dm644 packaging/imsd.service \
|
|
$(DESTDIR)$(PREFIX)/lib/systemd/system/imsd.service
|
|
install -Dm644 packaging/imsd-dialerd.desktop \
|
|
$(DESTDIR)/etc/xdg/autostart/imsd-dialerd.desktop
|
|
install -Dm644 packaging/net.catcrafts.IMS1.conf \
|
|
$(DESTDIR)$(PREFIX)/share/dbus-1/system.d/net.catcrafts.IMS1.conf
|
|
install -Dm644 packaging/imsd-ofonod.service \
|
|
$(DESTDIR)$(PREFIX)/lib/systemd/system/imsd-ofonod.service
|
|
install -Dm755 packaging/imsd-ofono-restart-calls.sh \
|
|
$(DESTDIR)$(PREFIX)/libexec/imsd-ofono-restart-calls.sh
|
|
install -Dm644 packaging/org.ofono.conf \
|
|
$(DESTDIR)$(PREFIX)/share/dbus-1/system.d/imsd-ofono.conf
|
|
install -Dm644 packaging/90_imsd-ofono.gschema.override \
|
|
$(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/90_imsd-ofono.gschema.override
|
|
install -Dm644 packaging/80-imsd-ofono.preset \
|
|
$(DESTDIR)$(PREFIX)/lib/systemd/system-preset/80-imsd-ofono.preset
|
|
|
|
$(PCM) $(OBJ) $(O)/tests:
|
|
mkdir -p $@
|
|
|
|
clean:
|
|
rm -rf $(O)
|
|
|
|
.PHONY: all check install clean
|