Skip to content

chore: upgrade system version of build container #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

chore: upgrade system version of build container #2

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
085d492
chore: upgrade system version of build container
CodeChenL Sep 6, 2024
9ad951c
feat: add CODEOWNERS
CodeChenL Sep 6, 2024
c38414e
fix: install python3-mraa using wildcard
CodeChenL Sep 6, 2024
0884058
fix: change by reviewer
CodeChenL Sep 6, 2024
2b9a52b
fix: uninstall python-is-python3
CodeChenL Sep 10, 2024
505299b
fix: determining major version when finding PythonInterp
CodeChenL Sep 10, 2024
a82907b
fix: remove equivs-dummy.equivs
CodeChenL Sep 10, 2024
28088ef
feat: add FindPython support
CodeChenL Sep 11, 2024
596e4e5
fix: apply suggestions from code review
CodeChenL Sep 11, 2024
cbcd0eb
fix: apply suggestions from code review
CodeChenL Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @RadxaYuntian
9 changes: 7 additions & 2 deletions .github/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
FROM debian:bullseye
FROM debian:bookworm

COPY equivs-dummy.equivs /tmp/equivs-dummy.equivs

RUN dpkg --add-architecture arm64 && \
apt-get update && \
apt-get full-upgrade --no-install-recommends -y equivs && \
equivs-build /tmp/equivs-dummy.equivs && \
apt-get full-upgrade --no-install-recommends -y \
build-essential crossbuild-essential-arm64 default-jdk-headless git \
cmake debhelper devscripts lintian swig pkgconf:arm64 python3-dev:arm64 libjson-c-dev:arm64 && \
cmake debhelper devscripts lintian swig pkgconf:arm64 python-is-python3 \
Copy link
Member

@RadxaYuntian RadxaYuntian Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其实为什么要安装python-is-python3，我们之前没有安装也生成了py3包吧？

Copy link
Author

@CodeChenL CodeChenL Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有一个测试脚本的shebang指定的/usr/bin/python，不安装python-is-python3报错command not found

Copy link
Author

@CodeChenL CodeChenL Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mraa/tests/check_clean.py

Line 1 in b1597cf

#!/usr/bin/python

Copy link
Member

@RadxaYuntian RadxaYuntian Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

给mraa提pr把这些python都显式改成python3吧。这个他们之前有改过一部分

Copy link
Member

@RadxaYuntian RadxaYuntian Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外我们debian 11的container难道内置了python2？

Copy link
Author

@CodeChenL CodeChenL Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看了一下bullseye在config阶段检查不到python2，

-- Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE) (Required is at least version "2.7")
-- Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE) (Required is at least version "2.7")
-- Found PythonInterp: /usr/bin/python3 (found suitable version "3.9.2", minimum required is "3") 
-- Found PythonLibs: /usr/lib/aarch64-linux-gnu/libpython3.9.so (found suitable exact version "3.9.2")

bookworm在config阶段把python3误检测为python2
所以bullseye不会运行这个test脚本，bookworm会

mraa/tests/CMakeLists.txt

Line 1 in b1597cf

if (PYTHON2INTERP_FOUND AND BUILDSWIGJAVA)

Copy link
Member

@RadxaYuntian RadxaYuntian Sep 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你在这个pr里面改一下看看。如果没问题可以先分一个PR给上游

python3-dev:arm64 libjson-c-dev:arm64 libstdc++6:arm64 /equivs-dummy_1.0_all.deb && \
adduser --gecos runner --disabled-password runner && \
rm -rf /var/lib/apt/lists/*
1 change: 1 addition & 0 deletions .github/container/equivs-dummy.equivs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Provides: python3:amd64 (= 3.11)
2 changes: 1 addition & 1 deletion debian/python3-mraa.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
usr/lib/python3.9/dist-packages/* usr/lib/python3/dist-packages/
usr/lib/python3*/dist-packages/* usr/lib/python3/dist-packages/