From 04d9984da06a07c42416469474fd17b82ea7392e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 2 Mar 2026 14:07:16 +0900 Subject: internal/rosa/meson: migrate to helper interface This change also removes some unused options. Signed-off-by: Ophestra --- internal/rosa/dtc.go | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'internal/rosa/dtc.go') diff --git a/internal/rosa/dtc.go b/internal/rosa/dtc.go index 7dff7d22..e503060a 100644 --- a/internal/rosa/dtc.go +++ b/internal/rosa/dtc.go @@ -7,28 +7,27 @@ func (t Toolchain) newDTC() pkg.Artifact { version = "1.7.2" checksum = "vUoiRynPyYRexTpS6USweT5p4SVHvvVJs8uqFkkVD-YnFjwf6v3elQ0-Etrh00Dt" ) - return t.NewViaMeson("dtc", version, t.NewPatchedSource( - "dtc", version, pkg.NewHTTPGetTar( - nil, "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/"+ - "dtc-v"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, - ), false, - ), &MesonAttr{ + return t.NewPackage("dtc", version, pkg.NewHTTPGetTar( + nil, "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/"+ + "dtc-v"+version+".tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), &PackageAttr{ // works around buggy test: // fdtdump-runtest.sh /usr/src/dtc/tests/fdtdump.dts Writable: true, - - Configure: [][2]string{ + Chmod: true, + }, &MesonHelper{ + Setup: [][2]string{ {"Dyaml", "disabled"}, {"Dstatic-build", "true"}, }, }, - t.Load(Flex), - t.Load(Bison), - t.Load(M4), - t.Load(Coreutils), - t.Load(Diffutils), + Flex, + Bison, + M4, + Coreutils, + Diffutils, ) } func init() { artifactsF[DTC] = Toolchain.newDTC } -- cgit v1.3.1