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

Upgrade to latest master (walnascar) #20

Merged
merged 6 commits into from
Jan 10, 2025
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
26 changes: 18 additions & 8 deletions kas/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ local_conf_header:
CONF_VERSION = "2"
EXTRA_IMAGE_FEATURES += "allow-empty-password"
CLANGSDK = "1"
ROOT_HOME = "/root"

repos:
meta-nao:
layers:
meta:
poky:
url: "https://git.yoctoproject.org/git/poky"
commit: ae6cebca5bac9521230c69fed23b375d0de7f5f6
commit: 65de362ce818438ad60893f400a3c6d3915619d8
layers:
meta:
meta-poky:
Expand All @@ -26,28 +27,37 @@ repos:
0003-specify-custom-dynamic-linker:
repo: "meta-nao"
path: "patches/0003-bindgen-clang-sysroot.patch"
0004-compress-sdk-with-zstd:
0006-cargo-config-is-deprecated:
repo: "meta-nao"
path: "patches/0004-compress-sdk-with-zstd.patch"
path: "patches/0006-cargo-config-is-deprecated.patch"
meta-congatec-x86:
url: "https://git.congatec.com/x86/meta-congatec-x86.git"
commit: 1867244888ed0a5ad85f5b4ab789e1d0201deb02
patches:
0001-congatec-scarthgap-support:
0001-congatec-walnascar-support:
repo: "meta-nao"
path: "patches/0001-congatec-scarthgap-support.patch"
path: "patches/0001-congatec-walnascar-support.patch"
0002-congatec-new-override-syntax:
repo: "meta-nao"
path: "patches/0002-congatec-new-override-syntax.patch"
0004-congatec-no-s-workspace.patch:
repo: "meta-nao"
path: "patches/0004-congatec-no-s-workspace.patch"
0005-congatec-upstream-status.patch:
repo: "meta-nao"
path: "patches/0005-congatec-upstream-status.patch"
meta-clang:
url: "https://github.com/kraj/meta-clang.git"
commit: e7dceb1c92caf7f21ef1d7b49c85328c30cffd90
commit: 03f578578be34734aed9b03d33fa031add5c9bf5
meta-intel:
url: "https://git.yoctoproject.org/git/meta-intel"
commit: c8cd0317ec19332bce86697f3413a82b9828b329
commit: b0fe7e45ab711e2ffbe996f3737dd63b2e273676
meta-openvino:
url: "https://github.com/intel/meta-openvino"
commit: bd05014ef7f4a156f61f64ad40c9ffb282d32558
meta-openembedded:
url: "https://git.openembedded.org/meta-openembedded"
commit: 4a7bb77f7ebe0ac8be5bab5103d8bd993e17e18d
commit: d29b3f2b102678926fb35d205889d0aee2304114
layers:
meta-oe:
meta-multimedia:
Expand Down
2 changes: 1 addition & 1 deletion meta-hulks/conf/distro/HULKs-OS.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ SUMMARY = "HULKs flavoured Nao"

DISTRO = "HULKs-OS"
DISTRO_NAME = "HULKs-OS"
DISTRO_VERSION = "7.5.9"
DISTRO_VERSION = "7.6.0"
SDKIMAGE_FEATURES:remove = "dbg-pkgs src-pkgs"
2 changes: 1 addition & 1 deletion meta-hulks/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"

LAYERSERIES_COMPAT_hulks = "scarthgap"
LAYERSERIES_COMPAT_hulks = "walnascar"

BBFILE_COLLECTIONS += "hulks"
BBFILE_PATTERN_hulks = "^${LAYERDIR}/"
Expand Down
2 changes: 0 additions & 2 deletions meta-hulks/recipes-core/images/nao-image.bbappend
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

SDK_ZSTD_COMPRESSION_LEVEL = "-9"

CORE_IMAGE_EXTRA_INSTALL += "\
aliveness \
breeze \
Expand Down
4 changes: 2 additions & 2 deletions meta-hulks/recipes-hulks/aliveness/aliveness.bb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ inherit systemd

do_install:append () {
install -d "${D}${systemd_unitdir}/system"
install -m 0644 "${WORKDIR}/aliveness.service" "${D}${systemd_unitdir}/system/"
install -m 0644 "${WORKDIR}/enp4s0-wait-online.service" "${D}${systemd_unitdir}/system/"
install -m 0644 "${UNPACKDIR}/aliveness.service" "${D}${systemd_unitdir}/system/"
install -m 0644 "${UNPACKDIR}/enp4s0-wait-online.service" "${D}${systemd_unitdir}/system/"
}

