vasilito
f31522130f
Build system (5 gaps hardened): - COOKBOOK_OFFLINE defaults to true (fork-mode) - normalize_patch handles diff -ruN format - New 'repo validate-patches' command (25/25 relibc patches) - 14 patched Qt/Wayland/display recipes added to protected list - relibc archive regenerated with current patch chain Boot fixes (fixable): - Full ISO EFI partition: 16 MiB → 1 MiB (matches mini, BIOS hardcoded 2 MiB offset) - D-Bus system bus: absolute /usr/bin/dbus-daemon path (was skipped) - redbear-sessiond: absolute /usr/bin/redbear-sessiond path (was skipped) - daemon framework: silenced spurious INIT_NOTIFY warnings for oneshot_async services (P0-daemon-silence-init-notify.patch) - udev-shim: demoted INIT_NOTIFY warning to INFO (expected for oneshot_async) - relibc: comprehensive named semaphores (sem_open/close/unlink) replacing upstream todo!() stubs - greeterd: Wayland socket timeout 15s → 30s (compositor DRM wait) - greeter-ui: built and linked (header guard unification, sem_compat stubs removed) - mc: un-ignored in both configs, fixed glib/libiconv/pcre2 transitive deps - greeter config: removed stale keymapd dependency from display/greeter services - prefix toolchain: relibc headers synced, _RELIBC_STDLIB_H guard unified Unfixable (diagnosed, upstream): - i2c-hidd: abort on no-I2C-hardware (QEMU) — process::exit → relibc abort - kded6/greeter-ui: page fault 0x8 — Qt library null deref - Thread panics fd != -1 — Rust std library on Redox - DHCP timeout / eth0 MAC — QEMU user-mode networking - hwrngd/thermald — no hardware RNG/thermal in VM - live preload allocation — BIOS memory fragmentation, continues on demand
95 lines
2.7 KiB
Bash
Executable File
95 lines
2.7 KiB
Bash
Executable File
#!/bin/bash
|
|
# Copyright (C) 2022 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
VERBOSE=0
|
|
CONTINUE_ON_FAILURE=1
|
|
|
|
function warn() {
|
|
echo "$@" >&2
|
|
}
|
|
|
|
function log() {
|
|
[[ "$VERBOSE" -eq 1 ]] && warn "$@"
|
|
}
|
|
|
|
function die() {
|
|
warn "$@"
|
|
exit 1
|
|
}
|
|
|
|
function continue_or_die() {
|
|
if [[ "$CONTINUE_ON_FAILURE" -eq 1 ]] ; then
|
|
warn "$@"
|
|
else
|
|
die "$@"
|
|
fi
|
|
}
|
|
|
|
function usage() {
|
|
die "usage: includemocs6.sh <srcdir> <builddir> <mocs_compilation_file>"
|
|
}
|
|
|
|
#
|
|
# sanity checks:
|
|
#
|
|
|
|
[[ ${#@} -eq 3 ]] || usage
|
|
|
|
SRCDIR="$1"
|
|
BUILDDIR="$2"
|
|
MOCS_COMPILATION_FILE="$3"
|
|
|
|
[[ -d "$BUILDDIR" ]] || die "Build dir \"$BUILDDIR\" doesn't exist or isn't a directory."
|
|
[[ -d "$SRCDIR" ]] || die "Source dir \"SRCDIR\" doesn't exist or isn't a directory."
|
|
[[ -f "$MOCS_COMPILATION_FILE" ]] || die "MOCs-compilation file \"$MOCS_COMPILATION_FILE\" doesn't exist or isn't a file."
|
|
|
|
#
|
|
# extract the files included by the mocs_compilation.cpp
|
|
#
|
|
|
|
# lines look like this:
|
|
# #include "SOFJASFD/moc_foo.cpp"
|
|
# #include "JFEJGKKS/moc_foo_p.cpp"
|
|
# extracting moc_foo(_p).cpp:
|
|
grep -E '^#include' "$MOCS_COMPILATION_FILE" | cut -d\" -f2 | cut -d/ -f2 | while read MOCFILE; do
|
|
log "MOCFILE=$MOCFILE"
|
|
C1="${MOCFILE##moc_}" # foo.cpp or foo_p.cpp or foo_p_p.cpp
|
|
case "$MOCFILE" in
|
|
moc_*_p_p.cpp)
|
|
C2="${C1/_p.cpp/.cpp}" # foo_p.cpp
|
|
C3="${C2/_p.cpp/.cpp}" # foo.cpp
|
|
CANDIDATES=("$C1" "$C2" "$C3")
|
|
;;
|
|
moc_*_p.cpp)
|
|
C2="${C1/_p.cpp/.cpp}" # foo.cpp
|
|
CANDIDATES=("$C1" "$C2")
|
|
;;
|
|
moc_*.cpp)
|
|
CANDIDATES=("$C1")
|
|
;;
|
|
*)
|
|
die "Don't know how to handle moc-file \"$MOCFILE\"..."
|
|
;;
|
|
esac
|
|
log "CANDIDATES=(${CANDIDATES[@]})"
|
|
for CANDIDATE in "${CANDIDATES[@]}"; do
|
|
CPPFILE="$(find "$SRCDIR" -name "$CANDIDATE")"
|
|
log "CPPFILE=$CPPFILE"
|
|
[[ -f "$CPPFILE" ]] && break
|
|
done
|
|
if [[ -f "$CPPFILE" ]] ; then
|
|
log "going to include $MOCFILE into $CPPFILE"
|
|
if ! grep -qE '^QT_END_NAMESPACE$' "$CPPFILE"; then
|
|
warn "Can't find QT_END_NAMESPACE in \"$CPPFILE\", simply appending the #include. Please check placement manually."
|
|
echo "#include \"$MOCFILE\"" >> "$CPPFILE" || die "Failed to write to \"$CPPFILE\""
|
|
else
|
|
sed -i -e "1,/QT_END_NAMESPACE/ s/QT_END_NAMESPACE/QT_END_NAMESPACE\n\n#include \"$MOCFILE\"/" "$CPPFILE" || die "Failed to includemoc \"$MOCFILE\" into \"$CPPFILE\"."
|
|
fi
|
|
else
|
|
continue_or_die "Can't find a cpp file for $MOCFILE (not looking for .cxx .cc etc)."
|
|
fi
|
|
done
|
|
|
|
exit 0
|