Merge pull request #109 from iotpi/nightly

Added specified nightly toolchain support

Author: posborne

README.md

@@ -132,6 +132,15 @@ This will create two new recipes:
  release of rust itself (using the published channel data consumed by other
  tools like rustup).
 
+For latest nightly version:
+
+    ./build-new-version.sh nightly
+    
+For specified nightly version:
+    
+    ./build-new-version.sh nightly 2019-07-08
+    
+
 ## Copyright
 
 ```

build-new-version.sh

@@ -14,6 +14,9 @@ if [ -z "$TARGET_VERSION" ]; then
     exit 1
 fi
 
+# if NIGHTLY_DATE is empty, it should download latest nightly version
+NIGHTLY_DATE="$2"
+
 CHANNEL_FILE="channel-rust-$TARGET_VERSION.toml"
 
 TMPDIR=`mktemp -p "$PWD" -d`
@@ -44,6 +47,14 @@ RUSTC_TRIPLES=(
     x86_64-unknown-linux-gnu
 )
 
+is_nightly() {
+    if [ x"$TARGET_VERSION" == x"nightly" -a "$NIGHTLY_DATE" ]; then
+        true
+    else
+        false
+    fi
+}
+
 download() {
     echo "download $@"
     curl --fail -# -O $@
@@ -52,7 +63,11 @@ download() {
 dlfile() {
     component="$1"
     triple="$2"
-    download "https://static.rust-lang.org/dist/$component-$TARGET_VERSION-$triple.tar.gz"
+    if is_nightly; then
+        download "https://static.rust-lang.org/dist/$NIGHTLY_DATE/$component-$TARGET_VERSION-$triple.tar.gz"
+    else
+        download "https://static.rust-lang.org/dist/$component-$TARGET_VERSION-$triple.tar.gz"
+    fi
 }
 
 get_md5sum() {
@@ -93,7 +108,11 @@ cargo_filename() {
 }
 
 download_files() {
-    download "https://static.rust-lang.org/dist/$CHANNEL_FILE"
+    if is_nightly; then
+        download "https://static.rust-lang.org/dist/$NIGHTLY_DATE/$CHANNEL_FILE"
+    else
+        download "https://static.rust-lang.org/dist/$CHANNEL_FILE"
+    fi
 
     # cargo for each supported host triple
     for triple in "${RUSTC_TRIPLES[@]}"; do
@@ -275,7 +294,16 @@ EOF
     }
     return get_by_triple(URLS, triple)
 
-DEPENDS += "rust-bin-cross-\${TARGET_ARCH} (= ${TARGET_VERSION})"
+EOF
+
+    if is_nightly; then
+        echo >> "$CARGO_BIN_RECIPE" "DEPENDS += \"rust-bin-cross-\${TARGET_ARCH} (= ${TARGET_VERSION}-${NIGHTLY_DATE})\""
+    else
+        echo >> "$CARGO_BIN_RECIPE" "DEPENDS += \"rust-bin-cross-\${TARGET_ARCH} (= ${TARGET_VERSION})\""
+    fi
+
+    cat <<EOF >>${CARGO_BIN_RECIPE}
+
 LIC_FILES_CHKSUM = "\\
     file://LICENSE-APACHE;md5=${CARGO_APACHE_EXPECTED} \\
     file://LICENSE-MIT;md5=${CARGO_MIT_EXPECTED} \\
@@ -290,8 +318,13 @@ download_files
 # validate extracted cargo license
 check_cargo_license
 
-RUST_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/rust-bin-cross_$TARGET_VERSION.bb"
-CARGO_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/cargo-bin-cross_$TARGET_VERSION.bb"
+if [ x"$TARGET_VERSION" == x"nightly" -a "$NIGHTLY_DATE" ]; then
+    RUST_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/rust-bin-cross_${TARGET_VERSION}-${NIGHTLY_DATE}.bb"
+    CARGO_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/cargo-bin-cross_${TARGET_VERSION}-${NIGHTLY_DATE}.bb"
+else
+    RUST_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/rust-bin-cross_$TARGET_VERSION.bb"
+    CARGO_BIN_RECIPE="$ROOT_DIR/recipes-devtools/rust/cargo-bin-cross_$TARGET_VERSION.bb"
+fi
 
 # create/clear files
 echo "" >"$RUST_BIN_RECIPE"

recipes-devtools/rust/cargo-bin-cross.inc

@@ -31,7 +31,13 @@ do_install[depends] += "virtual/fakeroot-native:do_populate_sysroot"
 
 python () {
     pv = d.getVar("PV", True)
-    pv_uri = pv[0:4] + '-' + pv[4:6] + '-' + pv[6:8]
+
+    # only specified nightly needs another branch
+    nightly = pv.startswith("nightly-")
+
+    if nightly:
+        pv = "nightly"
+
     target = d.getVar("CARGO_HOST_TARGET", True)
     cargo_uri = ("%s;md5sum=%s;sha256sum=%s;downloadname=%s" %
                  (cargo_url(target), cargo_md5(target), cargo_sha256(target),

recipes-devtools/rust/rust-bin-cross.inc

@@ -20,7 +20,16 @@ RUST_BUILD_TARGET = "${@rust_target(d, 'BUILD')}"
 RUST_TARGET_TARGET = "${@rust_target(d, 'TARGET')}"
 RUST_ALL_TARGETS = "${RUST_BUILD_TARGET} ${RUST_TARGET_TARGET} ${EXTRA_RUST_TARGETS}"
 
-S = "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"
+def get_s(d):
+    pv = d.getVar("PV", True)
+    nightly = pv.startswith("nightly-")
+
+    if nightly:
+        return "${WORKDIR}/rustc-nightly-${RUST_BUILD_TARGET}"
+    else:
+        return "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"
+  
+S = "${@get_s(d)}"
 
 # Relocating WORKDIR doesn't matter to installer
 S[vardepsexclude] += "WORKDIR"
@@ -55,12 +64,27 @@ do_install[depends] += "virtual/fakeroot-native:do_populate_sysroot"
 
 python () {
     pv = d.getVar("PV", True)
+    nightly = pv.startswith("nightly-")
+
+    if nightly:
+        pv = pv.partition("-")[2]
+        target_version = "nightly"
+
     base_uri = d.getVar("RUST_BASE_URI", True)
     targets = d.getVar("RUST_ALL_TARGETS", True).split()
     build_target = d.getVar("RUST_BUILD_TARGET", True)
-    rustc_src_uri = ("%s/dist/rustc-%s-%s.tar.gz;md5sum=%s;sha256sum=%s" %
+    if nightly:
+        rustc_src_uri = ("%s/dist/%s/rustc-%s-%s.tar.gz;md5sum=%s;sha256sum=%s" %
+                     (base_uri, pv, target_version, build_target, rustc_md5(build_target), rustc_sha256(build_target)))
+    else:
+        rustc_src_uri = ("%s/dist/rustc-%s-%s.tar.gz;md5sum=%s;sha256sum=%s" %
                      (base_uri, pv, build_target, rustc_md5(build_target), rustc_sha256(build_target)))
-    std_src_uris = ["%s/dist/rust-std-${PV}-%s.tar.gz;md5sum=%s;sha256sum=%s;subdir=rust-std" %
+
+    if nightly:
+        std_src_uris = ["%s/dist/%s/rust-std-%s-%s.tar.gz;md5sum=%s;sha256sum=%s;subdir=rust-std" %
+                    (base_uri, pv, target_version, target, rust_std_md5(target), rust_std_sha256(target)) for target in targets]
+    else:
+        std_src_uris = ["%s/dist/rust-std-${PV}-%s.tar.gz;md5sum=%s;sha256sum=%s;subdir=rust-std" %
                     (base_uri, target, rust_std_md5(target), rust_std_sha256(target)) for target in targets]
     src_uri = d.getVar("SRC_URI", True).split()
     d.setVar("SRC_URI", ' '.join(src_uri + [rustc_src_uri] + std_src_uris))