Merge pull request #221 from stfl/sumo_cargo_22

libstd don't fail if incremental build files don't exist (sumo)
2018-12-05 11:12:38 -05:00 · 2018-12-05 15:48:38 +01:00 · 2018-05-22 09:44:21 -04:00 · 2018-05-22 09:41:30 -04:00 · 2018-05-20 11:21:49 -04:00 · 2018-05-19 10:16:55 -04:00
4 changed files with 13 additions and 8 deletions
--- a/4
+++ b/4
@@ -15,7 +15,7 @@ for (int i = 0; i < targets.size(); i++) {
                    sh "./scripts/setup-env.sh"
                }
                stage("fetch $machine") {
-                    sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh rocko"
+                    sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh sumo"
                }
                stage("build $machine") {
                    sh "MACHINE=${machine} ./scripts/build.sh"
@@ -25,7 +25,7 @@ for (int i = 0; i < targets.size(); i++) {
                throw e
            } finally {
                stage("push build cache $machine") {
-                    sh "./scripts/publish-build-cache.sh rocko"
+                    sh "./scripts/publish-build-cache.sh sumo"
                }
                stage("cleanup $machine") {
                    sh "./scripts/cleanup-env.sh"
--- a/classes/cargo_common.bbclass
+++ b/classes/cargo_common.bbclass
@@ -21,7 +21,7 @@ export CARGO_HOME = "${WORKDIR}/cargo_home"
 export PKG_CONFIG_ALLOW_CROSS = "1"

 cargo_common_do_configure () {
-	mkdir -p ${CARGO_HOME}
+	mkdir -p ${CARGO_HOME}/bitbake
 	echo "paths = [" > ${CARGO_HOME}/config

 	for p in ${EXTRA_OECARGO_PATHS}; do
@@ -33,12 +33,16 @@ cargo_common_do_configure () {
 	cat <<- EOF >> ${CARGO_HOME}/config
 	[source.bitbake]
 	directory = "${CARGO_HOME}/bitbake"
-
-	[source.crates-io]
-	replace-with = "bitbake"
-	local-registry = "/nonexistant"
 	EOF

+	if [ "${EXTERNALSRC}" == "" ]; then
+		cat <<- EOF >> ${CARGO_HOME}/config
+		[source.crates-io]
+		replace-with = "bitbake"
+		local-registry = "/nonexistant"
+		EOF
+	fi
+
 	echo "[target.${HOST_SYS}]" >> ${CARGO_HOME}/config
 	echo "linker = '${RUST_TARGET_CCLD}'" >> ${CARGO_HOME}/config
 	if [ "${HOST_SYS}" != "${BUILD_SYS}" ]; then
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,7 @@ BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_rust-layer = "7"

 LAYERDEPENDS_rust-layer = "core openembedded-layer"
+LAYERSERIES_COMPAT_rust-layer = "sumo"

 # Override security flags
 require conf/distro/include/rust_security_flags.inc
--- a/recipes-devtools/rust/libstd-rs.inc
+++ b/recipes-devtools/rust/libstd-rs.inc
@@ -23,6 +23,6 @@ do_install () {
    # With the incremental build support added in 1.24, the libstd deps directory also includes dependency
    # files that get installed. Those are really only needed to incrementally rebuild the libstd library
    # itself and don't need to be installed.
-    rm ${B}/${TARGET_SYS}/release/deps/*.d
+    rm -f ${B}/${TARGET_SYS}/release/deps/*.d
    cp ${B}/${TARGET_SYS}/release/deps/* ${D}${rustlibdir}
 }
Author	SHA1	Message	Date
Steven Walter	8b0b52d5b3	Merge pull request #221 from stfl/sumo_cargo_22 libstd don't fail if incremental build files don't exist (sumo)	2018-12-05 11:12:38 -05:00
Stefan Lendl	1587d5b8dc	libstd don't fail if incremental build files don't exist (sumo)	2018-12-05 15:48:38 +01:00
Derek Straka	3efa0f069f	Update Jenkins file to point to sumo branches Signed-off-by: Derek Straka <derek@asterius.io>	2018-05-22 09:44:21 -04:00
Derek Straka	7cfa3db4f6	Merge pull request #194 from agherzan/ag_compat layer.conf: Define LAYERSERIES_COMPAT to fix build warning	2018-05-22 09:41:30 -04:00
Derek Straka	63aa6db53a	Merge pull request #196 from srwalter/devtool cargo_common.bbclass: improve operation with devtool	2018-05-20 11:21:49 -04:00
Steven Walter	48e2a7db25	cargo_common.bbclass: improve operation with devtool Because devtool inhibits all the normal bitbake fetchers, we can't mask crates.io. Use EXTERNALSRC to detect if we're being built with devtool, and only mask crates.io if we're not. Fixes #195	2018-05-19 10:16:55 -04:00
Andrei Gherzan	ab62d9cdbf	layer.conf: Define LAYERSERIES_COMPAT to fix build warning Signed-off-by: Andrei Gherzan <andrei@resin.io>	2018-05-14 18:24:55 +01:00
Derek Straka	22d72b3be6	Merge pull request #190 from jcreekmore/add-rust-1.24.1 Remove Rust 1.24.0 in favor of 1.24.1	2018-03-05 08:32:00 -05:00
Jonathan Creekmore	575016d11d	Remove Rust 1.24.0 in favor of 1.24.1 The Rust maintainers released 1.24.1 because several minor regressions were found in the 1.24.0 release that collectively merited an updated release.	2018-03-02 12:59:28 -06:00
Derek Straka	8203dce091	Merge pull request #188 from jcreekmore/rust-1.24.0-rocko Add rust version 1.24.0	2018-03-01 08:07:49 -05:00
Adam Schwalm	0639277e4c	Add 1.24.0 for rocko	2018-02-27 16:19:12 -06:00
Derek Straka	5a9c23fac4	Merge pull request #189 from agherzan/fix-soname libstd-rs: Set SONAME for libstd.so	2018-02-27 07:54:03 -05:00
Andrei Gherzan	69ae1df12e	libstd-rs: Set SONAME for libstd.so When yocto is searching for lib dependencies it uses SONAMES and RPATHS to find the right one. When we compile a rust package which dynamically links to rust's libstd, yocto will not be able to find the matching dependency in shlib and will complain with a warning. Even worse, if you have compiled go-runtime, the build will find go-runtime as provider of libstd and will complain that you missed a RDEPENDS to go-runtime - this is completely wrong obviously. This patch adds SONAME to rust's stdlib. In this way yocto will create the required provider and packages dynamically linking to it will be able to find libstd-rs as a provider of stdlib. Signed-off-by: Andrei Gherzan <andrei@resin.io>	2018-02-26 17:43:09 +00:00