From f6828e11ebc907ed95b2ed8ff3eb5a6e59ad5bac Mon Sep 17 00:00:00 2001 From: "HERISANU,IOAN (K-Romania,ex1)" Date: Wed, 7 Nov 2018 11:25:04 +0200 Subject: [PATCH 1/4] Add Rust 1.30.0 --- .../rust/cargo-bin-cross_1.30.0.bb | 50 +++++++++++++++ .../rust/rust-bin-cross_1.30.0.bb | 61 +++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 recipes-devtools/rust/cargo-bin-cross_1.30.0.bb create mode 100644 recipes-devtools/rust/rust-bin-cross_1.30.0.bb diff --git a/recipes-devtools/rust/cargo-bin-cross_1.30.0.bb b/recipes-devtools/rust/cargo-bin-cross_1.30.0.bb new file mode 100644 index 0000000..b65748f --- /dev/null +++ b/recipes-devtools/rust/cargo-bin-cross_1.30.0.bb @@ -0,0 +1,50 @@ + +# Recipe for cargo 20181025 +# This corresponds to rust release 1.30.0 + +def get_by_triple(hashes, triple): + try: + return hashes[triple] + except: + bb.fatal("Unsupported triple: %s" % triple) + +def cargo_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "3a26d37bf613be7d205ee6e7c7b1b052", + "arm-unknown-linux-gnueabi": "b9959cc5517674adfb96d250dabcabf7", + "arm-unknown-linux-gnueabihf": "457bee2c89bbe3b51d5791a1e35748f8", + "armv7-unknown-linux-gnueabihf": "422d706e2cadef32e5e281258af9f690", + "i686-unknown-linux-gnu": "dee6ecd9e5d97f209ffc2fd58719c2bb", + "x86_64-unknown-linux-gnu": "b3229879d93765ebbd0520f309ad26eb", + } + return get_by_triple(HASHES, triple) + +def cargo_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "cf3ac3beffb70e19124e33f9b543d00b0a7ad0dd9f9e18185dbec0e7df69c004", + "arm-unknown-linux-gnueabi": "dfe2eea42659c7323fb1684a9b6c383da966bd8e7bdc592729e0898a56ee1f7e", + "arm-unknown-linux-gnueabihf": "1fabf25d8b61e5b567edf9906e9e59af7cd794253270c50be28b250ca2666266", + "armv7-unknown-linux-gnueabihf": "da9d87e7c4fd338252b133f7775909fce2ce70933e5249849d6c1a8dc7efa549", + "i686-unknown-linux-gnu": "7d26d58148a03d0eb3858cc6cc635cf9cd092de9324e58b7f91ed8f22a4f5b41", + "x86_64-unknown-linux-gnu": "fe03acbd158d680bbdd8009b242b5ee49a7deab129345ce9c539d7c523c22db0", + } + return get_by_triple(HASHES, triple) + +def cargo_url(triple): + URLS = { + "aarch64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-aarch64-unknown-linux-gnu.tar.gz", + "arm-unknown-linux-gnueabi": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-arm-unknown-linux-gnueabi.tar.gz", + "arm-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-arm-unknown-linux-gnueabihf.tar.gz", + "armv7-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-armv7-unknown-linux-gnueabihf.tar.gz", + "i686-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-i686-unknown-linux-gnu.tar.gz", + "x86_64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-10-25/cargo-0.31.0-x86_64-unknown-linux-gnu.tar.gz", + } + return get_by_triple(URLS, triple) + +DEPENDS += "rust-bin-cross-${TARGET_ARCH} (= 1.30.0)" +LIC_FILES_CHKSUM = "\ + file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ +" + +require cargo-bin-cross.inc diff --git a/recipes-devtools/rust/rust-bin-cross_1.30.0.bb b/recipes-devtools/rust/rust-bin-cross_1.30.0.bb new file mode 100644 index 0000000..cbabbfb --- /dev/null +++ b/recipes-devtools/rust/rust-bin-cross_1.30.0.bb @@ -0,0 +1,61 @@ + +def get_by_triple(hashes, triple): + try: + return hashes[triple] + except: + bb.fatal("Unsupported triple: %s" % triple) + + +def rust_std_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "a6b1946a6455f427cf389db8e8d4cb0d", + "arm-unknown-linux-gnueabi": "89e6171576151a551ef45ea8dc807500", + "arm-unknown-linux-gnueabihf": "45f2b4c5004f4c275e5cd4c7f9c8904a", + "armv7-unknown-linux-gnueabihf": "1ccf4f0b46d24a11a0918d98514332eb", + "i686-unknown-linux-gnu": "7565b2138f1c91420f1709df7eb30fdc", + "mips-unknown-linux-gnu": "ef5dfe71d7b11e6d0546f053d980b154", + "mipsel-unknown-linux-gnu": "5be76d9ce4097c287956f5619ad74a90", + "powerpc-unknown-linux-gnu": "4e608a93c490de0af12ee242d82a629a", + "x86_64-unknown-linux-gnu": "0e8831c2b916b2391734a3f46dd586b0", + } + return get_by_triple(HASHES, triple) + +def rust_std_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "0166650de5072545c3945416638dec9beec5ae1f3c72069e314b7c50e18b4819", + "arm-unknown-linux-gnueabi": "2dc5e1e0af871eb6b2ef2152821bd8e7d8ad77e7e9efa805a86f2cc3919e6851", + "arm-unknown-linux-gnueabihf": "d3a337315774f8ff4afe7854f59daac96e3c0e08bbc216a2cc3efc83d30f4f7a", + "armv7-unknown-linux-gnueabihf": "ecbb41147795d17958b21e9e15314d9ff143ab932bcfcdca408aa6f6d6603a75", + "i686-unknown-linux-gnu": "fe0f7dac3f37d2063c7e6bb99e31f0a83633317ec5920124e583af5ee9365fbc", + "mips-unknown-linux-gnu": "25734ffdd1cb8297f41a7bc13813900633fc6365d48c1da201fda6823b434587", + "mipsel-unknown-linux-gnu": "3961b0c13d1c5c7ef324e7842dc0aa75cbf21f256c3bd2dfc58796235f9608f5", + "powerpc-unknown-linux-gnu": "09d38d3280781fe58dc3899422be135957520029c1beeaed7de067887e163a0e", + "x86_64-unknown-linux-gnu": "8514eedc0ed99ab75c61be3137c3e57c4115063ddc07aec842f687ebfc7ceda3", + } + return get_by_triple(HASHES, triple) + +def rustc_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "d896e5a8ed5b070faa7f99db70e254a3", + "arm-unknown-linux-gnueabi": "ecdd1d40babeab998c18c5dbb10388aa", + "arm-unknown-linux-gnueabihf": "773b1fcf9dc0e6af99808645a8697ffb", + "armv7-unknown-linux-gnueabihf": "40793a91e7a7441655934db600a0ee31", + "i686-unknown-linux-gnu": "7d49bebc83589b9df02062bb37fe0e50", + "x86_64-unknown-linux-gnu": "262fe55e3261ecf601d3a434afdc6832", + } + return get_by_triple(HASHES, triple) + +def rustc_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "ccff6c6d8386655955265f586862314dd3b646bbeccd1369877f4343b1960a53", + "arm-unknown-linux-gnueabi": "1906681c33ecdb5cd26fb17e0cf48f88262e668130b116cd81eb23d2d0462355", + "arm-unknown-linux-gnueabihf": "37cd664a4d78f4b9838205e8e90c1566d08ae95590341e1e1fa395718d6cb31d", + "armv7-unknown-linux-gnueabihf": "1d3d3b9223ac3f217f9f43145f87970c4935337787264c54c6a746c0992e4b59", + "i686-unknown-linux-gnu": "cc8c00e32b68b6a925d5680cfafe3cb41240ab50e3b00079c1c0707dbc66432f", + "x86_64-unknown-linux-gnu": "cc45058e9963d33ca28220e752d9e360b7e05f17e34284f5f8197738c3a88444", + } + return get_by_triple(HASHES, triple) + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=99c369ad81a36cd5b27f6c6968d01055" + +require rust-bin-cross.inc From fc54facddc186776c8b93217823a9fbfdff72c51 Mon Sep 17 00:00:00 2001 From: "HERISANU,IOAN (K-Romania,ex1)" Date: Thu, 8 Nov 2018 19:11:04 +0200 Subject: [PATCH 2/4] Compute automatically md5sum for COPYRIGHT file --- build-new-version.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build-new-version.sh b/build-new-version.sh index b51de13..b562ae1 100755 --- a/build-new-version.sh +++ b/build-new-version.sh @@ -175,9 +175,22 @@ EOF EOF } +copyright_md5sum=NULL +get_copyright_md5sum() { + for triple in $RUSTC_TRIPLES; do + echo $triple + rustcfile=rustc-${TARGET_VERSION}-${triple} + tar -zxvf $rustcfile.tar.gz ${rustcfile}/COPYRIGHT + copyright_md5sum="$( md5sum ${rustcfile}/COPYRIGHT | cut -d ' ' -f1 )" + echo $copyright_md5sum + break + done +} + + write_final_contents() { cat <>${RUST_BIN_RECIPE} -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=99c369ad81a36cd5b27f6c6968d01055" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=${copyright_md5sum}" require rust-bin-cross.inc EOF @@ -251,6 +264,7 @@ write_std_md5 write_std_sha256 write_rustc_md5 write_rustc_sha256 +get_copyright_md5sum write_final_contents # write the cargo recipe From 194826bf84bfa3268affac0070f4577a1fc2c5ae Mon Sep 17 00:00:00 2001 From: "HERISANU,IOAN (K-Romania,ex1)" Date: Thu, 8 Nov 2018 19:29:34 +0200 Subject: [PATCH 3/4] Correct md5 for COPYRIGHT file --- recipes-devtools/rust/rust-bin-cross_1.30.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/rust/rust-bin-cross_1.30.0.bb b/recipes-devtools/rust/rust-bin-cross_1.30.0.bb index cbabbfb..964070c 100644 --- a/recipes-devtools/rust/rust-bin-cross_1.30.0.bb +++ b/recipes-devtools/rust/rust-bin-cross_1.30.0.bb @@ -56,6 +56,6 @@ def rustc_sha256(triple): } return get_by_triple(HASHES, triple) -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=99c369ad81a36cd5b27f6c6968d01055" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=66ddc8ecd998476b7cd5732e8c3a6c1d" require rust-bin-cross.inc From 7cc9f7c77562b0eb4dcee1ae9223211d7739af7c Mon Sep 17 00:00:00 2001 From: "HERISANU,IOAN (K-Romania,ex1)" Date: Fri, 9 Nov 2018 09:00:26 +0200 Subject: [PATCH 4/4] Add rust 1.30.1 --- .../rust/cargo-bin-cross_1.30.1.bb | 50 +++++++++++++++ .../rust/rust-bin-cross_1.30.1.bb | 61 +++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 recipes-devtools/rust/cargo-bin-cross_1.30.1.bb create mode 100644 recipes-devtools/rust/rust-bin-cross_1.30.1.bb diff --git a/recipes-devtools/rust/cargo-bin-cross_1.30.1.bb b/recipes-devtools/rust/cargo-bin-cross_1.30.1.bb new file mode 100644 index 0000000..e1080c4 --- /dev/null +++ b/recipes-devtools/rust/cargo-bin-cross_1.30.1.bb @@ -0,0 +1,50 @@ + +# Recipe for cargo 20181108 +# This corresponds to rust release 1.30.1 + +def get_by_triple(hashes, triple): + try: + return hashes[triple] + except: + bb.fatal("Unsupported triple: %s" % triple) + +def cargo_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "5c94a07cbbb12e954f64ac978b4ee9a9", + "arm-unknown-linux-gnueabi": "955dcc67ba92abe90c034a9267f30306", + "arm-unknown-linux-gnueabihf": "197d75b8b1285cba11e7a0fa70bececc", + "armv7-unknown-linux-gnueabihf": "1af72b4b98402d265433f80f4f74dfff", + "i686-unknown-linux-gnu": "d02520fa58020e529d7a27ae93f87d57", + "x86_64-unknown-linux-gnu": "bad665c07e73a3f3cfa7ec3b209737fc", + } + return get_by_triple(HASHES, triple) + +def cargo_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "fc7b102942e6fdb32b9cb077513bb50186834bef4c947ff0b011c552cd639f8e", + "arm-unknown-linux-gnueabi": "af6cc39eb8d95fdcf46717d787c3b8fd575f488ca7a8ca66e92f98f972b7a77f", + "arm-unknown-linux-gnueabihf": "6601f5b8f4b45c4f8bec1f718ebbc30c7ac9d3accbe3d4fd0b502bf15199f679", + "armv7-unknown-linux-gnueabihf": "55dd38a6ca4528e18f6e546d4c4cdd12d3af6d3413ac68233cb64272fe93724e", + "i686-unknown-linux-gnu": "681caeb35516535896f555110923b5dbfd9d79b668a808d01c4cee88534c1ba4", + "x86_64-unknown-linux-gnu": "bfbabba9a2c1717fe1ce68469ce2de7b4b94e44e6a165d50b77de7bf7515bdb6", + } + return get_by_triple(HASHES, triple) + +def cargo_url(triple): + URLS = { + "aarch64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-aarch64-unknown-linux-gnu.tar.gz", + "arm-unknown-linux-gnueabi": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-arm-unknown-linux-gnueabi.tar.gz", + "arm-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-arm-unknown-linux-gnueabihf.tar.gz", + "armv7-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-armv7-unknown-linux-gnueabihf.tar.gz", + "i686-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-i686-unknown-linux-gnu.tar.gz", + "x86_64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2018-11-08/cargo-0.31.0-x86_64-unknown-linux-gnu.tar.gz", + } + return get_by_triple(URLS, triple) + +DEPENDS += "rust-bin-cross-${TARGET_ARCH} (= 1.30.1)" +LIC_FILES_CHKSUM = "\ + file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ +" + +require cargo-bin-cross.inc diff --git a/recipes-devtools/rust/rust-bin-cross_1.30.1.bb b/recipes-devtools/rust/rust-bin-cross_1.30.1.bb new file mode 100644 index 0000000..2613252 --- /dev/null +++ b/recipes-devtools/rust/rust-bin-cross_1.30.1.bb @@ -0,0 +1,61 @@ + +def get_by_triple(hashes, triple): + try: + return hashes[triple] + except: + bb.fatal("Unsupported triple: %s" % triple) + + +def rust_std_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "fd418a7252c80c892a04ca462a77ac0e", + "arm-unknown-linux-gnueabi": "abadeb3a32348919170d32acf7d8a6da", + "arm-unknown-linux-gnueabihf": "1bfcdb7d5ebb18dabf0e798f9c588c1e", + "armv7-unknown-linux-gnueabihf": "8717c64f4edbd7febe232c62a3d02b8d", + "i686-unknown-linux-gnu": "82e75d70b4675ffac56dfd91c23c7369", + "mips-unknown-linux-gnu": "faf431088e0c1cb2d4d119acda282939", + "mipsel-unknown-linux-gnu": "e32dcf93ea021f3052fbb7fa21cd4f16", + "powerpc-unknown-linux-gnu": "fafa65476f4f66b71f8cb1f5a1fa3fa7", + "x86_64-unknown-linux-gnu": "3515a647401436d93289dad275445713", + } + return get_by_triple(HASHES, triple) + +def rust_std_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "64410910d73628a77dfe94dbcd0cd49709b518b5f641fbe4a2476b9af097d47b", + "arm-unknown-linux-gnueabi": "8c2ea7c66a86450561234df8d07e4cff6519db93626a149496e187690dca4aeb", + "arm-unknown-linux-gnueabihf": "cd21b66e983a390ecbef87fafebf35f299759dbc821e6f775cc49c57d16a0f9d", + "armv7-unknown-linux-gnueabihf": "18c6cbe62105f2808ba8fcb785e5dc69e540e6fd1ab21dd0f3f2a6dac33c17bf", + "i686-unknown-linux-gnu": "88aadaf4dd4fdf565a72ec822e08de5c6a72d3784fc378b82689f2843f8da874", + "mips-unknown-linux-gnu": "2047ed1e53c44fc12a8e1f84f629eb7a0aa9511bccc0cdec20a1b00c52a59ddd", + "mipsel-unknown-linux-gnu": "3d6076cd1a2a1081f265b87f143090cb6dfd63d18cc31a85084a3bbd3a2ae56c", + "powerpc-unknown-linux-gnu": "63b8c63c487a759a2c00cc094b7752b3f8df2367c88d4f6a71eb0ed34fd70cfd", + "x86_64-unknown-linux-gnu": "12c4b164efed44c28096fcd141225ee9bf74e7e3395bc6a60c11c9115a0536c6", + } + return get_by_triple(HASHES, triple) + +def rustc_md5(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "0e15561c170d7a7d3f0221a549000323", + "arm-unknown-linux-gnueabi": "5b39383ae231257ba3fc8f731856d3f2", + "arm-unknown-linux-gnueabihf": "3af277292572242424f27500bf0885d5", + "armv7-unknown-linux-gnueabihf": "cac86321371850b5b96793c1920bad84", + "i686-unknown-linux-gnu": "b28f7e17ce2b11597fb324a1b6ef1d77", + "x86_64-unknown-linux-gnu": "195712758f05eb251dd212a803d83883", + } + return get_by_triple(HASHES, triple) + +def rustc_sha256(triple): + HASHES = { + "aarch64-unknown-linux-gnu": "f3569c0a74f07aa2e56bf93c9f2aaddf7434ce17f85d6d6ff854fb9245888bcf", + "arm-unknown-linux-gnueabi": "0946d2b637a4474d55408f7a0528f3dbfd2eea60d316880e60c9f05288deef4f", + "arm-unknown-linux-gnueabihf": "8f50c7c6e54b1c2fa79029a32a6dd3b4cbca33c6628442c958c094aaee47f64f", + "armv7-unknown-linux-gnueabihf": "421daec92b7be355072e94ba51712f5a3aa4401973ac4a6eba8b1bd1efa1c516", + "i686-unknown-linux-gnu": "7259121446e2ef579f2a3ed24c8a54a85a2a1a8d5ff517a0249ba3639ee989cf", + "x86_64-unknown-linux-gnu": "d84de208499b59e4a3c074f9f3f2fcbb26fb20d6bfd19262e6d5f4181ddbe34d", + } + return get_by_triple(HASHES, triple) + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=66ddc8ecd998476b7cd5732e8c3a6c1d" + +require rust-bin-cross.inc