Merge pull request #1579 from hadfl/dtc

move dtc to omnios-build
omniosorg · Feb 8, 2025 · 831c9d9 · 831c9d9
2 parents 57add16 + 2ffcfc4
commit 831c9d9
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 79 deletions.
diff --git a/build/dtc/build.sh b/build/dtc/build.sh
diff --git a/build/dtc/local.mog b/build/dtc/local.mog
diff --git a/build/meta/aarch64-build-tools.p5m b/build/meta/aarch64-build-tools.p5m
@@ -4,8 +4,8 @@ set name=pkg.description value="Tools required to cross build OmniOS for aarch64
 
 depend fmri=ooce/omnios-build-tools type=require
 
+depend fmri=developer/dtc type=require
 depend fmri=ooce/developer/aarch64-gcc14 type=require
 depend fmri=ooce/developer/aarch64-perl type=require
-depend fmri=ooce/util/dtc type=require
 depend fmri=ooce/util/u-boot type=require
 
diff --git a/build/obsolete/util-dtc.p5t b/build/obsolete/util-dtc.p5t
@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/ooce/util/dtc@1.7.2,$(SUNOSVER)-$(PVER)
+set name=pkg.renamed value=true
+depend fmri=pkg:/developer/dtc type=require
diff --git a/doc/baseline b/doc/baseline
@@ -292,7 +292,7 @@ extra.omnios ooce/util/atuin
 extra.omnios ooce/util/bat
 extra.omnios ooce/util/diffr
 extra.omnios ooce/util/direnv
-extra.omnios ooce/util/dtc
+extra.omnios ooce/util/dtc r
 extra.omnios ooce/util/fd
 extra.omnios ooce/util/gh
 extra.omnios ooce/util/htmlq

diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
@@ -103,7 +103,7 @@ extra.omnios ooce/text/xsv
 extra.omnios ooce/util/atuin
 extra.omnios ooce/util/bat
 extra.omnios ooce/util/diffr
-extra.omnios ooce/util/dtc
+extra.omnios ooce/util/dtc r
 extra.omnios ooce/util/fd
 extra.omnios ooce/util/htmlq
 extra.omnios ooce/util/hyperfine

diff --git a/doc/packages.md b/doc/packages.md
@@ -242,7 +242,6 @@
 | ooce/util/bat			| 0.25.0	| https://github.com/sharkdp/bat/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/util/diffr		| 0.1.5		| https://github.com/mookid/diffr/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/util/direnv		| 2.35.0	| https://github.com/direnv/direnv/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/util/dtc			| 1.7.2		| https://git.kernel.org/pub/scm/utils/dtc/dtc.git/refs/ | [omniosorg](https://github.com/omniosorg)
 | ooce/util/fd			| 10.2.0	| https://github.com/sharkdp/fd/releases/ | [omniosorg](https://github.com/omniosorg)
 | ooce/util/gh			| 2.65.0	| https://github.com/cli/cli/releases/ | [omniosorg](https://github.com/omniosorg)
 | ooce/util/htmlq		| 0.4.0		| https://github.com/mgdm/htmlq/releases/ | [omniosorg](https://github.com/omniosorg)