You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/05/05 04:13:44 UTC
[incubator-nuttx-testing] branch revert-42-cibuild created (now
1f0a3b6)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git.
at 1f0a3b6 Revert "cibuild.sh: export PIP_USER and PYTHONUSERBASE"
This branch includes the following new commits:
new 2d8f50a Revert "cibuild.sh: Avoid .. in path"
new 94dedbc Revert "cibuild.sh: Create $prebuilt/env.sh"
new b0bf6c0 Revert "cibuild.sh: Add a comment about prerequisites for macOS"
new c6d6c3d Revert "cibuild.sh: Use pip3"
new 1f0a3b6 Revert "cibuild.sh: export PIP_USER and PYTHONUSERBASE"
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-nuttx-testing] 03/05: Revert "cibuild.sh: Add a comment
about prerequisites for macOS"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit b0bf6c0de7b71e676753591ca60421c6d8b22e50
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Mon May 4 21:13:37 2020 -0700
Revert "cibuild.sh: Add a comment about prerequisites for macOS"
This reverts commit 196ed084c10df9a74b75cebe5383d8e4f5961346.
---
cibuild.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/cibuild.sh b/cibuild.sh
index 508c43f..3e169c4 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -17,12 +17,6 @@
# specific language governing permissions and limitations
# under the License.
-# Prerequisites for macOS
-# - Xcode (cc, etc)
-# - homebrew
-# - autoconf
-# - wget
-
set -e
WD=$(cd $(dirname $0) && pwd)
[incubator-nuttx-testing] 05/05: Revert "cibuild.sh: export
PIP_USER and PYTHONUSERBASE"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit 1f0a3b62a29ebc73f97a93145f13f3b17bf8011f
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Mon May 4 21:13:37 2020 -0700
Revert "cibuild.sh: export PIP_USER and PYTHONUSERBASE"
This reverts commit 0a69e09f55813aa39db8ff0f2ddf9495b7c18fc0.
---
cibuild.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/cibuild.sh b/cibuild.sh
index 80de270..d84a46a 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -44,9 +44,7 @@ function add_path {
function python-tools {
# Python User Env
PIP_USER=yes
- export PIP_USER
PYTHONUSERBASE=$prebuilt/pylocal
- export PYTHONUSERBASE
add_path $PYTHONUSERBASE/bin
}
[incubator-nuttx-testing] 04/05: Revert "cibuild.sh: Use pip3"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit c6d6c3d30be0cc61ffd24c2cd8fcd58284823489
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Mon May 4 21:13:37 2020 -0700
Revert "cibuild.sh: Use pip3"
This reverts commit ffe71ccba02996eec949bd905d718f698900d59a.
---
cibuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cibuild.sh b/cibuild.sh
index 3e169c4..80de270 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -202,7 +202,7 @@ function xtensa-esp32-gcc-toolchain {
esac
fi
xtensa-esp32-elf-gcc --version
- pip3 install esptool
+ pip install esptool
}
function c-cache {
[incubator-nuttx-testing] 02/05: Revert "cibuild.sh: Create
$prebuilt/env.sh"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit 94dedbcfe90542cfe2f6b244551e81c3cca323b2
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Mon May 4 21:13:37 2020 -0700
Revert "cibuild.sh: Create $prebuilt/env.sh"
This reverts commit 30e6658ae05ca30dd7ebc58e0b6fe4d50f9e0a4d.
---
cibuild.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/cibuild.sh b/cibuild.sh
index d766780..508c43f 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -31,7 +31,6 @@ apps=$WD/../apps
tools=$WD/../tools
prebuilt=$WD/../prebuilt
os=$(uname -s)
-EXTRA_PATH=
case $os in
Darwin)
@@ -46,7 +45,6 @@ esac
function add_path {
PATH=$1:$PATH
- EXTRA_PATH=$1:$EXTRA_PATH
}
function python-tools {
@@ -283,8 +281,6 @@ function install_tools {
$func
done
popd
-
- echo PATH=$EXTRA_PATH\$PATH > $prebuilt/env.sh
}
function run_builds {
[incubator-nuttx-testing] 01/05: Revert "cibuild.sh: Avoid .. in
path"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch revert-42-cibuild
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit 2d8f50aa0c40a0b56bdbd3fe3c17de520837f5ea
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Mon May 4 21:13:37 2020 -0700
Revert "cibuild.sh: Avoid .. in path"
This reverts commit be0ae2f1890b7669f2af43fc6aaf97acea9b017f.
---
cibuild.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/cibuild.sh b/cibuild.sh
index 86fb1b0..d766780 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -26,11 +26,10 @@
set -e
WD=$(cd $(dirname $0) && pwd)
-WORKSPACE=$(cd $WD/.. && pwd -P)
-nuttx=$WORKSPACE/nuttx
-apps=$WORKSPACE/apps
-tools=$WORKSPACE/tools
-prebuilt=$WORKSPACE/prebuilt
+nuttx=$WD/../nuttx
+apps=$WD/../apps
+tools=$WD/../tools
+prebuilt=$WD/../prebuilt
os=$(uname -s)
EXTRA_PATH=