-
Notifications
You must be signed in to change notification settings - Fork 128
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
Apply patch to remove CBQ functionality #199
Conversation
Converting to draft for now because first and foremost, I'm the author of the patch I'm applying here, and as I noted in https://bugs.busybox.net/show_bug.cgi?id=15931#c2, I'm not confident it is correct. Additionally, I'm considering whether it maybe makes more sense to apply this patch conditionally only in the cases where we know we have build failures (ie, scope it to just Debian Unstable builds of the |
This allows us to build successfully on Debian Unstable again.
I've updated this to be much more targeted -- it's now only added to the I guess I could've also made that conditional grep the appropriate kernel headers for one of the CBQ symbols, but that feels like overkill. If we don't see any obvious upstream objections to my patch in the next day or so, I think we should probably just go ahead with this (since it's currently blocking a rebuild and will only affect a single variant on a single esoteric architecture). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤷 seems fine
It's officially been 24h since I posted that patch and it's really low effort for us to change again and we've scoped the change to only riscv64 builds of the glibc variant specifically, so I think we're OK to go. |
Changes: - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq - docker-library/busybox@686bc28: Apply patch to remove CBQ functionality - docker-library/busybox@d40b612: Merge pull request docker-library/busybox#197 from infosiftr/alpine3.20 - docker-library/busybox@d43ba9b: Update to Alpine 3.20 - docker-library/busybox@97f7e44: Update metadata for mips64le - docker-library/busybox@702e53e: Update metadata for i386 - docker-library/busybox@3b0464c: Update metadata for arm64v8 - docker-library/busybox@95edf02: Update metadata for arm32v7 - docker-library/busybox@3c495cf: Update metadata for arm32v5 - docker-library/busybox@9a7aaf9: Merge pull request docker-library/busybox#195 from infosiftr/buildroot-2024.02.2 - docker-library/busybox@df272ca: Update amd64 metadata
Changes: - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq - docker-library/busybox@686bc28: Apply patch to remove CBQ functionality - docker-library/busybox@d40b612: Merge pull request docker-library/busybox#197 from infosiftr/alpine3.20 - docker-library/busybox@d43ba9b: Update to Alpine 3.20 - docker-library/busybox@97f7e44: Update metadata for mips64le - docker-library/busybox@702e53e: Update metadata for i386 - docker-library/busybox@3b0464c: Update metadata for arm64v8 - docker-library/busybox@95edf02: Update metadata for arm32v7 - docker-library/busybox@3c495cf: Update metadata for arm32v5 - docker-library/busybox@9a7aaf9: Merge pull request docker-library/busybox#195 from infosiftr/buildroot-2024.02.2 - docker-library/busybox@df272ca: Update amd64 metadata
Changes: - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq - docker-library/busybox@686bc28: Apply patch to remove CBQ functionality - docker-library/busybox@d40b612: Merge pull request docker-library/busybox#197 from infosiftr/alpine3.20 - docker-library/busybox@d43ba9b: Update to Alpine 3.20 - docker-library/busybox@97f7e44: Update metadata for mips64le - docker-library/busybox@702e53e: Update metadata for i386 - docker-library/busybox@3b0464c: Update metadata for arm64v8 - docker-library/busybox@95edf02: Update metadata for arm32v7 - docker-library/busybox@3c495cf: Update metadata for arm32v5 - docker-library/busybox@9a7aaf9: Merge pull request docker-library/busybox#195 from infosiftr/buildroot-2024.02.2 - docker-library/busybox@df272ca: Update amd64 metadata
Changes: - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@fce3584: Merge pull request docker-library/busybox#204 from infosiftr/buildroot-2024.05.2 - docker-library/busybox@973b862: Update buildroot to 2024.05.2 - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@6fda3b5: Update metadata for s390x - docker-library/busybox@c7abda1: Update metadata for ppc64le - docker-library/busybox@67a63c5: Update metadata for mips64le - docker-library/busybox@93afa92: Update metadata for i386 - docker-library/busybox@7915d3d: Update metadata for arm64v8 - docker-library/busybox@67861b9: Update metadata for arm32v7 - docker-library/busybox@6328898: Update metadata for arm32v6 - docker-library/busybox@6d4767b: Update metadata for arm32v5 - docker-library/busybox@fce3584: Merge pull request docker-library/busybox#204 from infosiftr/buildroot-2024.05.2 - docker-library/busybox@973b862: Update buildroot to 2024.05.2 - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
Changes: - docker-library/busybox@b333133: Update riscv64 "latest" exclusion logic now that musl is on Alpine 3.20 with riscv64 support - docker-library/busybox@6fda3b5: Update metadata for s390x - docker-library/busybox@c7abda1: Update metadata for ppc64le - docker-library/busybox@67a63c5: Update metadata for mips64le - docker-library/busybox@93afa92: Update metadata for i386 - docker-library/busybox@7915d3d: Update metadata for arm64v8 - docker-library/busybox@67861b9: Update metadata for arm32v7 - docker-library/busybox@6328898: Update metadata for arm32v6 - docker-library/busybox@6d4767b: Update metadata for arm32v5 - docker-library/busybox@fce3584: Merge pull request docker-library/busybox#204 from infosiftr/buildroot-2024.05.2 - docker-library/busybox@973b862: Update buildroot to 2024.05.2 - docker-library/busybox@de921aa: Update to actions/checkout@v4 🙃 - docker-library/busybox@7d73de9: Merge pull request docker-library/busybox#202 from infosiftr/set-e-smoketest - docker-library/busybox@a56ed60: Add missing `set -e` to our `nslookup` smoke test 😭 - docker-library/busybox@73a9c49: Merge pull request docker-library/busybox#201 from infosiftr/buildroot-2024.02.3 - docker-library/busybox@f1885ea: Update amd64 metadata - docker-library/busybox@58553bb: Update buildroot to 2024.02.3 - docker-library/busybox@a58bf7a: Update metadata for s390x - docker-library/busybox@6f3c338: Update metadata for ppc64le - docker-library/busybox@54e9044: Update metadata for mips64le - docker-library/busybox@bd0f292: Update metadata for i386 - docker-library/busybox@c6a790d: Update metadata for arm64v8 - docker-library/busybox@bc8c404: Update metadata for arm32v7 - docker-library/busybox@5fb609b: Update metadata for arm32v6 - docker-library/busybox@50e03b3: Update metadata for arm32v5 - docker-library/busybox@a9f4f0d: Merge pull request docker-library/busybox#199 from infosiftr/remove-cbq
This allows us to build successfully on Debian Unstable again.
Fixes #198