Skip to content

Commit e5ce860

Browse files
committed
Sync with arm32 branch
1 parent 26dc4f7 commit e5ce860

File tree

5 files changed

+33
-58
lines changed

5 files changed

+33
-58
lines changed

stage2/00-configure-apt/00-run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash -e
22

3-
#echo "adding repo for edgetpu"
4-
#echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > "${ROOTFS_DIR}/etc/apt/sources.list.d/coral-edgetpu.list"
3+
echo "adding repo for edgetpu"
4+
echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > "${ROOTFS_DIR}/etc/apt/sources.list.d/coral-edgetpu.list"
55

6-
#cp files/edgetpu.gpg "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/coral-edgetpu.gpg"
7-
#on_chroot << EOF
8-
#apt-get update
9-
#apt-get dist-upgrade -y
10-
#EOF
6+
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | on_chroot apt-key add -
7+
on_chroot << EOF
8+
apt-get update
9+
apt-get dist-upgrade -y
10+
EOF
-1.93 KB
Binary file not shown.

stage3/01-sys-tweaks/00-packages

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ python3-distutils
77
python3-jinja2
88
python3-numpy
99
python3-pip
10+
python3-pycoral
11+
libedgetpu1-std
12+
libedgetpu-dev
1013
libtbb-dev
1114
libtbb2
1215
libusb-1.0-0-dev

stage3/01-sys-tweaks/01-run.sh

+23-24
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ sed -i -e 's/javac sourcepath/javac target="1.8" source="1.8" sourcepath/' modul
9696
# disable extraneous data warnings; these are common with USB cameras
9797
sed -i -e '/JWRN_EXTRANEOUS_DATA/d' 3rdparty/libjpeg/jdmarker.c
9898
sed -i -e '/JWRN_EXTRANEOUS_DATA/d' 3rdparty/libjpeg-turbo/src/jdmarker.c
99-
#patch -p0 < "${SUB_STAGE_DIR}/files/opencv.patch"
10099
popd
101100

102101
# allwpilib
@@ -107,33 +106,33 @@ pushd allwpilib
107106
popd
108107

109108
# robotpy-build
110-
tar xzf "${DOWNLOAD_DIR}/robotpy-build.tar.gz"
111-
mv robotpy-build-* robotpy-build
109+
#tar xzf "${DOWNLOAD_DIR}/robotpy-build.tar.gz"
110+
#mv robotpy-build-* robotpy-build
112111

113112
# pybind11
114-
tar xzf "${DOWNLOAD_DIR}/pybind11.tar.gz"
115-
rmdir robotpy-build/robotpy_build/pybind11
116-
mv pybind11-* robotpy-build/robotpy_build/pybind11
113+
#tar xzf "${DOWNLOAD_DIR}/pybind11.tar.gz"
114+
#rmdir robotpy-build/robotpy_build/pybind11
115+
#mv pybind11-* robotpy-build/robotpy_build/pybind11
117116

118117
# robotpy-wpiutil
119-
tar xzf "${DOWNLOAD_DIR}/robotpy-wpiutil.tar.gz"
120-
mv robotpy-wpiutil-* robotpy-wpiutil
121-
echo "__version__ = '2023.1.1.0'" > robotpy-wpiutil/wpiutil/version.py
118+
#tar xzf "${DOWNLOAD_DIR}/robotpy-wpiutil.tar.gz"
119+
#mv robotpy-wpiutil-* robotpy-wpiutil
120+
#echo "__version__ = '2023.1.1.0'" > robotpy-wpiutil/wpiutil/version.py
122121

123122
# robotpy-wpinet
124-
tar xzf "${DOWNLOAD_DIR}/robotpy-wpinet.tar.gz"
125-
mv robotpy-wpinet-* robotpy-wpinet
126-
echo "__version__ = '2023.1.1.0'" > robotpy-wpinet/wpinet/version.py
123+
#tar xzf "${DOWNLOAD_DIR}/robotpy-wpinet.tar.gz"
124+
#mv robotpy-wpinet-* robotpy-wpinet
125+
#echo "__version__ = '2023.1.1.0'" > robotpy-wpinet/wpinet/version.py
127126

128127
# pyntcore
129-
tar xzf "${DOWNLOAD_DIR}/pyntcore.tar.gz"
130-
mv pyntcore-* pyntcore
131-
echo "__version__ = '2023.1.1.0'" > pyntcore/ntcore/version.py
128+
#tar xzf "${DOWNLOAD_DIR}/pyntcore.tar.gz"
129+
#mv pyntcore-* pyntcore
130+
#echo "__version__ = '2023.1.1.0'" > pyntcore/ntcore/version.py
132131

133132
# robotpy-cscore
134-
tar xzf "${DOWNLOAD_DIR}/robotpy-cscore.tar.gz"
135-
mv robotpy-cscore-* robotpy-cscore
136-
echo "__version__ = '2023.1.1.0'" > robotpy-cscore/cscore/version.py
133+
#tar xzf "${DOWNLOAD_DIR}/robotpy-cscore.tar.gz"
134+
#mv robotpy-cscore-* robotpy-cscore
135+
#echo "__version__ = '2023.1.1.0'" > robotpy-cscore/cscore/version.py
137136

138137
# pixy2
139138
tar xzf "${DOWNLOAD_DIR}/pixy2.tar.gz"
@@ -365,12 +364,12 @@ sed -i -e 's, -L/pi-gen[^ ]*,,g' "${ROOTFS_DIR}/usr/local/frc-static/lib/pkgconf
365364
popd
366365

367366
on_chroot << EOF
368-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpiutil-2023.2.1.0-cp39-cp39-linux_aarch64.whl
369-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpinet-2023.2.1.0-cp39-cp39-linux_aarch64.whl
370-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/pyntcore-2023.2.1.1-cp39-cp39-linux_aarch64.whl
371-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_cscore-2023.2.1.0-cp39-cp39-linux_aarch64.whl
372-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpimath-2023.2.1.0-cp39-cp39-linux_aarch64.whl
373-
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_apriltag-2023.2.1.0-cp39-cp39-linux_aarch64.whl
367+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpiutil-2023.2.1.1-cp39-cp39-linux_aarch64.whl
368+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpinet-2023.2.1.1-cp39-cp39-linux_aarch64.whl
369+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/pyntcore-2023.2.1.3-cp39-cp39-linux_aarch64.whl
370+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_cscore-2023.2.1.1-cp39-cp39-linux_aarch64.whl
371+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_wpimath-2023.2.1.1-cp39-cp39-linux_aarch64.whl
372+
pip3 install https://www.tortall.net/~robotpy/wheels/2023/raspbian/robotpy_apriltag-2023.2.1.1-cp39-cp39-linux_aarch64.whl
374373
EOF
375374

376375

stage3/01-sys-tweaks/files/opencv.patch

-27
This file was deleted.

0 commit comments

Comments
 (0)