require aliveness-crates.inc
2 changes: 1 addition & 1 deletion meta-hulks/recipes-hulks/breeze/breeze.bb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inherit systemd
export BINDGEN_EXTRA_CLANG_ARGS="-I ${STAGING_INCDIR}"
do_install:append() {
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/breeze.service ${D}${systemd_unitdir}/system/
install -m 0644 ${UNPACKDIR}/breeze.service ${D}${systemd_unitdir}/system/
}

require breeze-crates.inc
4 changes: 2 additions & 2 deletions meta-hulks/recipes-hulks/hula/hula.bb
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ inherit systemd

do_install:append() {
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/hula.service ${D}${systemd_unitdir}/system/
install -m 0644 ${UNPACKDIR}/hula.service ${D}${systemd_unitdir}/system/
install -d ${D}${datadir}/dbus-1/system.d/
install -m 0644 ${WORKDIR}/org.hulks.hula.conf ${D}${datadir}/dbus-1/system.d/
install -m 0644 ${UNPACKDIR}/org.hulks.hula.conf ${D}${datadir}/dbus-1/system.d/
}

FILES:${PN} += "${datadir}/dbus-1/system.d/org.hulks.hula.conf"
Expand Down
11 changes: 7 additions & 4 deletions meta-hulks/recipes-hulks/hulk/hulk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ SRC_URI = "\
file://hulk \
"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

SYSTEMD_SERVICE:${PN} = "hulk.service hulk-gdbserver.service"

inherit systemd

do_install() {
install -d ${D}${bindir}
install -m 755 ${WORKDIR}/launchHULK ${D}${bindir}
install -m 755 ${WORKDIR}/hulk ${D}${bindir}
install -m 755 ${S}/launchHULK ${D}${bindir}
install -m 755 ${S}/hulk ${D}${bindir}

install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/hulk.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/hulk-gdbserver.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/hulk.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/hulk-gdbserver.service ${D}${systemd_unitdir}/system/
}

FILES:${PN} = " \
Expand Down
13 changes: 8 additions & 5 deletions meta-hulks/recipes-hulks/network-config/network-config.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ SRC_URI = "\
file://network-fallback-notification.service \
"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

do_install() {
install -d ${D}${sbindir}/
install -m 0755 ${WORKDIR}/configure_network ${D}${sbindir}/
install -m 0755 ${S}/configure_network ${D}${sbindir}/
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/network-config.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/network-fallback-notification.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/network-config.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/network-fallback-notification.service ${D}${systemd_unitdir}/system/
install -d ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_HULKs.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_HULKs.psk ${D}/var/lib/iwd/
install -d ${D}/${datadir}/network-config/
install -m 0600 ${WORKDIR}/fallback_notification.wav ${D}/${datadir}/network-config/
install -m 0600 ${S}/fallback_notification.wav ${D}/${datadir}/network-config/
}

FILES:${PN} = " \
Expand Down
3 changes: 1 addition & 2 deletions meta/conf/distro/nao-core-minimal.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt"
PREFERRED_PROVIDER_cgos-mod = "linux-intel-rt"
KERNEL_MODULE_AUTOLOAD:append = " cgosdrv"

TCLIBCAPPEND = ""

PACKAGE_CLASSES ?= "package_ipk"

require conf/distro/include/no-static-libs.inc
require conf/distro/include/yocto-space-optimize.inc

BB_SIGNATURE_HANDLER ?= "OEEquivHash"
BB_HASHSERVE ??= "auto"
Expand Down
2 changes: 1 addition & 1 deletion meta/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"

LAYERSERIES_COMPAT_nao = "scarthgap"
LAYERSERIES_COMPAT_nao = "walnascar"

BBFILE_COLLECTIONS += "nao"
BBFILE_PATTERN_nao = "^${LAYERDIR}/"
Expand Down
18 changes: 11 additions & 7 deletions meta/recipes-conf/nao-wifi-conf/nao-wifi-conf.bb
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,23 @@ SRC_URI = "\
file://SPL_E.psk \
file://SPL_F.psk \
"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

RDEPENDS:${PN} = "iwd"

do_install() {
install -d ${D}${sysconfdir}/iwd/
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/iwd/
install -m 0644 ${S}/main.conf ${D}${sysconfdir}/iwd/

install -d ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_A.psk ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_B.psk ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_C.psk ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_D.psk ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_E.psk ${D}/var/lib/iwd/
install -m 0600 ${WORKDIR}/SPL_F.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_A.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_B.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_C.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_D.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_E.psk ${D}/var/lib/iwd/
install -m 0600 ${S}/SPL_F.psk ${D}/var/lib/iwd/
}

FILES:${PN} = "\
Expand Down
7 changes: 5 additions & 2 deletions meta/recipes-conf/user-home/nao-home.bb
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@ SRC_URI = "\
file://nao.rules \
"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

