diff --git a/recipes/cargo/cargo-snapshot-2015-04-02.inc b/recipes/cargo/cargo-snapshot-2015-04-02.inc deleted file mode 100644 index c81fa79..0000000 --- a/recipes/cargo/cargo-snapshot-2015-04-02.inc +++ /dev/null @@ -1,4 +0,0 @@ - -CARGO_SNAPSHOT = "2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" -SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134" -SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117" diff --git a/recipes/cargo/cargo-snapshot.inc b/recipes/cargo/cargo-snapshot.inc new file mode 100644 index 0000000..0ea10ee --- /dev/null +++ b/recipes/cargo/cargo-snapshot.inc @@ -0,0 +1,4 @@ + +CARGO_SNAPSHOT = "2016-01-31/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" +SRC_URI[md5sum] = "52f48780b7cfadc88813766048d4d402" +SRC_URI[sha256sum] = "1920e661bab536eba763ff6704a1d62fb20bb0f67d8c5a119e41c49510ea5fa6" diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc index bc38345..ca6a31f 100644 --- a/recipes/cargo/cargo.inc +++ b/recipes/cargo/cargo.inc @@ -54,7 +54,7 @@ do_compile () { rm -rf target/snapshot mkdir -p target - cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz) target/snapshot + cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz)/cargo target/snapshot oe_runmake ARGS="--verbose" } diff --git a/recipes/cargo/cargo_0.7.0.bb b/recipes/cargo/cargo_0.7.0.bb index 1fccc96..5dd94fc 100644 --- a/recipes/cargo/cargo_0.7.0.bb +++ b/recipes/cargo/cargo_0.7.0.bb @@ -1,8 +1,9 @@ -require cargo-snapshot-2015-04-02.inc +require cargo-snapshot.inc require cargo.inc SRC_URI += " \ https://github.com/rust-lang/cargo/archive/${PV}.tar.gz;name=cargo \ + file://0001-disable-cargo-snapshot-fetch.patch \ git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${BP}/src/rust-installer \ " SRC_URI[cargo.md5sum] = "2089790a4a48de7f8f3cb1afcfa9ec74" diff --git a/recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch b/recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch new file mode 100644 index 0000000..82fac10 --- /dev/null +++ b/recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch @@ -0,0 +1,27 @@ +From 9652ddba460f30e83f401ab1564656e7787bdea9 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Wed, 3 Feb 2016 15:59:48 -0500 +Subject: [PATCH] disable cargo snapshot fetch + +--- + Makefile.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 286a593..9c66486 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -92,10 +92,6 @@ test-unit-$(1): $$(CARGO) + endef + $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target)))) + +-$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt +- $(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD) +- touch $@ +- + + # === Tests + +-- +2.7.0 +