Skip to content
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.

Sign up for GitHub

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

Jump to bottom

use runner setting specified in Cross.toml #500

Merged
merged 4 commits into from
Dec 14, 2020
Merged

use runner setting specified in Cross.toml #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbeb1df
use runner setting specified in Cross.toml
japaric Dec 11, 2020
881f336
install missing dropbear dependencies
japaric Dec 14, 2020
99c2ac6
refactor linux-image.sh
japaric Dec 14, 2020
8b2d8cf
make shellcheck happy
japaric Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ main() {
echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid

dropbear="dropbear"
deps=(libcrypt1:"${arch}")
;;
powerpc64)
# there is no stable port
Expand All @@ -61,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=(libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64 libcrypt1:ppc64)
deps=(libcrypt1:"${arch}")
;;
powerpc64le)
arch=ppc64el
Expand All @@ -79,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=(libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64 libcrypt1:sparc64)
deps=(libcrypt1:"${arch}")
;;
x86_64)
arch=amd64
Expand Down Expand Up @@ -137,6 +138,9 @@ main() {
${deps[@]+"${deps[@]}"} \
"busybox:${arch}" \
"${dropbear}:${arch}" \
"libtommath1:${arch}" \
"libtomcrypt1:${arch}" \
"libgmp10:${arch}" \
"libc6:${arch}" \
"${libgcc}:${arch}" \
"libstdc++6:${arch}" \
Expand Down
4 changes: 3 additions & 1 deletion src/docker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")?;

Expand Down Expand Up @@ -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"]);
Expand Down