Skip to content

Fix soldier/heavy SDK build after !9

Simon McVittie requested to merge wip/t20117 into master

  • runtimes: Cope with the symlinks we create already existing

    I'd like to reduce the amount we hack up the runtime in the post_script, and increase the amount we do via packages. Making these scripts idempotent gives us a transition path.

  • runtimes: Make sure the /usr merge can still work

    In heavy and soldier, we currently install libc6-i386 (for gcc-multilib) into the SDK, and that already has a /lib32/ld-linux.so.2.

Merging !9 (merged) made one of my unrelated test-builds for heavy fail, because /lib32/ld-linux.so.2 and /usr/lib32/ld-linux.so.2 were symlinks to different targets (different aliases for the same file, in fact) and the usrmerge script in flatdeb-steam can't cope with that.

Testing at https://jenkins.internal.steamos.cloud/job/playground/job/heavy/job/build/28/console

Edited by Simon McVittie

Merge request reports