From fbeb1dfe176cea3eea50a098086add8f0432a29c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 11 Dec 2020 18:36:32 +0100 Subject: [PATCH 1/4] use runner setting specified in Cross.toml --- src/docker.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/docker.rs b/src/docker.rs index a07bd3c12..2b6412304 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -103,7 +103,7 @@ pub fn run(target: &Target, cmd.args(args); - let runner = None; + let mut runner = None; let mut docker = docker_command("run")?; @@ -140,6 +140,8 @@ pub fn run(target: &Target, docker.args(&["-e", &format!("{}={}", var, mount_path.display())]); } } + + runner = toml.runner(target)?; } docker.args(&["-e", "PKG_CONFIG_ALLOW_CROSS=1"]); From 881f33620e020ff22a94b5360f6801b0ece55671 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 14 Dec 2020 12:25:31 +0100 Subject: [PATCH 2/4] install missing dropbear dependencies --- docker/linux-image.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 37c75dbc0..2453ab140 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -22,20 +22,25 @@ main() { aarch64) arch=arm64 kernel="${kversion}-arm64" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; armv7) arch=armhf kernel="${kversion}-armmp" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; i686) arch=i386 kernel="${kversion}-686" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; mips|mipsel) kernel="${kversion}-4kc-malta" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; mips64el) kernel="${kversion}-5kc-malta" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; powerpc) # there is no buster powerpc port, so we use jessie @@ -51,6 +56,7 @@ main() { echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid dropbear="dropbear" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch libcrypt1:$arch) ;; powerpc64) # there is no stable port @@ -66,10 +72,12 @@ main() { powerpc64le) arch=ppc64el kernel="${kversion}-powerpc64le" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; s390x) arch=s390x kernel="${kversion}-s390x" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; sparc64) # there is no stable port @@ -84,6 +92,7 @@ main() { x86_64) arch=amd64 kernel="${kversion}-amd64" + deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; *) echo "Invalid arch: ${arch}" From 99c2ac667be0f92dfdd7e663aaea8d39366c377d Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 14 Dec 2020 13:28:27 +0100 Subject: [PATCH 3/4] refactor linux-image.sh --- docker/linux-image.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 2453ab140..5e5ec70f4 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -22,25 +22,20 @@ main() { aarch64) arch=arm64 kernel="${kversion}-arm64" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; armv7) arch=armhf kernel="${kversion}-armmp" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; i686) arch=i386 kernel="${kversion}-686" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; mips|mipsel) kernel="${kversion}-4kc-malta" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; mips64el) kernel="${kversion}-5kc-malta" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; powerpc) # there is no buster powerpc port, so we use jessie @@ -56,7 +51,7 @@ main() { echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid dropbear="dropbear" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch libcrypt1:$arch) + deps=(libcrypt1:$arch) ;; powerpc64) # there is no stable port @@ -67,17 +62,15 @@ main() { debsource="deb http://ftp.ports.debian.org/debian-ports unstable main" debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main" # sid version of dropbear requires these dependencies - deps=(libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64 libcrypt1:ppc64) + deps=(libcrypt1:$arch) ;; powerpc64le) arch=ppc64el kernel="${kversion}-powerpc64le" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; s390x) arch=s390x kernel="${kversion}-s390x" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; sparc64) # there is no stable port @@ -87,12 +80,11 @@ main() { debsource="deb http://ftp.ports.debian.org/debian-ports unstable main" debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main" # sid version of dropbear requires these dependencies - deps=(libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64 libcrypt1:sparc64) + deps=(libcrypt1:$arch) ;; x86_64) arch=amd64 kernel="${kversion}-amd64" - deps=(libtommath1:$arch libtomcrypt1:$arch libgmp10:$arch) ;; *) echo "Invalid arch: ${arch}" @@ -146,6 +138,9 @@ main() { ${deps[@]+"${deps[@]}"} \ "busybox:${arch}" \ "${dropbear}:${arch}" \ + "libtommath1:$arch" \ + "libtomcrypt1:$arch" \ + "libgmp10:$arch" \ "libc6:${arch}" \ "${libgcc}:${arch}" \ "libstdc++6:${arch}" \ From 8b2d8cf48619f6b2ee267aa4c5d24691deab1f99 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 14 Dec 2020 13:37:55 +0100 Subject: [PATCH 4/4] make shellcheck happy --- docker/linux-image.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 5e5ec70f4..7d4a5c80a 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -51,7 +51,7 @@ main() { echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid dropbear="dropbear" - deps=(libcrypt1:$arch) + deps=(libcrypt1:"${arch}") ;; powerpc64) # there is no stable port @@ -62,7 +62,7 @@ main() { debsource="deb http://ftp.ports.debian.org/debian-ports unstable main" debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main" # sid version of dropbear requires these dependencies - deps=(libcrypt1:$arch) + deps=(libcrypt1:"${arch}") ;; powerpc64le) arch=ppc64el @@ -80,7 +80,7 @@ main() { debsource="deb http://ftp.ports.debian.org/debian-ports unstable main" debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main" # sid version of dropbear requires these dependencies - deps=(libcrypt1:$arch) + deps=(libcrypt1:"${arch}") ;; x86_64) arch=amd64 @@ -138,9 +138,9 @@ main() { ${deps[@]+"${deps[@]}"} \ "busybox:${arch}" \ "${dropbear}:${arch}" \ - "libtommath1:$arch" \ - "libtomcrypt1:$arch" \ - "libgmp10:$arch" \ + "libtommath1:${arch}" \ + "libtomcrypt1:${arch}" \ + "libgmp10:${arch}" \ "libc6:${arch}" \ "${libgcc}:${arch}" \ "libstdc++6:${arch}" \