From 5c7aa2b44c774ca86f17f38c0bc62ebaffe49e8c Mon Sep 17 00:00:00 2001 From: Techmore Date: Wed, 21 Oct 2026 13:39:34 -0400 Subject: [PATCH 1/2] Kernel wip3 candidate: pin upstream #158 (7.2.11) plus #157 display patch series.json revision 4: 7.2.11-elementary-aurora72-wip3 from omacom/linux-aurora PR #158 head bd526b3c with PR #157 (DCP sRGB surfaces / link colorimetry for external displays) as one local patch. New review receipt; qualification test updated for the new identity. Replaces the wip2 pin; wip2 receipts and the installed trial are untouched. Build-only: prepare/check pass locally, native CI build decides the rest. No boot payload, nothing armed. Co-Authored-By: Claude Sonnet 5.5 --- mseries/OS9-HANDOFF.md | 8 + mseries/aurora/test_qualification.py | 21 ++- mseries/aurora/unified72/README.md | 20 ++ ...m-apple-srgb-external-display-colour.patch | 172 ++++++++++++++++++ .../unified72/review-wip3-2026-10-21.json | 33 ++++ mseries/aurora/unified72/series.json | 35 ++-- 6 files changed, 268 insertions(+), 21 deletions(-) create mode 100644 mseries/aurora/unified72/patches/0001-drm-apple-srgb-external-display-colour.patch create mode 100644 mseries/aurora/unified72/review-wip3-2026-10-21.json diff --git a/mseries/OS9-HANDOFF.md b/mseries/OS9-HANDOFF.md index 34a519971..951381e9c 100644 --- a/mseries/OS9-HANDOFF.md +++ b/mseries/OS9-HANDOFF.md @@ -43,6 +43,14 @@ by hand.** Corrects an earlier theory that the refused record was Linux's own. A was deleted at the owner's request; reports belong on omacom/linux-aurora as a per-Mac issue. Nothing is posted; a redrafted report is pending the owner. Stale Touch ID claims in `BUG-FIX-ROADMAP.md` and `ROADMAP.md` were updated. Verified: `validate.sh` 76/76, aurora unit tests 72, Touch ID UI tests 14/14, PAM helper test. Not verified: matching on this Mac, `.20` behaviour, any change to the guard. +## Kernel wip3 candidate prepared (build-only) — 2026-10-21 + +Owner asked to coordinate the next kernel part (USB4/HDMI display work). Chosen scope: upstream #158 (Asahi 7.2.11 base) +plus #157 (external-display colour); #154 (shared Thunderbolt DP bandwidth, may cap a single-monitor dock at HBR2 x4) was not +included. `mseries/aurora/unified72/series.json` revision 4 pins `7.2.11-elementary-aurora72-wip3` with #157 as a local patch +and a new review receipt. Verified: patch dry-run on #158 head and current integration, full-tree `candidate.py prepare` and +`check`, 72 aurora unit tests. CI runs the native build for this PR. **Not done:** native build result, boot payload (the +trial prep script is wip2-specific), any hardware test. wip2 stays installed; one-shot to wip2 was armed separately. ## Installer speed (#47): timing, opt-in parallel runner, ccache — 2026-10-21 diff --git a/mseries/aurora/test_qualification.py b/mseries/aurora/test_qualification.py index 4a09a8e5e..8eb3878e0 100644 --- a/mseries/aurora/test_qualification.py +++ b/mseries/aurora/test_qualification.py @@ -222,25 +222,30 @@ def test_unified72_snapshot_has_separate_identity_and_no_moving_branch_url(self) data = candidate.series("unified72") self.assertIn(data["source"]["commit"], data["source"]["url"]) self.assertRegex(data["source"]["sha256"], r"^[a-f0-9]{64}$") - self.assertTrue(data["kernel_release"]["unified72"].startswith("7.2.10-")) - self.assertEqual(data["patches"], []) + self.assertTrue(data["kernel_release"]["unified72"].startswith("7.2.11-")) + lane = candidate.HERE / "unified72" + # wip3 carries exactly the reviewed #157 display patch on the #158 source. + self.assertEqual([patch["file"] for patch in data["patches"]], + ["0001-drm-apple-srgb-external-display-colour.patch"]) + patch = data["patches"][0] + self.assertEqual(patch["profile"], "candidate") + self.assertEqual(candidate.sha256(lane / "patches" / patch["file"]), patch["sha256"]) self.assertEqual(data["superseded_patches"][0]["head"], "4c56f9cd3033e5f65ef9c61bc7b396d50bce23f7") retired = data["superseded_patches"][0] - lane = candidate.HERE / "unified72" self.assertEqual(candidate.sha256(lane / "patches" / retired["file"]), retired["sha256"]) self.assertEqual(data["kernel_release"]["unified72"], - "7.2.10-elementary-aurora72-wip2") - self.assertEqual(data["debian_package"], "linux-image-elementary-aurora72-wip2") + "7.2.11-elementary-aurora72-wip3") + self.assertEqual(data["debian_package"], "linux-image-elementary-aurora72-wip3") + self.assertNotEqual(data["debian_package"], "linux-image-elementary-aurora72-wip2") receipt = json.loads((lane / data["review_receipt"]).read_text()) self.assertEqual(receipt["source"], data["source"]["commit"]) self.assertEqual(receipt["archive_verification"]["sha256"], data["source"]["sha256"]) self.assertEqual(receipt["archive_verification"]["archive_root"], data["source"]["archive_root"]) - comparison = json.loads((lane / receipt["patch_applicability"]["receipt"]).read_text()) - self.assertEqual(comparison["source"], data["source"]["commit"]) - self.assertEqual(comparison["counts"], receipt["patch_applicability"]["counts"]) + self.assertEqual(receipt["patches"][0]["head"], patch["head"]) + self.assertIn("not_rerun", receipt) self.assertEqual(candidate.settings(data, "unified72")["DRM_AMDGPU"], "n") diff --git a/mseries/aurora/unified72/README.md b/mseries/aurora/unified72/README.md index e94fb491e..b1423e0ea 100644 --- a/mseries/aurora/unified72/README.md +++ b/mseries/aurora/unified72/README.md @@ -1,5 +1,25 @@ # Unified Aurora 7.2.10 build candidate +## wip3 candidate — October 21, 2026 (build-only, not booted) + +**Revision 4 pins `7.2.11-elementary-aurora72-wip3`:** unmerged upstream +[PR #158](https://github.com/omacom/linux-aurora/pull/158) (Asahi 7.2.11 rebase, head +`bd526b3c11cc`) plus unmerged [PR #157](https://github.com/omacom/linux-aurora/pull/157) +(DCP sRGB surfaces and link colorimetry for external displays) carried as one local patch, +`patches/0001-drm-apple-srgb-external-display-colour.patch`. The owner chose both. This replaces the +wip2 pin in `series.json`; the wip2 package, GRUB trial entry, receipts and hardware reports below stay as +history and the installed wip2 is unchanged. Package `linux-image-elementary-aurora72-wip3`, version +`7.2.11+elementary.aurora72.wip3-1`, so it cannot overwrite wip2 modules. + +Checked here: the #157 diff dry-runs cleanly on the five files at #158 head (offsets only) and on current +`integration/aurora`; `candidate.py prepare` applies it to the full source tree without fuzz and the +config gate passes; `candidate.py check` and its pmp host tests pass; the aurora unit tests (72) pass. +Receipt: [review-wip3-2026-10-21.json](review-wip3-2026-10-21.json) (archive SHA256 recorded on first +download). **Not established:** native build, 64-fix parity at 7.2.11 (the old comparison is for 7.2.10), +Touch ID/dock/power/recovery on the J314S. #158 is an open proposal and #157 an open PR; re-pin if either +moves. The boot-staging script `prepare-j314s-trial.py` is still wip2-specific and was not changed, so no +wip3 boot payload exists. Nothing is installed or armed. + ## Current host state — October 21, 2026 **Wip2 has booted and all three USB-C ports show a dock picture.** Later diff --git a/mseries/aurora/unified72/patches/0001-drm-apple-srgb-external-display-colour.patch b/mseries/aurora/unified72/patches/0001-drm-apple-srgb-external-display-colour.patch new file mode 100644 index 000000000..f6af46561 --- /dev/null +++ b/mseries/aurora/unified72/patches/0001-drm-apple-srgb-external-display-colour.patch @@ -0,0 +1,172 @@ +diff --git a/drivers/gpu/drm/apple/dcp-internal.h b/drivers/gpu/drm/apple/dcp-internal.h +index 5aedd1acb59451..4c439ac9355af2 100644 +--- a/drivers/gpu/drm/apple/dcp-internal.h ++++ b/drivers/gpu/drm/apple/dcp-internal.h +@@ -24,6 +24,9 @@ + #include "dcp-announce.h" + #include "dcp-display-metadata.h" + #include "dcp-metadata-epoch.h" ++ ++/* dcp.c: appledrm.external_srgb module parameter */ ++extern bool external_srgb; + #include "dcp-180hz.h" + #include "iomfb.h" + #include "iomfb_h17p.h" +diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c +index e84af350c7e081..0839eafc280b88 100644 +--- a/drivers/gpu/drm/apple/dcp.c ++++ b/drivers/gpu/drm/apple/dcp.c +@@ -208,6 +208,11 @@ static bool unstable_edid = true; + module_param(unstable_edid, bool, 0644); + MODULE_PARM_DESC(unstable_edid, "Enable unstable EDID retrival support"); + ++bool external_srgb = true; ++module_param(external_srgb, bool, 0644); ++MODULE_PARM_DESC(external_srgb, ++ "Tag RGB framebuffers for external displays as sRGB so DCP converts them to the panel's native gamut (default: Y)"); ++ + static void disconnected_hpd_event(struct apple_connector *connector); + + bool dcp_is_external_h17p(struct apple_dcp *dcp) +diff --git a/drivers/gpu/drm/apple/iomfb_template.c b/drivers/gpu/drm/apple/iomfb_template.c +index ad3f1a5291bae1..b7227ff8136063 100644 +--- a/drivers/gpu/drm/apple/iomfb_template.c ++++ b/drivers/gpu/drm/apple/iomfb_template.c +@@ -2503,6 +2503,19 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru + req->surf[l].base.colorspace == DCP_COLORSPACE_BG_SRGB) + req->surf[l].base.colorspace = DCP_COLORSPACE_NATIVE; + ++ /* RGB planes arrive tagged "native" (plane.c). The desktop ++ * renders sRGB, and external Apple panels (Studio Display, ++ * XDR) are wide gamut, so a native tag puts sRGB values ++ * straight onto P3 primaries and oversaturates everything. ++ * Tag the surface sRGB instead and let DCP convert to the ++ * panel gamut in hardware, as macOS does. ++ */ ++ else if (external_srgb && ++ dcp->connector_type != DRM_MODE_CONNECTOR_eDP && ++ !new_state->fb->format->is_yuv && ++ req->surf[l].base.colorspace == DCP_COLORSPACE_NATIVE) ++ req->surf[l].base.colorspace = DCP_COLORSPACE_BG_SRGB; ++ + #if DCP_FW_VER >= DCP_FW_VERSION(26, 0, 0) + /* H17P external SDR RGB needs an sRGB source tag. Native + * tagging washes out the same pixel values on this profile. +diff --git a/drivers/gpu/drm/apple/parser.c b/drivers/gpu/drm/apple/parser.c +index 0de67aa8fe710e..bb8a49378fb005 100644 +--- a/drivers/gpu/drm/apple/parser.c ++++ b/drivers/gpu/drm/apple/parser.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO) + #include // for sound format masks +@@ -448,6 +449,36 @@ static int fill_color_mode(struct dcp_color_mode *color, + return 0; + } + ++/* ++ * Colorimetry the SDR RGB link to an external display should prefer. By ++ * firmware score alone DCP picks the widest colorimetry the display offers ++ * (BT.2020 RGB on a Studio Display XDR), which puts the desktop's sRGB pixels ++ * on a BT.2020 link. -1 keeps the firmware score; otherwise a dcp_colorimetry ++ * value: 10 sRGB, 1 BT.709, 14 DCI-P3 D65, 16 default RGB, 9 BT.2020 RGB. ++ * Read when a display's modes are parsed, so a change needs a replug. ++ */ ++static int external_colorimetry = DCP_COLORIMETRY_SRGB; ++module_param(external_colorimetry, int, 0644); ++MODULE_PARM_DESC(external_colorimetry, ++ "Preferred SDR RGB link colorimetry for external displays (-1: firmware score, 10: sRGB, 1: BT.709, 14: DCI-P3 D65, 9: BT.2020 RGB)"); ++ ++/* Tiers for external_colorimetry; equal tiers fall back to firmware score. */ ++static unsigned int external_colorimetry_rank(const struct color_mode *color) ++{ ++ if (color->colorimetry == external_colorimetry) ++ return 3; ++ ++ switch (color->colorimetry) { ++ case DCP_COLORIMETRY_SRGB: ++ case DCP_COLORIMETRY_BT709: ++ return 2; ++ case DCP_COLORIMETRY_RGB: ++ return 1; ++ default: ++ return 0; ++ } ++} ++ + /* External SDR scanout must not select a wide-gamut mode by score alone. */ + static unsigned int external_sdr_rank(const struct color_mode *color) + { +@@ -553,12 +584,15 @@ static int parse_timing_color_restrictions(struct dcp_parse_ctx *handle, + } + + static int parse_color_modes(struct dcp_parse_ctx *handle, +- struct dcp_display_mode *out, bool external_sdr, ++ struct dcp_display_mode *out, bool internal, ++ bool external_sdr, + const struct timing_color_restrictions *limits, + struct dcp_color_mode *unsafe_rgb8) + { + struct iterator outer_it; + unsigned int best_sdr_rank = 0, best_unsafe_rank = 0; ++ bool prefer_colorimetry = !internal && !external_sdr && ++ external_colorimetry >= 0; + int ret = 0; + out->sdr_444.score = -1; + out->sdr_rgb.score = -1; +@@ -671,9 +705,17 @@ static int parse_color_modes(struct dcp_parse_ctx *handle, + + if (cmode.eotf == DCP_EOTF_SDR_GAMMA) { + if (cmode.pixel_encoding == DCP_COLOR_FORMAT_RGB && +- cmode.depth <= 10) +- fill_color_mode(&out->sdr_rgb, &cmode); +- else if (cmode.pixel_encoding == DCP_COLOR_FORMAT_YCBCR444 && ++ cmode.depth <= 10) { ++ unsigned int rank = prefer_colorimetry ? ++ external_colorimetry_rank(&cmode) : 0; ++ ++ if (rank >= best_sdr_rank) { ++ if (rank > best_sdr_rank) ++ out->sdr_rgb.score = -1; ++ fill_color_mode(&out->sdr_rgb, &cmode); ++ best_sdr_rank = rank; ++ } ++ } else if (cmode.pixel_encoding == DCP_COLOR_FORMAT_YCBCR444 && + cmode.depth <= 10) + fill_color_mode(&out->sdr_444, &cmode); + fill_color_mode(&out->sdr, &cmode); +@@ -772,7 +814,8 @@ static int parse_mode(struct dcp_parse_ctx *handle, + else if (!strcmp(key, "MaximumVariableRefreshRate")) + ret = parse_int_bound(it.handle, &max_vrr, 0, U32_MAX); + else if (!strcmp(key, "ColorModes")) +- ret = parse_color_modes(it.handle, out, external_sdr, &limits, ++ ret = parse_color_modes(it.handle, out, internal, ++ external_sdr, &limits, + handle->automatic_1080p180_rgb8 ? + &unsafe_rgb8 : NULL); + else if (!strcmp(key, "ID")) +diff --git a/drivers/gpu/drm/apple/plane.c b/drivers/gpu/drm/apple/plane.c +index aa5bbc9551d2ce..f97bef93e9be35 100644 +--- a/drivers/gpu/drm/apple/plane.c ++++ b/drivers/gpu/drm/apple/plane.c +@@ -228,12 +228,15 @@ static void apple_plane_atomic_update(struct drm_plane *plane, + struct drm_framebuffer *fb = base->fb; + const struct drm_format_info *fmt = fb->format; + /* +- * DCP doesn't support XBGR8 / XRGB8 / XBGR2101010 natively. Blending as ++ * DCP doesn't support XBGR8 / XRGB8 / XRGB2101010 / XBGR2101010 ++ * natively (XRGB2101010 is scanned out as "l10r", an alpha format, ++ * so its two padding bits are read as alpha). Blending as + * pre-multiplied alpha with a black background can be used as + * workaround for the bottommost plane. + */ + if (fmt->format == DRM_FORMAT_XRGB8888 || + fmt->format == DRM_FORMAT_XBGR8888 || ++ fmt->format == DRM_FORMAT_XRGB2101010 || + fmt->format == DRM_FORMAT_XBGR2101010) + is_premultiplied = true; + diff --git a/mseries/aurora/unified72/review-wip3-2026-10-21.json b/mseries/aurora/unified72/review-wip3-2026-10-21.json new file mode 100644 index 000000000..f7896da45 --- /dev/null +++ b/mseries/aurora/unified72/review-wip3-2026-10-21.json @@ -0,0 +1,33 @@ +{ + "schema": 1, + "reviewed_on": "2026-10-21", + "source": "bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "previous_source": "644133b7799f759c5bfd88507b6246d298b6509c", + "upstream_pr": "https://github.com/omacom/linux-aurora/pull/158", + "upstream_status": "open (not merged at review time); base integration/aurora moved to faed71028 after #139 and is not included", + "archive_verification": { + "sha256": "881d5a061efa212ed28489311cc97ab6d9bf52891a6c7a00b18f0bbaff131957", + "bytes": 270217582, + "method": "Entire codeload gzip downloaded and hashed locally (trust on first use: the pin is this digest); tar root read from the archive listing; Makefile reads VERSION 7, PATCHLEVEL 2, SUBLEVEL 11.", + "archive_root": "linux-aurora-bd526b3c11ccf8e91d6240261beb3219d8f17f03" + }, + "patches": [ + { + "file": "0001-drm-apple-srgb-external-display-colour.patch", + "upstream": "https://github.com/omacom/linux-aurora/pull/157", + "head": "9d3aeb24cb864d5f99a7172e9004884bf3c1a9a0", + "base_of_pr": "44d5afc79da79bb3b17a3ee7494cb8d07a1f1aaa", + "files": ["drivers/gpu/drm/apple/dcp-internal.h", "drivers/gpu/drm/apple/dcp.c", "drivers/gpu/drm/apple/iomfb_template.c", "drivers/gpu/drm/apple/parser.c", "drivers/gpu/drm/apple/plane.c"], + "applicability": "patch(1) dry run against the five files at #158 head: clean, offsets +5 (iomfb_template.c) and +89 (plane.c); also clean against integration/aurora faed71028. Full-tree git apply --check runs in candidate.py prepare and in CI." + } + ], + "not_rerun": [ + "64-fix semantic parity (review-patch-applicability-2026-10-21.json is for the 7.2.10 source only)", + "host tests listed in series.json against the new source", + "any hardware test" + ], + "known_interactions": [ + "#158 changes apple_plane_init() to take both supports_xrgb2101010 and an interchange argument; #157 edits plane.c nearby. The dry run is clean but the build is the real check.", + "#158 does not advertise Interchange framebuffer formats on H17P firmware; not relevant to the J314S." + ] +} diff --git a/mseries/aurora/unified72/series.json b/mseries/aurora/unified72/series.json index 9682a94df..3a8fda644 100644 --- a/mseries/aurora/unified72/series.json +++ b/mseries/aurora/unified72/series.json @@ -1,22 +1,31 @@ { "schema": 1, "base_source": "c46d7dcdb8712ea9aeb0ce47b439ffae76371e55", - "revision": 3, + "revision": 4, "source": { "repository": "aurora-silicon/linux", - "commit": "644133b7799f759c5bfd88507b6246d298b6509c", - "upstream_pr": "https://github.com/omacom/linux-aurora/pull/139", - "name": "linux-aurora-644133b7799f759c5bfd88507b6246d298b6509c.tar.gz", - "url": "https://codeload.github.com/omacom/linux-aurora/tar.gz/644133b7799f759c5bfd88507b6246d298b6509c", - "archive_root": "linux-aurora-644133b7799f759c5bfd88507b6246d298b6509c", - "sha256": "10cc0be484644e98bf13ef181ddd268e50d4e4da0993e97d8e6b61cb6037e31a" + "commit": "bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "upstream_pr": "https://github.com/omacom/linux-aurora/pull/158", + "name": "linux-aurora-bd526b3c11ccf8e91d6240261beb3219d8f17f03.tar.gz", + "url": "https://codeload.github.com/omacom/linux-aurora/tar.gz/bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "archive_root": "linux-aurora-bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "sha256": "881d5a061efa212ed28489311cc97ab6d9bf52891a6c7a00b18f0bbaff131957" }, "kernel_release": { - "unified72": "7.2.10-elementary-aurora72-wip2" + "unified72": "7.2.11-elementary-aurora72-wip3" }, - "debian_package": "linux-image-elementary-aurora72-wip2", - "debian_version": "7.2.10+elementary.aurora72.wip2-1", - "patches": [], + "debian_package": "linux-image-elementary-aurora72-wip3", + "debian_version": "7.2.11+elementary.aurora72.wip3-1", + "patches": [ + { + "file": "0001-drm-apple-srgb-external-display-colour.patch", + "sha256": "9cd617e413c69006349e8ffa914ee0c16d1d7ba246d5afd9e1031aafbbf09573", + "upstream": "https://github.com/omacom/linux-aurora/pull/157", + "head": "9d3aeb24cb864d5f99a7172e9004884bf3c1a9a0", + "profile": "candidate", + "note": "drm/apple: sRGB surfaces and an sRGB link colorimetry for external displays (unmerged upstream PR #157, 5 files, +73/-6). Applies to the #158 head with small offsets; must be re-checked if #158 moves." + } + ], "config": { "candidate": { "UDMABUF": "y", @@ -28,7 +37,7 @@ "tools/asahi/pmp-bootargs-tests.rs", "tools/asahi/pmp-power-tests.rs" ], - "qualification": "Merged PR #139 source pinned as a new build-only candidate. Local source review and selected host tests do not establish complete 64-fix parity, native build success or J314S boot/power/recovery acceptance. Preserve shared-DTB fallback compatibility and review upstream M1-family Touch ID regression before hardware use.", + "qualification": "Unmerged upstream PR #158 (Asahi 7.2.11 rebase, head bd526b3c) plus unmerged PR #157 as one local patch, pinned as a new build-only candidate. Replaces the wip2 pin (merged #139 source, 7.2.10), which stays on disk and booted as the owner's trial. Source and patch applicability are checked here; native build success, the 64-fix semantic parity (not re-run for 7.2.11), and J314S boot/dock/power/recovery acceptance are NOT established. Preserve shared-DTB fallback compatibility and review upstream M1-family Touch ID regression before hardware use.", "superseded_patches": [ { "file": "0001-stock-bindgen-layout-policy.patch", @@ -39,5 +48,5 @@ "note": "Historical local port for wip1; corresponding stock-bindgen default and BINDGEN_LAYOUT_TESTS opt-in are now carried in merged upstream source. Retained for provenance; not applied to wip2." } ], - "review_receipt": "review-2026-10-21.json" + "review_receipt": "review-wip3-2026-10-21.json" } From cac7a68aebec400ebc007c52dabc5d4da9448456 Mon Sep 17 00:00:00 2001 From: Techmore Date: Wed, 21 Oct 2026 14:37:30 -0400 Subject: [PATCH 2/2] wip3: native build audited, prep script takes identity from series.json CI run 39645763520 built 7.2.11-elementary-aurora72-wip3 (#158 + #157). The artifact's GitHub digest and SHA256SUMS were verified and recorded in native-build-wip3-2026-10-21.json (image sha, 1876 modules, 115 DTBs, patch present). prepare-j314s-trial.py now derives the release, trial slug, entry id and receipt name from series.json and the receipt file, so it can prepare wip3 as well as wip2. No boot payload prepared, staged or armed. Co-Authored-By: Claude Sonnet 5.5 --- mseries/OS9-HANDOFF.md | 4 +- mseries/aurora/unified72/README.md | 6 +- .../native-build-wip3-2026-10-21.json | 116 ++++++++++++++++++ .../aurora/unified72/prepare-j314s-trial.py | 30 +++-- 4 files changed, 141 insertions(+), 15 deletions(-) create mode 100644 mseries/aurora/unified72/native-build-wip3-2026-10-21.json diff --git a/mseries/OS9-HANDOFF.md b/mseries/OS9-HANDOFF.md index 951381e9c..8542076b6 100644 --- a/mseries/OS9-HANDOFF.md +++ b/mseries/OS9-HANDOFF.md @@ -49,8 +49,8 @@ Owner asked to coordinate the next kernel part (USB4/HDMI display work). Chosen plus #157 (external-display colour); #154 (shared Thunderbolt DP bandwidth, may cap a single-monitor dock at HBR2 x4) was not included. `mseries/aurora/unified72/series.json` revision 4 pins `7.2.11-elementary-aurora72-wip3` with #157 as a local patch and a new review receipt. Verified: patch dry-run on #158 head and current integration, full-tree `candidate.py prepare` and -`check`, 72 aurora unit tests. CI runs the native build for this PR. **Not done:** native build result, boot payload (the -trial prep script is wip2-specific), any hardware test. wip2 stays installed; one-shot to wip2 was armed separately. +`check`, 72 aurora unit tests. CI runs the native build for this PR. Native CI build passed and its artifact was audited (`native-build-wip3-2026-10-21.json`). **Not done:** boot payload +(the trial prep script was adapted but nothing is prepared, staged or armed), 64-fix parity at 7.2.11, any hardware test. wip2 stays installed; one-shot to wip2 was armed separately. ## Installer speed (#47): timing, opt-in parallel runner, ccache — 2026-10-21 diff --git a/mseries/aurora/unified72/README.md b/mseries/aurora/unified72/README.md index b1423e0ea..090283112 100644 --- a/mseries/aurora/unified72/README.md +++ b/mseries/aurora/unified72/README.md @@ -15,10 +15,10 @@ Checked here: the #157 diff dry-runs cleanly on the five files at #158 head (off `integration/aurora`; `candidate.py prepare` applies it to the full source tree without fuzz and the config gate passes; `candidate.py check` and its pmp host tests pass; the aurora unit tests (72) pass. Receipt: [review-wip3-2026-10-21.json](review-wip3-2026-10-21.json) (archive SHA256 recorded on first -download). **Not established:** native build, 64-fix parity at 7.2.11 (the old comparison is for 7.2.10), +download). **Native build:** passed in [CI run 39645763520](https://github.com/techmore/ElementaryOS_MSeries/actions/runs/39645763520); the artifact was audited (GitHub digest matched, `SHA256SUMS` verified, package `7.2.11+elementary.aurora72.wip3-1`, 1,876 modules, 115 DTBs, patch files present in `modified_files`) and saved as [native-build-wip3-2026-10-21.json](native-build-wip3-2026-10-21.json); the artifact itself expires in seven days. **Not established:** 64-fix parity at 7.2.11 (the old comparison is for 7.2.10), Touch ID/dock/power/recovery on the J314S. #158 is an open proposal and #157 an open PR; re-pin if either -moves. The boot-staging script `prepare-j314s-trial.py` is still wip2-specific and was not changed, so no -wip3 boot payload exists. Nothing is installed or armed. +moves. `prepare-j314s-trial.py` now takes its identity and receipt from `series.json`/the receipt name, but no +wip3 boot payload has been prepared or staged. Nothing is installed or armed. ## Current host state — October 21, 2026 diff --git a/mseries/aurora/unified72/native-build-wip3-2026-10-21.json b/mseries/aurora/unified72/native-build-wip3-2026-10-21.json new file mode 100644 index 000000000..158a65538 --- /dev/null +++ b/mseries/aurora/unified72/native-build-wip3-2026-10-21.json @@ -0,0 +1,116 @@ +{ + "schema": 1, + "kind": "native-arm64-build-artifact-audit", + "audited_at": "2026-10-21T18:37:11.356251+00:00", + "tested_repository_commit": "bdb7271f322daaa62359da98a4ebb345cd1827db", + "artifact_id": 12369362585, + "artifact_name": "elementary-aurora-enhancements-unified72-39645763520", + "artifact_zip_sha256": "7fa6e9d0099cb25b5f88cbbaaf2b5eca75b721025fd9f89c081f348ffd1b41fb", + "github_artifact_digest_matched": true, + "ci_run": "https://github.com/techmore/ElementaryOS_MSeries/actions/runs/39645763520", + "artifact_url": "https://github.com/techmore/ElementaryOS_MSeries/actions/runs/39645763520/artifacts/12369362585", + "checksums_verified": { + "build.config": "01bec2b49d984b1f74b7fbd254aed02e97eb0ce47ecc46fd463ce02727796ece", + "linux-7.2.11-elementary-aurora72-wip3-source.tar.gz": "e0a93215da798e4be177126bde6e7d6b7a1ef4cc638bb5da4c5c990cb313f091", + "linux-image-elementary-aurora72-wip3_7.2.11+elementary.aurora72.wip3-1_arm64.deb": "e41dfb71b31d93d35fa1cbeea818bf333c011d889f6596cfa5fb29debcbc3a0b", + "provenance.json": "ecf4037993614a0b0dec7d15e275120c4865eb4d0b19b7fbb7b2a7a16709e328" + }, + "not_done": [ + "source tree was not reconstructed from the archive and compared; no boot, hardware or 64-fix parity result" + ], + "package": { + "control": "Package: linux-image-elementary-aurora72-wip3\nVersion: 7.2.11+elementary.aurora72.wip3-1\nArchitecture: arm64\nMaintainer: ElementaryOS MSeries contributors \nInstalled-Size: 154908\nSection: kernel\nPriority: optional\nDepends: kmod\nDescription: Experimental Aurora enhancement kernel payload\n Distinct modules directory, no boot hooks; requires explicit boot-chain staging.\n", + "module_files": 1876, + "apple_dtbs": 115, + "image_sha256": "3a93bbb424cd138e55d56c9bb1e2b83ec1755eb54ddfdaf2706b85165eeda68a", + "j314s_dtb": "dtbs/t6000-j314s.dtb present (shared boot.bin keeps the old legacy DTB; see BOOT-TRIAL.md compatibility boundary)" + }, + "provenance": { + "profile": "unified72", + "kernel_release": "7.2.11-elementary-aurora72-wip3", + "base_pins": { + "repository": "omacom/linux-aurora", + "release": "aurora-2026.10.17.20", + "kernel_source": "c46d7dcdb8712ea9aeb0ce47b439ffae76371e55", + "kernel_release": "7.1.12-2-20261017.20-sep-ARCH", + "debian_package": "linux-image-elementary-aurora20", + "debian_version": "7.1.12+aurora.20261017.20-1", + "recipe_config_sha256": "c811698c5242d42850bef6669f29cd7b485e997d3ac1a423e2d3cbbb3fdc19b8", + "m1n1_source": "https://github.com/omacom/m1n1/tree/d05ba17dfb771871d608225be42968bbb1e75a18", + "assets": { + "kernel": { + "name": "linux-aurora-7.1.12.aurora2-20261017.20-aarch64.pkg.tar.zst", + "sha256": "49efa0ec088059aaae6c1fc7fef49521171abbab2c21a3d62bf670148dc0c7d8" + }, + "recipe": { + "name": "linux-aurora-recipe-20261017.20.tar.gz", + "sha256": "6e5ff423f0ef07d6e478c39c8c9c0739a2cc12050afa8c9f90ec49e5bd0ddcc3" + }, + "source": { + "name": "aurora-linux-c46d7dcdb8712ea9aeb0ce47b439ffae76371e55.tar.gz", + "sha256": "493ed9fb4a9e245fd59a92a2396d3c968516be932749b8059757a29380652509" + }, + "m1n1": { + "name": "m1n1-aurora-1.6.1.aurora17-5-aarch64.pkg.tar.zst", + "sha256": "fd72ec6c7ff514a2fb17141ccd8ff94268e4412fc5660fb0db62564a036e30ca" + }, + "m1n1_source": { + "name": "m1n1-d05ba17dfb771871d608225be42968bbb1e75a18.tar.gz", + "url": "https://codeload.github.com/omacom/m1n1/tar.gz/d05ba17dfb771871d608225be42968bbb1e75a18", + "sha256": "45ecb3c3efa13409b148c1b76397ec0c5cb747d3fc5f049455601b4c65295fe8" + }, + "touchid": { + "name": "aurora-touchid-20261003-2-any.pkg.tar.zst", + "sha256": "84243a96fcabed344460c1dc67309730f03de34b9f1955faccbedc10c619c7c4" + }, + "libfprint": { + "name": "libfprint-1.94.100-1.1-aarch64.pkg.tar.zst", + "sha256": "bc7d9762db6644f2cfb58ddb209602c1d513845eb1498c098e01f12600fcbdf9" + } + } + }, + "series_sha256": "f22590938d6f76564be0471fdecee66d4e2cb6e33bd92972d2a35801ea8188ba", + "patches": [ + { + "file": "0001-drm-apple-srgb-external-display-colour.patch", + "sha256": "9cd617e413c69006349e8ffa914ee0c16d1d7ba246d5afd9e1031aafbbf09573", + "upstream": "https://github.com/omacom/linux-aurora/pull/157", + "head": "9d3aeb24cb864d5f99a7172e9004884bf3c1a9a0", + "profile": "candidate", + "note": "drm/apple: sRGB surfaces and an sRGB link colorimetry for external displays (unmerged upstream PR #157, 5 files, +73/-6). Applies to the #158 head with small offsets; must be re-checked if #158 moves." + } + ], + "source_pin": { + "repository": "aurora-silicon/linux", + "commit": "bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "upstream_pr": "https://github.com/omacom/linux-aurora/pull/158", + "name": "linux-aurora-bd526b3c11ccf8e91d6240261beb3219d8f17f03.tar.gz", + "url": "https://codeload.github.com/omacom/linux-aurora/tar.gz/bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "archive_root": "linux-aurora-bd526b3c11ccf8e91d6240261beb3219d8f17f03", + "sha256": "881d5a061efa212ed28489311cc97ab6d9bf52891a6c7a00b18f0bbaff131957" + }, + "source_tree_sha256": "2442fa2811eef3a01d2ffa6ad39698723f2ed687aa7809bf6b4b45311f1045ba", + "modified_files": { + "drivers/gpu/drm/apple/dcp-internal.h": "88939364d6bd11e33a92168ddbd008ec49ee8dc7d360f7019860381261732e45", + "drivers/gpu/drm/apple/dcp.c": "86db5666bd0b00c86f0455783be280c353cd04c57fdf368438ebe11e7d1e36b5", + "drivers/gpu/drm/apple/iomfb_template.c": "c44bfaa534ad947b98d21f57ee82c42f17c6121b96cad915e39cfb15cd066808", + "drivers/gpu/drm/apple/parser.c": "9f75b92750c7b6faa53940918a3817153a8813f79f7546eeb1ced4c729b7b5d3", + "drivers/gpu/drm/apple/plane.c": "1150c28a458a469c5cd8effd754b59b6de9784d610426243cace2e7ff7052bff", + "localversion.elementary": "b8167de20b24e0356b00ea2836e14df24e51925d99b51e2ee7338b68dc5d279f", + "rust-toolchain.toml": "2a95563bb9f5b216cc3c170a17e9471448bc63a7084bdd67df23d074939b366c" + }, + "prepared_config_sha256": "20efc4af999b142e5cac358b9567a00a24bf3b687b30d47cadccc194c888126d", + "status": "ARM64 Image/modules/DTBs built; no hardware boot", + "package": "linux-image-elementary-aurora72-wip3_7.2.11+elementary.aurora72.wip3-1_arm64.deb", + "package_sha256": "e41dfb71b31d93d35fa1cbeea818bf333c011d889f6596cfa5fb29debcbc3a0b", + "source_sha256": "e0a93215da798e4be177126bde6e7d6b7a1ef4cc638bb5da4c5c990cb313f091", + "resolved_config_sha256": "01bec2b49d984b1f74b7fbd254aed02e97eb0ce47ecc46fd463ce02727796ece", + "rustc": "rustc 1.93.1 (01f6ddf75 2026-02-11)", + "clang": "Ubuntu clang version 22.1.2 (1ubuntu1)", + "package_compression": { + "format": "zstd", + "level": 3, + "max_threads": 4 + } + } +} diff --git a/mseries/aurora/unified72/prepare-j314s-trial.py b/mseries/aurora/unified72/prepare-j314s-trial.py index ffdfd153c..ad9b74e37 100644 --- a/mseries/aurora/unified72/prepare-j314s-trial.py +++ b/mseries/aurora/unified72/prepare-j314s-trial.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: GPL-3.0-or-later -"""Prepare the pinned J314S wip2 trial offline; never install, arm or reboot.""" +"""Prepare the pinned unified72 J314S trial offline; never install, arm or reboot. + +The release identity, trial slug and native-build receipt come from series.json, so the +same script prepares wip2 (revision 3) or wip3 (revision 4).""" import argparse import gzip import hashlib @@ -16,7 +19,14 @@ HERE = Path(__file__).resolve().parent BASE = "7.1.12-elementary-aurora20-enh1" -NEW = "7.2.10-elementary-aurora72-wip2" +SERIES = json.loads((HERE / "series.json").read_text()) +NEW = SERIES["kernel_release"]["unified72"] +SLUG = NEW.split("elementary-", 1)[1] # e.g. aurora72-wip3 +TRIAL_ENTRY = f"elementary-{SLUG}-trial" +# The audited-build receipt is named for the trial (wip3 onward); wip2 kept the date-only name. +NATIVE_RECEIPT = next((path for path in (HERE / f"native-build-{SLUG.split('-')[1]}-2026-10-21.json", + HERE / "native-build-2026-10-21.json") if path.exists()), + HERE / f"native-build-{SLUG.split('-')[1]}-2026-10-21.json") BASE_SHA = "06a885396f5613154b2fbb6774744efde95a9d25512698d297b3f14da0d4f3aa" BOOT_SHA = "9c9c2d01c3bdb2784daf99cecd6f0e2327eb8f148ea43c8e522e5bae09a14d5f" TRANSITIONS = { @@ -44,7 +54,7 @@ def prepare(args): raise ValueError("choose a fresh private work directory outside live system paths") if args.root_cipher != "aes-xts-plain64": raise ValueError("this transition policy only covers an observed AES-XTS root") - native = json.loads((HERE / "native-build-2026-10-21.json").read_text()) + native = json.loads(NATIVE_RECEIPT.read_text()) provenance = native["provenance"] if provenance["kernel_release"] != NEW or digest(args.package.read_bytes()) != provenance["package_sha256"]: raise ValueError("candidate package identity differs from the independently audited artifact") @@ -53,7 +63,7 @@ def prepare(args): if digest(baseline) != BASE_SHA or digest(boot) != BOOT_SHA: raise ValueError("working initramfs/shared boot payload changed; review this preparation again") modules = args.module_root.resolve() / "lib/modules" / NEW - config = (args.module_root / "share/doc/linux-image-elementary-aurora72-wip2/build.config").read_bytes() + config = (args.module_root / f"share/doc/linux-image-elementary-{SLUG}/build.config").read_bytes() if digest(config) != provenance["resolved_config_sha256"]: raise ValueError("resolved candidate config changed") for key, value in {"CRYPTO_AES": "y", "CRYPTO_XTS": "y", "CRYPTO_SHA256": "y", @@ -105,18 +115,18 @@ def prepare(args): image = modules / "vmlinuz" if digest(image.read_bytes()) != native["package"]["image_sha256"]: raise ValueError("candidate Image differs from audited artifact") - shutil.copy2(image, output / "vmlinuz-aurora72-wip2") + shutil.copy2(image, output / f"vmlinuz-{SLUG}") (output / "boot.bin.rollback").write_bytes(boot) original_grub = args.custom_grub.read_text() match = re.search(r"^menuentry '[^']*DEV: Aurora \.20-enh1[^']*' --id elementary-aurora20-enh1 \{\n.*?^\}", original_grub, re.M | re.S) - if not match or "elementary-aurora72-wip2-trial" in original_grub: + if not match or TRIAL_ENTRY in original_grub: raise ValueError("expected current DEV entry not found or trial already exists") - block = match.group().replace(match.group().splitlines()[0], "menuentry 'elementary OS - TRIAL: Aurora 7.2 wip2' --id elementary-aurora72-wip2-trial {") - block = block.replace("/vmlinuz-aurora20-enh1", "/vmlinuz-aurora72-wip2").replace("/initrd.img-" + BASE, "/initrd.img-" + NEW) + block = match.group().replace(match.group().splitlines()[0], f"menuentry 'elementary OS - TRIAL: Aurora 7.2 {SLUG.split('-')[1]}' --id {TRIAL_ENTRY} {{") + block = block.replace("/vmlinuz-aurora20-enh1", f"/vmlinuz-{SLUG}").replace("/initrd.img-" + BASE, "/initrd.img-" + NEW) proposed = original_grub.rstrip() + "\n\n" + block + "\n" (output / "custom.cfg.proposed").write_text(proposed) subprocess.run(["grub-script-check", str(output / "custom.cfg.proposed")], check=True) - result.update(kind="offline-j314s-wip2-boot-preparation", package_sha256=provenance["package_sha256"], + result.update(kind=f"offline-j314s-{SLUG.split('-')[1]}-boot-preparation", package_sha256=provenance["package_sha256"], candidate_image_sha256=native["package"]["image_sha256"], resolved_config_sha256=provenance["resolved_config_sha256"], root_cipher=args.root_cipher, original_baseline_sha256=BASE_SHA, @@ -125,7 +135,7 @@ def prepare(args): shared_boot_change_required=False, shared_boot_policy="Retain exact current 7.1 DTB/m1n1/U-Boot payload; legacy DART source checks are separate evidence.", original_custom_grub_sha256=digest(original_grub.encode()), proposed_custom_grub_sha256=digest(proposed.encode()), - persistent_default="elementary-aurora20", trial_entry="elementary-aurora72-wip2-trial", + persistent_default="elementary-aurora20", trial_entry=TRIAL_ENTRY, installed=False, armed=False, rebooted=False, status="prepared offline and original-unlock/module-package audit passed; no hardware boot qualification") (output / "preparation.json").write_text(json.dumps(result, indent=2) + "\n")