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
CodeChenL 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 2 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
5 changes: 3 additions & 2 deletions .github/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM debian:bullseye
FROM debian:bookworm

RUN dpkg --add-architecture arm64 && \
apt-get update && \
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 python3-dev:arm64 libjson-c-dev:arm64 libstdc++6:arm64 && \
ln -s /usr/bin/python3 /usr/bin/python && \
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.

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

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.

为什么不直接用python-is-python3

https://github.com/radxa-pkg/mraa/pull/2/files#r1746676203

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？依赖冲突是怎么回事

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. 

[0 ~/Documents/GitHub/mraa]$ .github/container/build-deb 
STEP 1/2: FROM debian:bookworm
STEP 2/2: RUN dpkg --add-architecture arm64 &&     apt-get update &&     apt-get full-upgrade --no-install-recommends -y         build-essential crossbuild-essential-arm64 default-jdk-headless git         cmake debhelper devscripts lintian swig pkgconf:arm64 python-is-python3 python3-dev:arm64 libjson-c-dev:arm64 libstdc++6:arm64 &&     ln -s /usr/bin/python3 /usr/bin/python &&     adduser --gecos runner --disabled-password runner &&     rm -rf /var/lib/apt/lists/*
Get:1 http://deb.debian.org/debian bookworm InRelease [151 kB]
Get:2 http://deb.debian.org/debian bookworm-updates InRelease [55.4 kB]
Get:3 http://deb.debian.org/debian-security bookworm-security InRelease [48.0 kB]
Get:4 http://deb.debian.org/debian bookworm/main amd64 Packages [8787 kB]
Get:5 http://deb.debian.org/debian bookworm/main arm64 Packages [8689 kB]
Get:6 http://deb.debian.org/debian bookworm-updates/main amd64 Packages [13.8 kB]
Get:7 http://deb.debian.org/debian bookworm-updates/main arm64 Packages [13.7 kB]
Get:8 http://deb.debian.org/debian-security bookworm-security/main arm64 Packages [176 kB]
Get:9 http://deb.debian.org/debian-security bookworm-security/main amd64 Packages [179 kB]
Fetched 18.1 MB in 3s (6206 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 python3-dev:arm64 : Depends: python3:arm64 (= 3.11.2-1+b1) but it is not installable
 python3.11-dev:arm64 : Depends: python3.11:arm64 (= 3.11.2-6+deb12u3) but it is not installable
E: Unable to correct problems, you have held broken packages.
Error: building at STEP "RUN dpkg --add-architecture arm64 &&     apt-get update &&     apt-get full-upgrade --no-install-recommends -y         build-essential crossbuild-essential-arm64 default-jdk-headless git         cmake debhelper devscripts lintian swig pkgconf:arm64 python-is-python3 python3-dev:arm64 libjson-c-dev:arm64 libstdc++6:arm64 &&     ln -s /usr/bin/python3 /usr/bin/python &&     adduser --gecos runner --disabled-password runner &&     rm -rf /var/lib/apt/lists/*": while running runtime: exit status 100
[chen@ChenArchLinux 18:39]
[100 ~/Documents/GitHub/mraa]$

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.

参照zfs提供fake dependency试试？

adduser --gecos runner --disabled-password runner && \
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dch: debian/changelog
EDITOR=true gbp dch --commit --debian-branch=master --release --dch-opt=--upstream

.PHONY: deb
deb: debian
deb: debian SOURCE
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.

这是从哪来的改动

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.

需要先make all在能make deb，这正常吗，正常的话就不改了

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.

这个算是正常的，只是我们平常的包的Makefile是在根目录下，debuild会自动make all。现在mraa自己有一个，就不会自动调用我们的make all了

debuild --no-lintian --lintian-hook "lintian --fail-on error,warning --suppress-tags bad-distribution-in-changes-file -- %p_%v_*.changes" --no-sign -b -aarm64 -Pcross

.PHONY: release
Expand Down
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.11/dist-packages/* usr/lib/python3/dist-packages/