Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust trixie to avoid too much riscv64 #163

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 13, 2024

Trixie doesn't yet have git (probably more), but curl does build successfully, so this adjusts generate-stackbrew-library.sh to exclude riscv64 from all but trixie-curl.

$ diff -u <(bashbrew cat buildpack-deps) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2024-08-13 10:59:42.728567215 -0700
+++ /dev/fd/62	2024-08-13 10:59:42.732567254 -0700
@@ -47,7 +47,7 @@
 Directory: debian/sid

 Tags: trixie-curl, testing-curl
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
 Directory: debian/trixie/curl

Trixie doesn't yet have `git` (probably more), but `curl` does build successfully, so this adjusts `generate-stackbrew-library.sh` to exclude `riscv64` from all but `trixie-curl`.

```diff
$ diff -u <(bashbrew cat buildpack-deps) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2024-08-13 10:59:42.728567215 -0700
+++ /dev/fd/62	2024-08-13 10:59:42.732567254 -0700
@@ -47,7 +47,7 @@
 Directory: debian/sid

 Tags: trixie-curl, testing-curl
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe49
 Directory: debian/trixie/curl

```
@tianon
Copy link
Member Author

tianon commented Aug 13, 2024

Oh, because it's probably helpful context, here's that same command run on current master instead (ie, without this PR):

$ diff -u <(bashbrew cat buildpack-deps) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2024-08-13 11:05:02.111584348 -0700
+++ /dev/fd/62	2024-08-13 11:05:02.111584348 -0700
@@ -47,17 +47,17 @@
 Directory: debian/sid
 
 Tags: trixie-curl, testing-curl
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
 Directory: debian/trixie/curl
 
 Tags: trixie-scm, testing-scm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
 Directory: debian/trixie/scm
 
 Tags: trixie, testing
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
 Directory: debian/trixie
 

@yosifkit yosifkit merged commit dece9c6 into docker-library:master Aug 13, 2024
9 checks passed
@yosifkit yosifkit deleted the trixie-riscv64 branch August 13, 2024 18:16
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Aug 13, 2024
Changes:

- docker-library/buildpack-deps@dece9c6: Merge pull request docker-library/buildpack-deps#163 from infosiftr/trixie-riscv64
- docker-library/buildpack-deps@790d59b: Adjust trixie to avoid too much riscv64
tianon added a commit that referenced this pull request Aug 19, 2024
(excluding scm+full on focal+riscv64)
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants