Mirrors/OpenSolo
1
0
Fork 0
mirror of https://github.com/OpenSolo/OpenSolo.git synced 2025-04-29 14:14:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes for error/s that were occuring in 'vagrant up'.

Browse Source 
this pins the git version used to 2.32.2 as it seems to work ok with the patches, and latest one from releases didn't. 
it also changes the url schema to http: from git: as per github guidlines change/s.
bitbake recipies need protocol=http, to tell bitbake that git
should use the http protocol
This commit is contained in:
Buzz 2022-05-10 18:25:25 +10:00
parent 7e8f0ab393
commit abbe08fc18
9 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
install-vagrant-deps.sh
View File

@ -18,12 +18,40 @@ sudo pip install urllib3[secure] bcrypt pynacl cryptography==2.0.3 pillow
#git-with-openssl as gnutls can't do modern https/tls #git-with-openssl as gnutls can't do modern https/tls
cd /home/vagrant cd /home/vagrant
sudo apt-get remove --purge git -y #like https://raw.githubusercontent.com/paul-nelson-baker/git-openssl-shellscript/main/compile-git-with-openssl.sh but simplified and tied to version 2.32.2
wget https://raw.githubusercontent.com/paul-nelson-baker/git-openssl-shellscript/main/compile-git-with-openssl.sh set -x
chmod 755 ./compile-git-with-openssl.sh BUILDDIR=${BUILDDIR:-$(mktemp -d)}
./compile-git-with-openssl.sh --skip-tests mkdir -p "${BUILDDIR}"
cd "${BUILDDIR}"
git_tarball_url="https://api.github.com/repos/git/git/tarball/refs/tags/v2.32.2"
curl -L --retry 5 "${git_tarball_url}" --output "git-source.tar.gz"
tar -xf "git-source.tar.gz" --strip 1
# Don't use gnutls, this is the problem package.
if sudo apt-get remove --purge libcurl4-gnutls-dev -y; then
# Using apt-get for these commands, they're not supported with the apt alias on 14.04 (but they may be on later systems)
sudo apt-get autoremove -y
sudo apt-get autoclean
fi
sudo apt-get install build-essential autoconf dh-autoreconf -y
sudo apt-get install libcurl4-openssl-dev tcl-dev gettext asciidoc libexpat1-dev libz-dev -y
make configure
./configure --prefix=/usr --with-openssl
make
# If you have an apt managed version of git, remove it
if sudo apt-get remove --purge git -y; then
sudo apt-get autoremove -y
sudo apt-get autoclean
fi
# Install the version we just built
sudo make install #install-doc install-html install-info
echo "Make sure to refresh your shell!"
bash -c 'echo "$(which git) ($(git --version))"'
#chmod 755 ./compile-git-with-openssl.sh
#./compile-git-with-openssl.sh --skip-tests
git config --global http.sslVerify false git config --global http.sslVerify false
cd -
cd /home/vagrant
#wgets #wgets
sudo wget "http://stedolan.github.io/jq/download/linux64/jq" -O "/usr/local/bin/jq" sudo wget "http://stedolan.github.io/jq/download/linux64/jq" -O "/usr/local/bin/jq"

2
meta-3dr/recipes-bsp/u-boot/u-boot-imx_2013.04.bbappend
View File

@ -1,5 +1,5 @@
SRC_URI = "git://github.com/OpenSolo/imx6-uboot/" SRC_URI = "git://github.com/OpenSolo/imx6-uboot/;protocol=http"
SRCREV = "solo_v1.0.0" SRCREV = "solo_v1.0.0"
# save UBOOT_CONFIG as separate names # save UBOOT_CONFIG as separate names

2
meta-3dr/recipes-kernel/linux/linux-imx_3.10.17.bb
View File

@ -8,7 +8,7 @@ DEPENDS += "lzop-native bc-native"
COMPATIBLE_MACHINE = "(mx6)" COMPATIBLE_MACHINE = "(mx6)"
SRCREV = "sololink_v1.3.0-5" SRCREV = "sololink_v1.3.0-5"
SRC_URI = "git://github.com/OpenSolo/imx6-linux/" SRC_URI = "git://github.com/OpenSolo/imx6-linux/;protocol=http"
SRC_URI += "\ SRC_URI += "\
https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/older/patch-3.10.17-rt12.patch.bz2;name=rt-patch1 \ https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/older/patch-3.10.17-rt12.patch.bz2;name=rt-patch1 \

2
meta-3dr/recipes-mavlink/dronekit/dronekit-solo_git.bb
View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://requirements.txt;md5=b6106de10adcc12b60d3cf95b9017b7f
PV = "1.2.0" PV = "1.2.0"
SRCREV = "1.2.0" SRCREV = "1.2.0"
SRC_URI = "git://github.com/dronekit/dronekit-python-solo/" SRC_URI = "git://github.com/dronekit/dronekit-python-solo/;protocol=http"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

2
meta-3dr/recipes-mavlink/dronekit/dronekit_git.bb
View File

@ -5,7 +5,7 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
SRCREV = "v2.4.0" SRCREV = "v2.4.0"
SRC_URI = "git://github.com/dronekit/dronekit-python" SRC_URI = "git://github.com/dronekit/dronekit-python;protocol=http"
PV = "2.4.0" PV = "2.4.0"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

2
meta-3dr/recipes-mavlink/mavlink/pymavlink.bb
View File

@ -5,7 +5,7 @@ LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://README.txt;md5=2fc3900b33c4131645987a81bfe6a55f" LIC_FILES_CHKSUM = "file://README.txt;md5=2fc3900b33c4131645987a81bfe6a55f"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
SRC_URI = "git://github.com/OpenSolo/mavlink-solo/" SRC_URI = "git://github.com/OpenSolo/mavlink-solo/;protocol=http"
PV = "${SRCPV}" PV = "${SRCPV}"
S = "${WORKDIR}/git/pymavlink" S = "${WORKDIR}/git/pymavlink"

2
meta-3dr/recipes-mavlink/mavproxy/mavproxy.bb
View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=3c34afdc3adf82d2448f12715a255122"
PV = "1.4.20-solo" PV = "1.4.20-solo"
SRCREV = "sololink_v1.1.17" SRCREV = "sololink_v1.1.17"
SRC_URI = "git://github.com/OpenSolo/MAVProxy/" SRC_URI = "git://github.com/OpenSolo/MAVProxy/;protocol=http"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

2
solo-builder/builder.sh
View File

@ -89,7 +89,7 @@ export MACHINE=imx6solo-3dr-1080p
EULA=1 source ./setup-environment build EULA=1 source ./setup-environment build
export_return=$? export_return=$?
if [ $export_return -eq 0 ]; then if [ $export_return -eq 0 ]; then
echo "Build environment ready" echo "Build environment ready, if u were expecting the build to happen, and it hasn't, edit builder.sh and try removing all the '> /dev/null' bits , and re-run, for more info"
elif [ $export_return -eq 2 ]; then elif [ $export_return -eq 2 ]; then
# Automatic restart as required # Automatic restart as required
echo "Restarting setup environment" echo "Restarting setup environment"

16
solo-builder/source_sync.sh
View File

@ -9,7 +9,7 @@ cd $build_dir
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/poky mkdir -p $source_dir/poky
git clone git://git.yoctoproject.org/poky $source_dir/poky 2>&1 | grep -v 'fatal' git clone https://git.yoctoproject.org/poky $source_dir/poky 2>&1 | grep -v 'fatal'
cd $source_dir/poky cd $source_dir/poky
git fetch git fetch
git checkout bee7e3756adf70edaeabe9d43166707aab84f581 git checkout bee7e3756adf70edaeabe9d43166707aab84f581
@ -19,14 +19,14 @@ cp -f /vagrant/solo-builder/gtk-doc-stub_git.bb $source_dir/poky/meta/recipes-gn
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-fsl-arm mkdir -p $source_dir/meta-fsl-arm
git clone git://git.yoctoproject.org/meta-fsl-arm $source_dir/meta-fsl-arm 2>&1 | grep -v 'fatal' git clone https://git.yoctoproject.org/meta-fsl-arm $source_dir/meta-fsl-arm 2>&1 | grep -v 'fatal'
cd $source_dir/meta-fsl-arm cd $source_dir/meta-fsl-arm
git fetch git fetch
git checkout af392c22bf6b563525ede4a81b6755ff1dd2c1c6 git checkout af392c22bf6b563525ede4a81b6755ff1dd2c1c6
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-openembedded mkdir -p $source_dir/meta-openembedded
git clone git://git.openembedded.org/meta-openembedded $source_dir/meta-openembedded 2>&1 | grep -v 'fatal' git clone https://git.openembedded.org/meta-openembedded $source_dir/meta-openembedded 2>&1 | grep -v 'fatal'
cd $source_dir/meta-openembedded cd $source_dir/meta-openembedded
git fetch git fetch
git checkout eb4563b83be0a57ede4269ab19688af6baa62cd2 git checkout eb4563b83be0a57ede4269ab19688af6baa62cd2
@ -43,29 +43,29 @@ rsync -r /vagrant/meta-3dr/ $source_dir/meta-3dr --delete
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-fsl-arm-extra mkdir -p $source_dir/meta-fsl-arm-extra
git clone git://github.com/Freescale/meta-fsl-arm-extra $source_dir/meta-fsl-arm-extra 2>&1 | grep -v 'fatal' git clone https://github.com/Freescale/meta-fsl-arm-extra $source_dir/meta-fsl-arm-extra 2>&1 | grep -v 'fatal'
cd $source_dir/meta-fsl-arm-extra cd $source_dir/meta-fsl-arm-extra
git fetch git fetch
git checkout 07ad83db0fb67c5023bd627a61efb7f474c52622 git checkout 07ad83db0fb67c5023bd627a61efb7f474c52622
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-fsl-demos mkdir -p $source_dir/meta-fsl-demos
git clone git://github.com/Freescale/meta-fsl-demos $source_dir/meta-fsl-demos 2>&1 | grep -v 'fatal' git clone https://github.com/Freescale/meta-fsl-demos $source_dir/meta-fsl-demos 2>&1 | grep -v 'fatal'
cd $source_dir/meta-fsl-demos cd $source_dir/meta-fsl-demos
git fetch git fetch
git checkout 5a12677ad000a926d23c444266722a778ea228a7 git checkout 5a12677ad000a926d23c444266722a778ea228a7
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-browser mkdir -p $source_dir/meta-browser
git clone git://github.com/OSSystems/meta-browser $source_dir/meta-browser 2>&1 | grep -v 'fatal' git clone https://github.com/OSSystems/meta-browser $source_dir/meta-browser 2>&1 | grep -v 'fatal'
cd $source_dir/meta-browser cd $source_dir/meta-browser
git fetch git fetch
git checkout fc3969f63bda343c38c40a23f746c560c4735f3e git checkout fc3969f63bda343c38c40a23f746c560c4735f3e
echo "----------------------------------------------------------------------------" echo "----------------------------------------------------------------------------"
mkdir -p $source_dir/meta-fsl-bsp-release mkdir -p $source_dir/meta-fsl-bsp-release
#git clone git://git.freescale.com/imx/meta-fsl-bsp-release $source_dir/meta-fsl-bsp-release 2>&1 | grep -v 'fatal' #git clone https://git.freescale.com/imx/meta-fsl-bsp-release $source_dir/meta-fsl-bsp-release 2>&1 | grep -v 'fatal'
git clone git://github.com/opensolo/meta-fsl-bsp-release $source_dir/meta-fsl-bsp-release 2>&1 | grep -v 'fatal' git clone https://github.com/opensolo/meta-fsl-bsp-release $source_dir/meta-fsl-bsp-release 2>&1 | grep -v 'fatal'
cd $source_dir/meta-fsl-bsp-release cd $source_dir/meta-fsl-bsp-release
git fetch git fetch
git checkout dora_3.10.17-1.0.0_GA git checkout dora_3.10.17-1.0.0_GA