search

docker-library / busybox

Docker Official Image packaging for Busybox
http://busybox.net
388 stars 126 forks source link

Apply patch to remove CBQ functionality #199

Closed tianon closed 2 months ago

tianon commented 2 months ago

This allows us to build successfully on Debian Unstable again.

Fixes https://github.com/docker-library/busybox/issues/198

tianon commented 2 months ago

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 glibc variant explicitly).

tianon commented 2 months ago

I've updated this to be much more targeted -- it's now only added to the glibc variant, and only applies the patch if we're not building on bookworm (which means we must be on unstable).

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).

tianon commented 2 months ago

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.