Skip to content

Commit

Permalink
JetPack を 6.0 にあげる
Browse files Browse the repository at this point in the history
  • Loading branch information
enm10k committed May 1, 2024
1 parent d521321 commit 152fae5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ elseif (SORA_TARGET STREQUAL "ubuntu-20.04_armv8_jetson")
set(SORA_TARGET_OS "jetson")
set(SORA_TARGET_ARCH "armv8")
set(SORA_TARGET_DEF "SORA_CPP_SDK_JETSON")
elseif (SORA_TARGET STREQUAL "ubuntu-22.04_armv8_jetson")
set(SORA_TARGET_OS "jetson")
set(SORA_TARGET_ARCH "armv8")
set(SORA_TARGET_DEF "SORA_CPP_SDK_JETSON")
endif()

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
Expand Down
4 changes: 2 additions & 2 deletions buildbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ def package_name(self):
if self.os == "raspberry-pi-os":
return f"raspberry-pi-os_{self.arch}"
if self.os == "jetson":
return "ubuntu-20.04_armv8_jetson"
return f"ubuntu-{self.osver}_armv8_jetson"
raise Exception("error")


Expand Down Expand Up @@ -1485,7 +1485,7 @@ def get_webrtc_platform(platform: Platform) -> str:
elif platform.target.os == "raspberry-pi-os":
return f"raspberry-pi-os_{platform.target.arch}"
elif platform.target.os == "jetson":
return "ubuntu-20.04_armv8"
return f"ubuntu-{platform.target.osver}_armv8"
else:
raise Exception(f"Unknown platform {platform.target.os}")

Expand Down
24 changes: 24 additions & 0 deletions multistrap/ubuntu-22.04_armv8_jetson.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[General]
noauth=true
unpack=true
bootstrap=Ports Jetson T234
aptsources=Ports Jetson T234

[Ports]
# packages=apt sudo libstdc++-10-dev libc6-dev
packages=apt libstdc++-10-dev libc6-dev
source=http://ports.ubuntu.com
suite=jammy
components=main universe

[Jetson]
packages=nvidia-jetpack
source=https://repo.download.nvidia.com/jetson/common
suite=r36.2
components=main

[T234]
packages=nvidia-l4t-camera nvidia-l4t-multimedia
source=https://repo.download.nvidia.com/jetson/t234
suite=r36.2
components=main
3 changes: 2 additions & 1 deletion run.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ def install_deps(
"ubuntu-20.04_x86_64",
"ubuntu-22.04_x86_64",
"ubuntu-20.04_armv8_jetson",
"ubuntu-22.04_armv8_jetson",
"ios",
"android",
]
Expand Down Expand Up @@ -558,7 +559,7 @@ def main():
platform = Platform("ubuntu", "20.04", "x86_64")
elif args.target == "ubuntu-22.04_x86_64":
platform = Platform("ubuntu", "22.04", "x86_64")
elif args.target == "ubuntu-20.04_armv8_jetson":
elif args.target in ("ubuntu-20.04_armv8_jetson", "ubuntu-22.04_armv8_jetson"):
platform = Platform("jetson", None, "armv8")
elif args.target == "ios":
platform = Platform("ios", None, None)
Expand Down

0 comments on commit 152fae5

Please sign in to comment.