RDEPENDS:${PN} += "polkit"

inherit useradd

do_install:append() {
# Enable robocupper mode
install -o nao -g nao -d ${D}/home/nao/
install -o nao -g nao -m 0644 ${WORKDIR}/robocup.conf ${D}/home/nao/
install -o nao -g nao -m 0644 ${S}/robocup.conf ${D}/home/nao/

# Install nao rules for polkit
install -d ${D}${datadir}/polkit-1/rules.d/
install ${WORKDIR}/nao.rules ${D}${datadir}/polkit-1/rules.d
install ${S}/nao.rules ${D}${datadir}/polkit-1/rules.d
}

USERADD_PACKAGES = "${PN}"
Expand Down
2 changes: 1 addition & 1 deletion meta/recipes-core/base-files/base-files_%.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ do_install:append() {
install -d ${D}/media/internal

install -d ${D}${sysconfdir}/profile.d/
install -m 0644 ${WORKDIR}/sbin_path.sh ${D}${sysconfdir}/profile.d/
install -m 0644 ${UNPACKDIR}/sbin_path.sh ${D}${sysconfdir}/profile.d/
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ From 165a4bcc4c62e984fe0ae7213298140a55ef5b9b Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian@schmidt.so>
Date: Tue, 12 Mar 2024 10:54:44 +0000
Subject: [PATCH] NAO adjustments (in part by SoftBank and Congatec)
Upstream-Status: Pending

---
arch/x86/mm/ioremap.c | 3 +-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ From 2a7f46283db624091165a0383882c44f578d645b Mon Sep 17 00:00:00 2001
From: Kas User <kas@example.com>
Date: Tue, 15 Nov 2022 19:33:29 +0000
Subject: [PATCH] CGOS 32-bit
Upstream-Status: Pending

---
drivers/cgosdrv/DrvLx.c | 63 ++++++++++++++++++++++++++++++++++-------
Expand Down
2 changes: 1 addition & 1 deletion meta/recipes-kernel/linux/linux-intel-rt_%.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RPROVIDES:${KERNEL_PACKAGE_NAME} += "cgos-mod"
do_install:append() {
ln -s bzImage-${KERNEL_VERSION_NAME} ${D}/boot/vmlinuz.efi
ln -s vmlinuz.efi ${D}/boot/vmlinuz
install -m 0644 ${WORKDIR}/cmdline ${D}/boot/cmdline
install -m 0644 ${UNPACKDIR}/cmdline ${D}/boot/cmdline
}

FILES:${KERNEL_PACKAGE_NAME} += "\
Expand Down
19 changes: 11 additions & 8 deletions meta/recipes-support/aldebaran/aldebaran-binaries.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec

SRC_URI = "file://aldebaran_binaries.tar.gz;sha256sum=02848f1b604c3afc7d52b4f01bc83434250709c720f86619eeb39d0bf6701c27"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

RDEPENDS:${PN} += "bash"

INHIBIT_PACKAGE_STRIP = "1"
Expand All @@ -15,24 +18,24 @@ ALDEBARAN_LIB_DIR = "/opt/aldebaran/lib"

do_install() {
install -d ${D}/opt/aldebaran/share/firmware/
install -m 0644 ${WORKDIR}/aldebaran_files/opt/aldebaran/share/firmware/CX3RDK_OV5640_USB2.img ${D}/opt/aldebaran/share/firmware/
install -m 0644 ${WORKDIR}/aldebaran_files/opt/aldebaran/share/firmware/CX3RDK_OV5640_USB3.img ${D}/opt/aldebaran/share/firmware/
install -m 0644 ${S}/aldebaran_files/opt/aldebaran/share/firmware/CX3RDK_OV5640_USB2.img ${D}/opt/aldebaran/share/firmware/
install -m 0644 ${S}/aldebaran_files/opt/aldebaran/share/firmware/CX3RDK_OV5640_USB3.img ${D}/opt/aldebaran/share/firmware/

install -d ${D}/${nonarch_base_libdir}/firmware
install ${WORKDIR}/aldebaran_files/lib/firmware/sbre-usb-i2c.dfuse ${D}/${nonarch_base_libdir}/firmware
install ${S}/aldebaran_files/lib/firmware/sbre-usb-i2c.dfuse ${D}/${nonarch_base_libdir}/firmware

install -d ${D}/opt/aldebaran/etc/
install -D ${WORKDIR}/aldebaran_files/opt/aldebaran/etc/alfand.conf ${D}/opt/aldebaran/etc/
install -D ${S}/aldebaran_files/opt/aldebaran/etc/alfand.conf ${D}/opt/aldebaran/etc/
install -d ${D}/opt/aldebaran/etc/hal
install -D ${WORKDIR}/aldebaran_files/opt/aldebaran/etc/hal/hal.xml ${D}/opt/aldebaran/etc/hal/
install -D ${S}/aldebaran_files/opt/aldebaran/etc/hal/hal.xml ${D}/opt/aldebaran/etc/hal/
install -d ${D}/opt/aldebaran/share/lola
install -D ${WORKDIR}/aldebaran_files/opt/aldebaran/share/lola/nao_v6.xml ${D}/opt/aldebaran/share/lola/
install -D ${S}/aldebaran_files/opt/aldebaran/share/lola/nao_v6.xml ${D}/opt/aldebaran/share/lola/

install -d ${D}/${ALDEBARAN_BIN_DIR}
install -D ${WORKDIR}/aldebaran_files/opt/aldebaran/bin/* ${D}/${ALDEBARAN_BIN_DIR}
install -D ${S}/aldebaran_files/opt/aldebaran/bin/* ${D}/${ALDEBARAN_BIN_DIR}

install -d ${D}/${ALDEBARAN_LIB_DIR}
install -D ${WORKDIR}/aldebaran_files/opt/aldebaran/lib/* ${D}/${ALDEBARAN_LIB_DIR}
install -D ${S}/aldebaran_files/opt/aldebaran/lib/* ${D}/${ALDEBARAN_LIB_DIR}
}

do_package_qa[noexec] = "1"
Expand Down
23 changes: 13 additions & 10 deletions meta/recipes-support/aldebaran/aldebaran.bb
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,33 @@ SRC_URI = "\
file://lola.service \
"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

ALDEBARAN_DIR = "/opt/aldebaran"

do_install() {
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/42-usb-cx3.rules ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/90-cgos.rules ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/90-hal.rules ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${S}/42-usb-cx3.rules ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${S}/90-cgos.rules ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${S}/90-hal.rules ${D}${sysconfdir}/udev/rules.d/

install -d ${D}/${nonarch_base_libdir}/systemd/system-shutdown/
install -m 755 ${WORKDIR}/harakiri ${D}/${nonarch_base_libdir}/systemd/system-shutdown
install -m 755 ${S}/harakiri ${D}/${nonarch_base_libdir}/systemd/system-shutdown

install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/alfand.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/hal.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/lola.service ${D}${systemd_unitdir}/system
install -m 0644 ${S}/alfand.service ${D}${systemd_unitdir}/system
install -m 0644 ${S}/hal.service ${D}${systemd_unitdir}/system
install -m 0644 ${S}/lola.service ${D}${systemd_unitdir}/system

install -d ${D}/${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/00-hal-log.conf ${D}/${sysconfdir}/tmpfiles.d/
install -m 0644 ${S}/00-hal-log.conf ${D}/${sysconfdir}/tmpfiles.d/

install -d ${D}/${sysconfdir}/security/limits.d/
install -m 0644 ${WORKDIR}/rt-group.conf ${D}/${sysconfdir}/security/limits.d/
install -m 0644 ${S}/rt-group.conf ${D}/${sysconfdir}/security/limits.d/

install -d ${D}${sysconfdir}/profile.d/
install -m 0644 ${WORKDIR}/aldebaran_path.sh ${D}${sysconfdir}/profile.d/
install -m 0644 ${S}/aldebaran_path.sh ${D}${sysconfdir}/profile.d/
}

FILES:${PN} = "\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ From b9486eaaa3e4c66bfab7d383612babc9c63a6735 Mon Sep 17 00:00:00 2001
From: Hendrik <git@h3ndrk.de>
Date: Tue, 3 May 2022 16:55:10 +0200
Subject: [PATCH] Use libusb context instead of NULL
Upstream-Status: Pending

---
src/FX3Device.cpp | 2 +-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ From 93996a51f564b65d556896f4b3180122d03934c9 Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian@schmidt.so>
Date: Tue, 12 Mar 2024 12:23:13 +0000
Subject: [PATCH] Include cstdint
Upstream-Status: Pending

---
src/FX3Device.hpp | 1 +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 78ee96785053ecb3198963d0d781930a35935874 Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian.schmidt@tuhh.de>
Date: Wed, 9 Nov 2022 17:38:52 +0100
Subject: [PATCH] congatec scarthgap support
Subject: [PATCH] congatec walnascar support

---
conf/layer.conf | 2 +-
Expand All @@ -16,7 +16,7 @@ index 60cc30c..a7825ff 100644

LAYERVERSION_congatec = "7"
-LAYERSERIES_COMPAT_congatec = "dunfell"
+LAYERSERIES_COMPAT_congatec = "scarthgap"
+LAYERSERIES_COMPAT_congatec = "walnascar"
--
2.30.2

Loading