diff --git a/installer/installer.c b/installer/installer.c index 137e4d623..be30baac8 100644 --- a/installer/installer.c +++ b/installer/installer.c @@ -31,7 +31,7 @@ #define BRANCH_S STR2(BRANCH) #define PRE_CHECKOUT_FOLDER "/system/comma/openpilot" -#define GIT_CLONE_COMMAND "git clone https://github.com/commaai/openpilot.git " +#define GIT_CLONE_COMMAND "git clone https://github.com/jyoung8607/openpilot.git " extern const uint8_t str_continue[] asm("_binary_continue_" BRAND_S "_sh_start"); diff --git a/installer/installers/installer_dashcam b/installer/installers/installer_dashcam index b81d1066f..5f31356f6 100755 Binary files a/installer/installers/installer_dashcam and b/installer/installers/installer_dashcam differ diff --git a/installer/installers/installer_openpilot b/installer/installers/installer_openpilot index d4c80cfb9..d81c232b4 100755 Binary files a/installer/installers/installer_openpilot and b/installer/installers/installer_openpilot differ diff --git a/release/build_devel.sh b/release/build_devel.sh index 50810b8a6..58458b874 100755 --- a/release/build_devel.sh +++ b/release/build_devel.sh @@ -5,10 +5,11 @@ TARGET_DIR=/data/openpilot ln -sf $TARGET_DIR /data/pythonpath -export GIT_COMMITTER_NAME="Vehicle Researcher" -export GIT_COMMITTER_EMAIL="user@comma.ai" -export GIT_AUTHOR_NAME="Vehicle Researcher" -export GIT_AUTHOR_EMAIL="user@comma.ai" +export GITHUB_REPO="jyoung8607/openpilot.git" +export GIT_COMMITTER_NAME="Jason Young" +export GIT_COMMITTER_EMAIL="jyoung8607@gmail.com" +export GIT_AUTHOR_NAME="Jason Young" +export GIT_AUTHOR_EMAIL="jyoung8607@gmail.com" export GIT_SSH_COMMAND="ssh -i /data/gitkey" echo "[-] Setting up repo T=$SECONDS" @@ -16,7 +17,7 @@ if [ ! -d "$TARGET_DIR" ]; then mkdir -p $TARGET_DIR cd $TARGET_DIR git init - git remote add origin git@github.com:commaai/openpilot.git + git remote add origin git@github.com:$GITHUB_REPO fi echo "[-] fetching public T=$SECONDS" @@ -25,12 +26,12 @@ git prune || true git remote prune origin || true echo "[-] bringing master-ci and devel in sync T=$SECONDS" -git fetch origin master-ci +git fetch origin master git fetch origin devel -git checkout -f --track origin/master-ci -git reset --hard master-ci -git checkout master-ci +git checkout -f --track origin/master +git reset --hard master +git checkout master git reset --hard origin/devel git clean -xdf @@ -76,8 +77,8 @@ popd if [ ! -z "$CI_PUSH" ]; then echo "[-] Pushing to $CI_PUSH T=$SECONDS" - git remote set-url origin git@github.com:commaai/openpilot.git - git push -f origin master-ci:$CI_PUSH + git remote set-url origin git@github.com:$GITHUB_REPO + git push -f origin master:$CI_PUSH fi echo "[-] done T=$SECONDS" diff --git a/release/build_release2.sh b/release/build_release2.sh index f47686a6b..695def00f 100755 --- a/release/build_release2.sh +++ b/release/build_release2.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash set -e -export GIT_COMMITTER_NAME="Vehicle Researcher" -export GIT_COMMITTER_EMAIL="user@comma.ai" -export GIT_AUTHOR_NAME="Vehicle Researcher" -export GIT_AUTHOR_EMAIL="user@comma.ai" +export GITHUB_REPO="jyoung8607/openpilot.git" +export GIT_COMMITTER_NAME="Jason Young" +export GIT_COMMITTER_EMAIL="jyoung8607@gmail.com" +export GIT_AUTHOR_NAME="Jason Young" +export GIT_AUTHOR_EMAIL="jyoung8607@gmail.com" export GIT_SSH_COMMAND="ssh -i /data/gitkey" @@ -17,7 +18,7 @@ if [ ! -z "$CLEAN" ]; then # Create git repo git init - git remote add origin git@github.com:commaai/openpilot.git + git remote add origin git@github.com:$GITHUB_REPO git fetch origin devel-staging else cd /data/openpilot @@ -26,7 +27,7 @@ else fi git fetch origin release2-staging -git fetch origin dashcam-staging +#git fetch origin dashcam-staging # Create release2 with no history if [ ! -z "$CLEAN" ]; then @@ -41,14 +42,14 @@ echo "#define COMMA_VERSION \"$VERSION-release\"" > selfdrive/common/version.h git commit -m "openpilot v$VERSION" # Build signed panda firmware -pushd panda/board/ -cp -r /tmp/pandaextra /data/openpilot/ -RELEASE=1 make obj/panda.bin -mv obj/panda.bin /tmp/panda.bin -make clean -mv /tmp/panda.bin obj/panda.bin.signed -rm -rf /data/openpilot/pandaextra -popd +#pushd panda/board/ +#cp -r /tmp/pandaextra /data/openpilot/ +#RELEASE=1 make obj/panda.bin +#mv obj/panda.bin /tmp/panda.bin +#make clean +#mv /tmp/panda.bin obj/panda.bin.signed +#rm -rf /data/openpilot/pandaextra +#popd # Build stuff ln -sfn /data/openpilot /data/pythonpath @@ -81,14 +82,14 @@ git commit --amend -m "openpilot v$VERSION" #git status --ignored if [ ! -z "$PUSH" ]; then - git remote set-url origin git@github.com:commaai/openpilot.git + git remote set-url origin git@github.com:$GITHUB_REPO # Push to release2-staging git push -f origin release2-staging # Create dashcam release - git rm selfdrive/car/*/carcontroller.py + #git rm selfdrive/car/*/carcontroller.py - git commit -m "create dashcam release from release2" - git push -f origin release2-staging:dashcam-staging + g#it commit -m "create dashcam release from release2" + #git push -f origin release2-staging:dashcam-staging fi diff --git a/selfdrive/common/version.h b/selfdrive/common/version.h index 678734448..0f24cacc8 100644 --- a/selfdrive/common/version.h +++ b/selfdrive/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "0.8.0" +#define COMMA_VERSION "0.8.0-VW"