feat: S30.02 consumer-friendly CMake umbrellas + dogfood BDD targets

Bdd/Targets/FreeRtos/CMakeLists.txt

@@ -266,25 +266,9 @@ add_executable(SolidSyslogBddTarget
     Startup.c
     ${CMAKE_CURRENT_SOURCE_DIR}/Common/CmsdkUart.c
     ${CMAKE_CURRENT_SOURCE_DIR}/Common/Syscalls.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusFat/Source/SolidSyslogPlusFatFile.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusFat/Source/SolidSyslogPlusFatFileStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpAddress.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpAddressStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpDatagram.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpDatagramStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosMutex.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosMutexStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpResolver.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpResolverStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosSysUpTime.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpTcpStream.c
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source/SolidSyslogPlusTcpTcpStreamStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsStream.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsStreamStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsHmacSha256Policy.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsHmacSha256PolicyStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsAesGcmPolicy.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsAesGcmPolicyStatic.c
+    # SolidSyslog platform adapters arrive via the SolidSyslog::{PlusTcp,FreeRtos,
+    # MbedTls,PlusFat} pack umbrellas linked below (S30.02 dogfood) — their
+    # target_sources(INTERFACE) compile here against this target's config.
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/BddTargetErrorText.c
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/BddTargetFreeRtosPipeline.c
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/BddTargetCustomSd.c
@@ -317,13 +301,8 @@ target_include_directories(SolidSyslogBddTarget PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/Common                # CmsdkUart.h
     ${CMAKE_SOURCE_DIR}/Core/Interface                # SolidSyslog*.h
     ${CMAKE_SOURCE_DIR}/Core/Source                   # internal headers consumed by adapters
-    ${CMAKE_SOURCE_DIR}/Platform/PlusFat/Interface    # SolidSyslogPlusFatFile.h
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Interface   # SolidSyslogFreeRtos{Mutex,SysUpTime}.h
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source      # SolidSyslogFreeRtosMutexPrivate.h
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Interface    # SolidSyslogFreeRtos{Address,Datagram,Resolver,TcpStream}.h
-    ${CMAKE_SOURCE_DIR}/Platform/PlusTcp/Source       # SolidSyslogPlusTcpAddressPrivate.h
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Interface    # SolidSyslogMbedTlsStream.h
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source       # SolidSyslogMbedTlsStreamPrivate.h
+    # Platform/{PlusFat,FreeRtos,PlusTcp,MbedTls}/{Interface,Source} include dirs
+    # now arrive transitively from the SolidSyslog::* pack umbrellas linked below.
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common            # BddTargetInteractive.h
     ${BAKED_PEMS_DIR}                                 # BddBaked*.h (xxd -i output)
     ${FREERTOS_KERNEL_PATH}/include
@@ -352,6 +331,10 @@ set_source_files_properties(
 
 target_link_libraries(SolidSyslogBddTarget PRIVATE
     ${PROJECT_NAME}                                   # libSolidSyslog.a (cross-compiled)
+    SolidSyslog::PlusTcp                              # Address/Datagram/Resolver/TcpStream adapters (sources)
+    SolidSyslog::FreeRtos                             # Mutex + SysUpTime adapters (sources)
+    SolidSyslog::MbedTls                              # TLS Stream + HMAC/AES-GCM policy adapters (sources)
+    SolidSyslog::PlusFat                              # Plus-FAT file adapter (sources)
     mbedtls mbedx509 mbedcrypto                       # mbedTLS upstream (subproject, cross-compiled)
 )
 

Bdd/Targets/FreeRtosLwip/CMakeLists.txt

@@ -225,29 +225,12 @@ add_executable(SolidSyslogBddTargetLwip
     ${FREERTOS_COMMON_DIR}/CmsdkUart.c
     ${FREERTOS_COMMON_DIR}/Syscalls.c
     netif/EthernetIf.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawAddress.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawAddressStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawDnsResolver.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawDnsResolverStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawDatagram.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawDatagramStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawTcpStream.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawTcpStreamStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source/SolidSyslogLwipRawMarshal.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosMutex.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosMutexStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosSysUpTime.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsStream.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsStreamStatic.c
-    # At-rest store: FatFs file adapter + the mbedTLS HMAC / AES-GCM security
-    # policies (Crc16Policy lives in Core, already linked). diskio.c is the
-    # shared semihosting media driver (Bdd/Targets/Common, 8 MiB FAT16).
-    ${CMAKE_SOURCE_DIR}/Platform/FatFs/Source/SolidSyslogFatFsFile.c
-    ${CMAKE_SOURCE_DIR}/Platform/FatFs/Source/SolidSyslogFatFsFileStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsHmacSha256Policy.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsHmacSha256PolicyStatic.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsAesGcmPolicy.c
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source/SolidSyslogMbedTlsAesGcmPolicyStatic.c
+    # SolidSyslog platform adapters arrive via the SolidSyslog::* pack umbrellas
+    # linked below (S30.02 dogfood): LwipRawDnsResolver (the opt-in DNS component
+    # — pulls the LwipRaw umbrella's Address/Datagram/TcpStream/numeric-Resolver/
+    # Marshal too; the unused numeric resolver dead-strips), FreeRtos (Mutex +
+    # SysUpTime), MbedTls (TLS Stream + HMAC/AES-GCM policies), FatFs (file
+    # adapter). diskio.c is the shared semihosting media driver (8 MiB FAT16).
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/diskio.c
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/SemihostingDisk.c
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common/BddTargetErrorText.c
@@ -282,13 +265,8 @@ target_include_directories(SolidSyslogBddTargetLwip PRIVATE
     ${FREERTOS_COMMON_DIR}                            # CmsdkUart.h
     ${CMAKE_SOURCE_DIR}/Core/Interface                # SolidSyslog*.h
     ${CMAKE_SOURCE_DIR}/Core/Source                   # internal headers consumed by adapters
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Interface    # SolidSyslogLwipRaw{Address,DnsResolver,Datagram,TcpStream,Marshal}.h
-    ${CMAKE_SOURCE_DIR}/Platform/LwipRaw/Source        # SolidSyslogLwipRaw*Private.h
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Interface   # SolidSyslogFreeRtos{Mutex,SysUpTime}.h
-    ${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source      # SolidSyslogFreeRtosMutexPrivate.h
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Interface    # SolidSyslogMbedTlsStream.h, *Policy.h
-    ${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source       # SolidSyslogMbedTlsStreamPrivate.h
-    ${CMAKE_SOURCE_DIR}/Platform/FatFs/Interface      # SolidSyslogFatFsFile.h
+    # Platform/{LwipRaw,FreeRtos,MbedTls,FatFs}/{Interface,Source} include dirs
+    # now arrive transitively from the SolidSyslog::* pack umbrellas linked below.
     ${FATFS_STAGE_DIR}                                # ff.h, diskio.h + integrator ffconf.h colocated
     ${BAKED_PEMS_DIR}                                 # BddBaked*.h (xxd -i output)
     ${CMAKE_SOURCE_DIR}/Bdd/Targets/Common            # BddTargetInteractive.h, BddTargetSwitchConfig.h, …
@@ -300,6 +278,10 @@ target_include_directories(SolidSyslogBddTargetLwip PRIVATE
 
 target_link_libraries(SolidSyslogBddTargetLwip PRIVATE
     ${PROJECT_NAME}                                   # libSolidSyslog.a (cross-compiled)
+    SolidSyslog::LwipRawDnsResolver                   # DNS resolver (opt-in, needs LWIP_DNS=1) + LwipRaw umbrella
+    SolidSyslog::FreeRtos                             # Mutex + SysUpTime adapters (sources)
+    SolidSyslog::MbedTls                              # TLS Stream + HMAC/AES-GCM policy adapters (sources)
+    SolidSyslog::FatFs                                # FatFs file adapter (sources)
     mbedtls mbedx509 mbedcrypto                       # mbedTLS upstream (subproject, cross-compiled)
 )
 

DEVLOG.md

@@ -1,5 +1,49 @@
 # Dev Log
 
+## 2026-06-10 — S30.02 consumer-friendly CMake umbrellas + dogfood
+
+E30's CI-risk story. Made the six Pattern-B platform packs consumable in one line
+and proved it by routing the FreeRTOS BDD targets through them the way a customer
+would.
+
+### Decisions
+- **Packs carry their own sources.** Each pack (`FreeRtos`, `PlusTcp`, `LwipRaw`,
+  `MbedTls`, `FatFs`, `PlusFat`) now does `target_sources(<pack> INTERFACE …)`, so
+  linking it compiles the adapter `.c` into the consumer's target against the
+  consumer's config header. Discovered every pack's sources also need
+  `Core/Source` (the internal `SolidSyslogPoolAllocator.h`; MbedTls also
+  `SolidSyslogMacros.h`), so each pack exports `Interface` + `Source` +
+  `Core/Source` and links `SolidSyslogTunables` (Core/Interface). Nobody linked
+  these `INTERFACE` targets before, so the change is inert until consumers switch.
+- **`SolidSyslog::<Pack>` aliases.** Namespaced ALIAS per pack for the consumer
+  API.
+- **Umbrella vs component.** Umbrella = adapters that compile in *any* valid
+  config. The lwIP DNS resolver needs `LWIP_DNS=1`, so it's kept OUT of the
+  `LwipRaw` umbrella and shipped as opt-in `SolidSyslog::LwipRawDnsResolver`
+  (links the umbrella). Confirmed with David: MbedTls umbrella = Stream + both
+  at-rest policies (not split); tests stay hand-listed (they compile deliberate
+  per-adapter subsets — dogfood = BDD targets only).
+- **Dogfood = the two cross BDD targets.** FreeRtos (Plus-TCP) links
+  `SolidSyslog::{PlusTcp,FreeRtos,MbedTls,PlusFat}`; FreeRtosLwip links
+  `SolidSyslog::{LwipRawDnsResolver,FreeRtos,MbedTls,FatFs}`. Removed ~75 lines of
+  hand-listed `Platform/*/Source/*.c` + Platform include dirs.
+
+### Verification (local)
+- `freertos-cross` (Plus-TCP) and `freertos-cross-lwip` ARM ELFs both build + link
+  via the umbrellas.
+- Behaviour-neutral: same sources, same per-target config/defines. The lwIP target
+  now also *compiles* the umbrella's numeric resolver, but it's unreferenced and
+  `arm-none-eabi-nm` confirms it's **absent from the linked ELF** (dead-stripped
+  under `-Wl,--gc-sections`).
+- `freertos-host` TDD suite configures + passes (pack CMake executes cleanly on a
+  host compiler; tests unaffected).
+- Updated `getting-started.md` Path A to document the now-available umbrellas
+  (replacing the "lands in S30.02" placeholder).
+
+### Deferred
+- Manifest generation from CMake (S30.03 #569).
+- Fine-grained per-adapter component targets beyond the DnsResolver split.
+
 ## 2026-06-10 — S30.01 getting-started doc + integration manifest
 
 First story of E30 (#566, frictionless integration). Docs-only, authored against

Platform/FatFs/CMakeLists.txt

@@ -10,17 +10,29 @@
 # Tests/FatFs/*Test, downstream integrator apps) recompiles the adapter
 # sources with its own ffconf.h on the include path. Mirrors the
 # Platform/FreeRtos/ pack — see project_header_configured_platforms memory.
+#
+# The pack CARRIES its sources via target_sources(INTERFACE) (S30.02): a
+# consumer that links SolidSyslog::FatFs compiles the adapter into its own
+# target, seeing its own ffconf.h — no per-file listing. The consumer still
+# points at its own FatFs tree and supplies its own diskio.c.
 
 add_library(SolidSyslogFatFs INTERFACE)
 
-# No adapter sources at S08.05 slice 1 — first content
-# (SolidSyslogFatFsFile.c) lands at slice 2. The INTERFACE target exists
-# so the directory and CMake wiring are in place from the plumbing slice.
+target_sources(SolidSyslogFatFs INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogFatFsFile.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogFatFsFileStatic.c
+)
 
 target_include_directories(SolidSyslogFatFs INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/Interface
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source          # SolidSyslogFatFsFilePrivate.h
+    ${CMAKE_SOURCE_DIR}/Core/Source             # SolidSyslogPoolAllocator.h
 )
 
+target_link_libraries(SolidSyslogFatFs INTERFACE SolidSyslogTunables)
+
+add_library(SolidSyslog::FatFs ALIAS SolidSyslogFatFs)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Interface/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"

Platform/FreeRtos/CMakeLists.txt

@@ -13,17 +13,32 @@
 # Posix / Windows / OpenSSL keep the existing PRIVATE-into-${PROJECT_NAME}
 # pattern; their ABIs are OS-level, not header-configured. Don't retrofit
 # INTERFACE across the tree.
+#
+# The pack CARRIES its sources via target_sources(INTERFACE) (S30.02): a
+# consumer that links SolidSyslog::FreeRtos compiles the kernel-primitive
+# adapters into its own target, seeing its own FreeRTOSConfig.h — no per-file
+# listing. The consumer still points at its own FreeRTOS-Kernel tree.
 
 add_library(SolidSyslogFreeRtos INTERFACE)
 
-# No adapter sources at S08.01 — first content (SolidSyslogFreeRtosMutex.c)
-# lands at S08.04. The INTERFACE target exists so the directory and CMake
-# wiring are in place from day one.
+# Kernel primitives, independent of the chosen networking backend: the
+# static-allocation Mutex and the kernel-tick SysUpTime source.
+target_sources(SolidSyslogFreeRtos INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogFreeRtosMutex.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogFreeRtosMutexStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogFreeRtosSysUpTime.c
+)
 
 target_include_directories(SolidSyslogFreeRtos INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/Interface
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source          # SolidSyslogFreeRtosMutexPrivate.h
+    ${CMAKE_SOURCE_DIR}/Core/Source             # SolidSyslogPoolAllocator.h
 )
 
+target_link_libraries(SolidSyslogFreeRtos INTERFACE SolidSyslogTunables)
+
+add_library(SolidSyslog::FreeRtos ALIAS SolidSyslogFreeRtos)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Interface/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"

Platform/LwipRaw/CMakeLists.txt

@@ -15,13 +15,58 @@
 # primitives in Source/. Any host primitive needed (e.g. a wait primitive for DNS in
 # the future S28.07 sibling) is abstracted behind a SolidSyslog* vtable, mirroring
 # how SolidSyslogMutex abstracts locking. See E28 (#439) Architecture boundary.
+#
+# The pack CARRIES its umbrella sources via target_sources(INTERFACE) (S30.02):
+# a consumer that links SolidSyslog::LwipRaw compiles the adapter .c files into
+# its own target, seeing its own lwipopts.h — no per-file listing. The pack
+# exports the SolidSyslog-side include dirs its sources need (its own
+# Interface/Source, Core/Interface via SolidSyslogTunables, and Core/Source for
+# the internal pool-allocator helper); the consumer still points at its own lwIP
+# tree (lwip/*.h are consumer-located).
 
 add_library(SolidSyslogLwipRaw INTERFACE)
 
+# Umbrella = the adapters that compile in ANY valid lwIP config: Address,
+# Datagram, TcpStream, the NUMERIC Resolver, and the Marshal hop. The DNS
+# resolver is config-gated (needs LWIP_DNS=1) and is kept OUT of the umbrella —
+# see the SolidSyslogLwipRawDnsResolver component below.
+target_sources(SolidSyslogLwipRaw INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawAddress.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawAddressStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawDatagram.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawDatagramStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawTcpStream.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawTcpStreamStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawResolver.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawResolverStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawMarshal.c
+)
+
 target_include_directories(SolidSyslogLwipRaw INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/Interface
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source          # SolidSyslogLwipRaw*Private.h
+    ${CMAKE_SOURCE_DIR}/Core/Source             # SolidSyslogPoolAllocator.h
+)
+
+target_link_libraries(SolidSyslogLwipRaw INTERFACE SolidSyslogTunables)
+
+add_library(SolidSyslog::LwipRaw ALIAS SolidSyslogLwipRaw)
+
+# Opt-in DNS resolver component — REQUIRES LWIP_DNS=1 in the consumer's
+# lwipopts.h. Kept out of the umbrella so a numeric-only build never has to
+# enable DNS. Links the umbrella, so a consumer that wants DNS links just this
+# one target and gets Address/Datagram/TcpStream/Marshal too.
+add_library(SolidSyslogLwipRawDnsResolver INTERFACE)
+
+target_sources(SolidSyslogLwipRawDnsResolver INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawDnsResolver.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogLwipRawDnsResolverStatic.c
 )
 
+target_link_libraries(SolidSyslogLwipRawDnsResolver INTERFACE SolidSyslogLwipRaw)
+
+add_library(SolidSyslog::LwipRawDnsResolver ALIAS SolidSyslogLwipRawDnsResolver)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Interface/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"

Platform/MbedTls/CMakeLists.txt

@@ -11,18 +11,37 @@
 # sources from Source/ with its own mbedtls_config.h on the include path.
 # Mirrors Platform/FreeRtos/ and Platform/FatFs/ — see
 # project_header_configured_platforms memory.
+#
+# The pack CARRIES its umbrella sources via target_sources(INTERFACE) (S30.02):
+# a consumer that links SolidSyslog::MbedTls compiles the adapter .c files into
+# its own target, seeing its own mbedtls_config.h — no per-file listing. The
+# consumer still points at its own mbedTLS tree (mbedtls/*.h are consumer-located)
+# and sets MBEDTLS_USER_CONFIG_FILE on its target.
 
 add_library(SolidSyslogMbedTls INTERFACE)
 
-# No adapter sources at S08.07 slice 1 — first content
-# (SolidSyslogMbedTlsStream.h plus the three-TU split) lands in the
-# slice-1 green step. The INTERFACE target exists so the directory and
-# CMake wiring are in place from the plumbing slice.
+# Umbrella = all mbedTLS adapters (they all compile against the consumer's
+# mbedtls_config.h): the TLS Stream plus the two at-rest SecurityPolicies.
+# Unused TUs dead-strip at link time (-Wl,--gc-sections).
+target_sources(SolidSyslogMbedTls INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsStream.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsStreamStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsHmacSha256Policy.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsHmacSha256PolicyStatic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsAesGcmPolicy.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/SolidSyslogMbedTlsAesGcmPolicyStatic.c
+)
 
 target_include_directories(SolidSyslogMbedTls INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/Interface
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source          # SolidSyslogMbedTls*Private.h
+    ${CMAKE_SOURCE_DIR}/Core/Source             # SolidSyslogPoolAllocator.h, SolidSyslogMacros.h
 )
 
+target_link_libraries(SolidSyslogMbedTls INTERFACE SolidSyslogTunables)
+
+add_library(SolidSyslog::MbedTls ALIAS SolidSyslogMbedTls)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Interface/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"