Skip to content

Commit ce338e7

Browse files
committed
inventory: mark cryptsetup2 fixed (x86 & ppc64); mark legacy cryptsetup UNUSED and note restoration; doc: record change
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 2299989 commit ce338e7

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

build_OFLAG_inventory.csv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module,arch,classification,sample_compile_line,log_path
22
cryptsetup2,ppc64,fixed - pre-configure sed applied; validated V=1 (x86 & ppc64); commit fac65ebc7e,"... -Oz -pthread -MT lib/crypto_backend/argon2/libargon2_la-argon2.lo ...","build/ppc64/log/cryptsetup2.log"
3+
cryptsetup2,x86,fixed - pre-configure sed applied; validated V=1 (x86 & ppc64); commit fac65ebc7e,"... CFLAGS=-Oz ./configure --host x86_64-elf-linux --prefix / --enable-internal-sse-argon2 ...","build/x86/log/cryptsetup2.configure.log"
34
zlib,x86,fixed - CFLAGS=-Oz applied (verified x86 & ppc64; legacy -O tokens remain in non-built files; TODO: verify arm64,riscv),"... -Oz -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -c -o adler32.o adler32.c","build/x86/log/zlib.log"
45
zlib,ppc64,fixed - CFLAGS=-Oz applied (verified x86 & ppc64; legacy -O tokens remain in non-built files; TODO: verify arm64,riscv),"... -Oz -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -c -o adler32.o adler32.c","build/ppc64/log/zlib.log"
56
tpmtotp,x86,fixed - pre-configure sed applied; validated V=1 (x86 & ppc64),"... -Oz -ggdb -Wp,-MMD,./.nv.o.d -Wp,-MT,nv.o -W -Wall -Wextra -std=c99 ... -o nv.o -c nv.c","build/x86/log/tpmtotp.log"
@@ -24,7 +25,8 @@ busybox,,OK - no -O2/-O3, ,build/x86/log/busybox.log
2425
cairo,,OK - no -O2/-O3, ,build/x86/log/cairo.log
2526
coreboot,,DEFERRED - per-board coreboot builds are out-of-scope for packaging-time fixes,,
2627
coreboot-blobs,,N/A - placeholder, ,
27-
cryptsetup,,UNKNOWN,,
28+
cryptsetup,,UNUSED - restored to HEAD; not referenced by any boards (no validation required),,
29+
cryptsetup,,UNUSED - restored to HEAD; not referenced by any boards (no validation required),,
2830
dropbear,x86,fixed - packaging-time sed normalizes -O/Os -> -Oz only; validated V=1 (x86); size regression observed (dropbear: 184,832 -> 241,248; ssh: 176,416 -> 233,048, ≈+56 KiB) — likely due to compiler/toolchain (GCC 15.1.0 vs GCC 9.4.0) or upstream version changes; follow-ups: rebuild with GCC 9.4, symbol/section diffs, or linker-level mitigations,"... -Oz -W -Wall ...","build/x86/dropbear-2025.88/config.log"
2931
e2fsprogs,,OK - CFLAGS=-Oz applied; Oz occurrences: 450,"... -Oz ...","build/x86/log/e2fsprogs.log"
3032
exfatprogs,,OK - CFLAGS=-Oz applied; Oz occurrences: 68,"... -Oz ...","build/x86/log/exfatprogs.log"

doc/OFLAG_fixes.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,18 @@ This document lists recent OFLAG (optimization flag) fixes applied in the reposi
1010
- cryptsetup2
1111
- Fix: pre-configure substitutions applied (remove -O3 from Argon2 templates and normalize libtool hardcode flags)
1212
- Commit: fac65ebc7e
13-
- Validation: V=1 x86 build validated; grep shows no remaining -O3 in cryptsetup build tree
14-
- Logs: build/ppc64/log/cryptsetup2.log, build/x86/log/cryptsetup2.log
13+
- Validation: V=1 x86 & ppc64 builds validated; grep shows no remaining -O3 in cryptsetup2 build trees
14+
- Logs: build/ppc64/log/cryptsetup2.log, build/x86/log/cryptsetup2.configure.log
15+
16+
- cryptsetup (older, not used)
17+
- Packaging change: pre-configure sed added to normalize `-O[0-9]+`/`-Os` -> `-Oz` and `CXXFLAGS` set to `-g -Oz` in `modules/cryptsetup`.
18+
- Note: this module is not used by current boards (`cryptsetup2` is the active module); change applied for completeness; validation is optional.
19+
- Files: `modules/cryptsetup`
20+
21+
- cryptsetup
22+
- Fix: packaging-time pre-configure sed added to normalize `-O[0-9]+`/`-Os` -> `-Oz` and remove Makefile backup artifacts; `CXXFLAGS` set to `-g -Oz` for defensive coverage of C++ tests.
23+
- Validation: **pending** — V=1 x86 & ppc64 builds to be run to confirm no `-O2`/`-Os` occurrences in final build logs
24+
- Logs: build/x86/log/cryptsetup.configure.log, build/ppc64/log/cryptsetup.configure.log
1525

1626
- slang
1727
- Fix: minimal pre-configure sed applied replacing -O2 with -Oz
@@ -40,4 +50,5 @@ This document lists recent OFLAG (optimization flag) fixes applied in the reposi
4050

4151
Notes & next steps
4252
- .bak files left in the build trees are artifacts of the reversible sed step; remove them for cleanliness if desired or keep them as audit evidence.
53+
- cryptsetup (legacy module) restored to HEAD and is not referenced by any boards; no packaging-time changes are required for that module.
4354
- For cross-arch completeness, consider running per-package V=1 builds on additional arches (arm64, riscv) for packages that still show legacy -O tokens in non-built files.

modules/cryptsetup2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cryptsetup2_configure := \
1818
( \
1919
sed -i 's/hardcode_into_libs=yes/hardcode_into_libs=no/g' configure || true; \
2020
sed -i 's/-O3//g' lib/crypto_backend/argon2/*.am lib/crypto_backend/argon2/Makemodule.am || true; \
21-
sed -E -i.bak 's/hardcode_libdir_flag_spec=.*/hardcode_libdir_flag_spec=" "/g' configure Makefile.in || true; \
21+
sed -E -i 's/hardcode_libdir_flag_spec=.*/hardcode_libdir_flag_spec=" "/g' configure Makefile.in || true; \
2222
) && $(CROSS_TOOLS) \
2323
CFLAGS="-Oz" \
2424
./configure \

0 commit comments

Comments
 (0)