Commit 7c26ff53 authored by jan.koester's avatar jan.koester
Browse files

build-cross: usr-merged container roots (fresh's /bin) 

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parent 9f4aa4d8

build-cross.sh

+3 −1
Changes for build-cross.sh: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -918,7 +918,9 @@ docker_image() { 
    local name="$1" list="$2" root="$BUILD/docker-$1"

    msg "docker: $name: installing $(wc -l <"$list") RPMs"

    rm -rf --one-file-system "$root"

    mkdir -p "$root"

    # usr-merged, as the rootfs (fresh installs /bin/*: /usr/bin then)

    mkdir -p "$root$PREFIX"/{bin,sbin,lib}

    ln -s usr/bin "$root/bin"; ln -s usr/sbin "$root/sbin"; ln -s usr/lib "$root/lib"

    unshare -r rpm --root "$root" --initdb

    # scriptlets run in the root through binfmt's qemu-$PROC

    if ! QEMU_CPU=e500v2 unshare -r rpm --root "$root" --ignorearch -ivh $(cat "$list") >>"$LOGS/docker-$name.log" 2>&1; then