Skip to content
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.

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

Ubuntu18.04 armv8 のビルドを削除 #81

Merged
merged 1 commit into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ jobs:
runs-on: ubuntu-20.04
- name: raspberry-pi-os_armv8
runs-on: ubuntu-20.04
- name: ubuntu-18.04_armv8
runs-on: ubuntu-20.04
- name: ubuntu-20.04_armv8
runs-on: ubuntu-20.04
- name: ubuntu-22.04_armv8
Expand Down Expand Up @@ -206,9 +204,6 @@ jobs:
- uses: ./.github/actions/download
with:
platform: raspberry-pi-os_armv8
- uses: ./.github/actions/download
with:
platform: ubuntu-18.04_armv8
- uses: ./.github/actions/download
with:
platform: ubuntu-20.04_armv8
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
VERSION ファイルを上げただけの場合は変更履歴記録は不要。
パッチやビルドの変更のみ記録すること。

## 2024-09-20

- [CHANGE] Ubuntu18.04 armv8 のビルドを削除
- @torikizi

## 2024-09-19

- [ADD] Ubuntu 24.04 armv8 に対応
Expand Down
3 changes: 2 additions & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@ webrtc-build/
- macOS の場合は `macos_x86_64`, `macos_arm64`, `ios` ターゲットのみビルド可能。
- Ubuntu の x86_64 環境の場合、上記以外のターゲットのみビルド可能。
- `android`, `raspberry-pi-os_armv*`, `ubuntu-*_armv8` あたりの ARM 環境は Ubuntu のバージョンに関係なくビルド可能
- `ubuntu-18.04_x86_64` の場合は Ubuntu 18.04 が必要
- `ubuntu-20.04_x86_64` の場合は Ubuntu 20.04 が必要
- `ubuntu-22.04_x86_64` の場合は Ubuntu 22.04 が必要
- `ubuntu-24.04_x86_64` の場合は Ubuntu 24.04 が必要
- Ubuntu の x86_64 でない環境ではビルド不可能。
- Ubuntu 以外の Linux 系 OS ではビルド不可能。

Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
- raspberry-pi-os_armv6 (Raspberry Pi Zero, 1)
- raspberry-pi-os_armv7 (Raspberry Pi 2, 3, 4)
- raspberry-pi-os_armv8 (Raspberry Pi Zero 2, 3, 4)
- ubuntu-18.04_armv8
- Jetson Nano
- Jetson Xavier NX
- Jetson AGX Xavier
- ubuntu-20.04_armv8
- Jetson Xavier NX
- Jetson AGX Xavier
Expand Down Expand Up @@ -67,7 +63,7 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
- Ubuntu 18.04 x86_64 廃止
- 2022 年 6 月を持って廃止しました
- Jetson 向け ARM 版 Ubuntu 18.04 廃止
- 2023 年 4 月を持って廃止します
- 2023 年 4 月を持って廃止しました

## H.264 (AVC) と H.265 (HEVC) のライセンスについて

Expand Down
18 changes: 0 additions & 18 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,15 +288,6 @@ def get_depot_tools(source_dir, fetch=False):
"h265.patch",
"fix_perfetto.patch",
],
"ubuntu-18.04_armv8": [
"add_deps.patch",
"4k.patch",
"revive_proxy.patch",
"add_license_dav1d.patch",
"ssl_verify_callback_with_native_handle.patch",
"h265.patch",
"fix_perfetto.patch",
],
"ubuntu-20.04_armv8": [
"add_deps.patch",
"4k.patch",
Expand Down Expand Up @@ -560,11 +551,6 @@ def archive_objects(ar, dir, output):
arch="arm64",
triplet="aarch64-linux-gnu",
),
"ubuntu-18.04_armv8": MultistrapConfig(
config_file=["multistrap", "ubuntu-18.04_armv8.conf"],
arch="arm64",
triplet="aarch64-linux-gnu",
),
"ubuntu-20.04_armv8": MultistrapConfig(
config_file=["multistrap", "ubuntu-20.04_armv8.conf"],
arch="arm64",
Expand Down Expand Up @@ -966,15 +952,13 @@ def build_webrtc(
"raspberry-pi-os_armv6",
"raspberry-pi-os_armv7",
"raspberry-pi-os_armv8",
"ubuntu-18.04_armv8",
"ubuntu-20.04_armv8",
"ubuntu-22.04_armv8",
"ubuntu-24.04_armv8",
):
sysroot = os.path.join(source_dir, "rootfs")
arm64_set = (
"raspberry-pi-os_armv8",
"ubuntu-18.04_armv8",
"ubuntu-20.04_armv8",
"ubuntu-22.04_armv8",
"ubuntu-24.04_armv8",
Expand Down Expand Up @@ -1290,7 +1274,6 @@ def package_webrtc(
"ubuntu-20.04_x86_64",
"ubuntu-22.04_x86_64",
"ubuntu-24.04_x86_64",
"ubuntu-18.04_armv8",
"ubuntu-20.04_armv8",
"ubuntu-22.04_armv8",
"ubuntu-24.04_armv8",
Expand Down Expand Up @@ -1326,7 +1309,6 @@ def check_target(target):

# クロスコンパイルなので Ubuntu だったら任意のバージョンでビルド可能(なはず)
if target in (
"ubuntu-18.04_armv8",
"ubuntu-20.04_armv8",
"ubuntu-22.04_armv8",
"ubuntu-24.04_armv8",
Expand Down