Skip to content

Commit 4230d90

Browse files
committed
bluefin: Consolidate per-arch elements
The only different part was the per-arch specific sources, but suing the following yaml syntax we can put the conditional inline the file. ```yaml sources: - kind: tar (?): - arch == "x86_64": url: foo ref: foo - arch == "aarch64": url: bar ref: bar ```
1 parent 866b18b commit 4230d90

File tree

11 files changed

+40
-67
lines changed

11 files changed

+40
-67
lines changed

elements/bluefin/1password-cli.bst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
kind: manual
2+
3+
sources:
4+
- kind: zip
5+
base-dir: ""
6+
(?):
7+
- arch == "x86_64":
8+
url: onepassword_cli:v2.32.1/op_linux_amd64_v2.32.1.zip
9+
ref: 64a49db2d1b0333f3bee88546e3e84995e530e25f2c783fb5d4081d01a05b2a1
10+
- arch == "aarch64":
11+
url: onepassword_cli:v2.32.1/op_linux_arm64_v2.32.1.zip
12+
ref: cf6d114b12079ba5ac4f3ea6c69d331c06565c361aeae77f8c20868bd94c9885
13+
14+
build-depends:
15+
- freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
16+
17+
variables:
18+
strip-binaries: ""
19+
20+
config:
21+
install-commands:
22+
- |
23+
install -Dm755 -t "%{install-root}%{bindir}" op
24+
- |
25+
%{install-extra}

elements/bluefin/1password-cli/1password-cli-aarch64.bst

Lines changed: 0 additions & 9 deletions
This file was deleted.

elements/bluefin/1password-cli/1password-cli-x86_64.bst

Lines changed: 0 additions & 9 deletions
This file was deleted.

elements/bluefin/1password-cli/1password-cli.bst

Lines changed: 0 additions & 9 deletions
This file was deleted.

elements/bluefin/1password-cli/1password-cli.inc

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
kind: manual
2+
3+
sources:
4+
- kind: tar
5+
(?):
6+
- arch == "x86_64":
7+
url: onepassword_files:linux/tar/stable/x86_64/1password-8.12.2.x64.tar.gz
8+
ref: bc9f86c108e50c29faef6dead7eff115416437d5e323dff47827ed9984204b5b
9+
- arch == "aarch64":
10+
url: onepassword_files:linux/tar/stable/aarch64/1password-8.12.2.arm64.tar.gz
11+
ref: 57adfd7076c6643fc5bdaa9ae1ce63a5e8b78c5f6434f493f0b798a204b87ebf
12+
113
build-depends:
214
- freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
315
- freedesktop-sdk.bst:components/sed.bst

elements/bluefin/1password/1password-aarch64.bst

Lines changed: 0 additions & 8 deletions
This file was deleted.

elements/bluefin/1password/1password-x86_64.bst

Lines changed: 0 additions & 8 deletions
This file was deleted.

elements/bluefin/1password/1password.bst

Lines changed: 0 additions & 9 deletions
This file was deleted.

elements/bluefin/deps.bst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ depends:
1010

1111
- bluefin/tailscale/tailscale.bst
1212

13-
- bluefin/1password-cli/1password-cli.bst
14-
- bluefin/1password/1password.bst
13+
- bluefin/1password-cli.bst
14+
- bluefin/1password.bst
1515

1616
- bluefin/ghostty.bst
1717

0 commit comments

Comments
 (0)