From 2b26618fca5036d5f1d6a71a7e89ef10305e9f99 Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt Date: Sun, 15 Dec 2024 14:15:46 +0000 Subject: [PATCH] upgrade to latest master (walnascar) --- kas/base.yml | 24 +++++--- meta-hulks/conf/distro/HULKs-OS.conf | 2 +- meta-hulks/conf/layer.conf | 2 +- .../recipes-core/images/nao-image.bbappend | 2 - .../recipes-hulks/aliveness/aliveness.bb | 4 +- meta-hulks/recipes-hulks/breeze/breeze.bb | 2 +- meta-hulks/recipes-hulks/hula/hula.bb | 4 +- meta-hulks/recipes-hulks/hulk/hulk.bb | 11 ++-- .../network-config/network-config.bb | 9 ++- meta/conf/layer.conf | 2 +- .../nao-wifi-conf/nao-wifi-conf.bb | 18 +++--- meta/recipes-conf/user-home/nao-home.bb | 7 ++- .../base-files/base-files_%.bbappend | 2 +- ...nts-in-part-by-SoftBank-and-Congatec.patch | 1 + .../linux-intel-rt/0002-CGOS-32-bit.patch | 1 + .../linux/linux-intel-rt_%.bbappend | 2 +- .../aldebaran/aldebaran-binaries.bb | 19 +++--- meta/recipes-support/aldebaran/aldebaran.bb | 23 ++++---- ...1-Use-libusb-context-instead-of-NULL.patch | 1 + .../flash-cx3/0002-Include-cstdint.patch | 1 + ... => 0001-congatec-walnascar-support.patch} | 4 +- .../0002-congatec-new-override-syntax.patch | 1 + patches/0004-compress-sdk-with-zstd.patch | 59 ------------------- patches/0004-congatec-no-s-workspace.patch | 59 +++++++++++++++++++ patches/0005-congatec-upstream-status.patch | 10 ++++ 25 files changed, 154 insertions(+), 116 deletions(-) rename patches/{0001-congatec-scarthgap-support.patch => 0001-congatec-walnascar-support.patch} (85%) delete mode 100644 patches/0004-compress-sdk-with-zstd.patch create mode 100644 patches/0004-congatec-no-s-workspace.patch create mode 100644 patches/0005-congatec-upstream-status.patch diff --git a/kas/base.yml b/kas/base.yml index 136bd63..6653fb1 100644 --- a/kas/base.yml +++ b/kas/base.yml @@ -17,7 +17,7 @@ repos: meta: poky: url: "https://git.yoctoproject.org/git/poky" - commit: ae6cebca5bac9521230c69fed23b375d0de7f5f6 + commit: cc5e3503e4437358efa8c5675e02f5e19430c58f layers: meta: meta-poky: @@ -26,28 +26,34 @@ repos: 0003-specify-custom-dynamic-linker: repo: "meta-nao" path: "patches/0003-bindgen-clang-sysroot.patch" - 0004-compress-sdk-with-zstd: - repo: "meta-nao" - path: "patches/0004-compress-sdk-with-zstd.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: 147349b7334b8a25b96bb08c2361ae0ae95e7eb6 meta-intel: url: "https://git.yoctoproject.org/git/meta-intel" - commit: c8cd0317ec19332bce86697f3413a82b9828b329 + commit: d0150964ca7c6a83d38ba54cda3e19b34d274f80 + meta-openvino: + url: "https://github.com/intel/meta-openvino" + commit: 65dfb4ff4a53b5164b1dfc396001767da00f27fd meta-openembedded: url: "https://git.openembedded.org/meta-openembedded" - commit: 4a7bb77f7ebe0ac8be5bab5103d8bd993e17e18d + commit: af28a667fb22d0023807e8c3319d0923bee39020 layers: meta-oe: meta-multimedia: diff --git a/meta-hulks/conf/distro/HULKs-OS.conf b/meta-hulks/conf/distro/HULKs-OS.conf index b6fac0a..f81bdb6 100644 --- a/meta-hulks/conf/distro/HULKs-OS.conf +++ b/meta-hulks/conf/distro/HULKs-OS.conf @@ -4,5 +4,5 @@ SUMMARY = "HULKs flavoured Nao" DISTRO = "HULKs-OS" DISTRO_NAME = "HULKs-OS" -DISTRO_VERSION = "7.5.7" +DISTRO_VERSION = "7.6.0" SDKIMAGE_FEATURES:remove = "dbg-pkgs src-pkgs" diff --git a/meta-hulks/conf/layer.conf b/meta-hulks/conf/layer.conf index 9ab5fff..0b17088 100644 --- a/meta-hulks/conf/layer.conf +++ b/meta-hulks/conf/layer.conf @@ -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}/" diff --git a/meta-hulks/recipes-core/images/nao-image.bbappend b/meta-hulks/recipes-core/images/nao-image.bbappend index 2a75403..6643336 100644 --- a/meta-hulks/recipes-core/images/nao-image.bbappend +++ b/meta-hulks/recipes-core/images/nao-image.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SDK_ZSTD_COMPRESSION_LEVEL = "-9" - CORE_IMAGE_EXTRA_INSTALL += "\ aliveness \ breeze \ diff --git a/meta-hulks/recipes-hulks/aliveness/aliveness.bb b/meta-hulks/recipes-hulks/aliveness/aliveness.bb index 3a1a456..dcb95ac 100644 --- a/meta-hulks/recipes-hulks/aliveness/aliveness.bb +++ b/meta-hulks/recipes-hulks/aliveness/aliveness.bb @@ -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 diff --git a/meta-hulks/recipes-hulks/breeze/breeze.bb b/meta-hulks/recipes-hulks/breeze/breeze.bb index 908aa59..a387ddc 100644 --- a/meta-hulks/recipes-hulks/breeze/breeze.bb +++ b/meta-hulks/recipes-hulks/breeze/breeze.bb @@ -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 diff --git a/meta-hulks/recipes-hulks/hula/hula.bb b/meta-hulks/recipes-hulks/hula/hula.bb index b658d1f..657c9ae 100644 --- a/meta-hulks/recipes-hulks/hula/hula.bb +++ b/meta-hulks/recipes-hulks/hula/hula.bb @@ -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" diff --git a/meta-hulks/recipes-hulks/hulk/hulk.bb b/meta-hulks/recipes-hulks/hulk/hulk.bb index 0b6a1f9..a80a692 100644 --- a/meta-hulks/recipes-hulks/hulk/hulk.bb +++ b/meta-hulks/recipes-hulks/hulk/hulk.bb @@ -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} = " \ diff --git a/meta-hulks/recipes-hulks/network-config/network-config.bb b/meta-hulks/recipes-hulks/network-config/network-config.bb index e20fc71..a81e54f 100644 --- a/meta-hulks/recipes-hulks/network-config/network-config.bb +++ b/meta-hulks/recipes-hulks/network-config/network-config.bb @@ -12,13 +12,16 @@ SRC_URI = "\ file://SPL_HULKs.psk \ " +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 ${S}/network-config.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/ } FILES:${PN} = " \ diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index efe7b4b..649f2ba 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -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}/" diff --git a/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf.bb b/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf.bb index 1d2d7cd..e110ae8 100644 --- a/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf.bb +++ b/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf.bb @@ -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} = "\ diff --git a/meta/recipes-conf/user-home/nao-home.bb b/meta/recipes-conf/user-home/nao-home.bb index a7a667c..a85f200 100644 --- a/meta/recipes-conf/user-home/nao-home.bb +++ b/meta/recipes-conf/user-home/nao-home.bb @@ -7,6 +7,9 @@ SRC_URI = "\ file://nao.rules \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + RDEPENDS:${PN} += "polkit" inherit useradd @@ -14,11 +17,11 @@ 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}" diff --git a/meta/recipes-core/base-files/base-files_%.bbappend b/meta/recipes-core/base-files/base-files_%.bbappend index 444e85e..4e67ec9 100644 --- a/meta/recipes-core/base-files/base-files_%.bbappend +++ b/meta/recipes-core/base-files/base-files_%.bbappend @@ -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/ } diff --git a/meta/recipes-kernel/linux/linux-intel-rt/0001-NAO-adjustments-in-part-by-SoftBank-and-Congatec.patch b/meta/recipes-kernel/linux/linux-intel-rt/0001-NAO-adjustments-in-part-by-SoftBank-and-Congatec.patch index de406e6..00c25ed 100644 --- a/meta/recipes-kernel/linux/linux-intel-rt/0001-NAO-adjustments-in-part-by-SoftBank-and-Congatec.patch +++ b/meta/recipes-kernel/linux/linux-intel-rt/0001-NAO-adjustments-in-part-by-SoftBank-and-Congatec.patch @@ -2,6 +2,7 @@ From 165a4bcc4c62e984fe0ae7213298140a55ef5b9b Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt 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 +- diff --git a/meta/recipes-kernel/linux/linux-intel-rt/0002-CGOS-32-bit.patch b/meta/recipes-kernel/linux/linux-intel-rt/0002-CGOS-32-bit.patch index 7a4487d..f686b9f 100644 --- a/meta/recipes-kernel/linux/linux-intel-rt/0002-CGOS-32-bit.patch +++ b/meta/recipes-kernel/linux/linux-intel-rt/0002-CGOS-32-bit.patch @@ -2,6 +2,7 @@ From 2a7f46283db624091165a0383882c44f578d645b Mon Sep 17 00:00:00 2001 From: Kas User Date: Tue, 15 Nov 2022 19:33:29 +0000 Subject: [PATCH] CGOS 32-bit +Upstream-Status: Pending --- drivers/cgosdrv/DrvLx.c | 63 ++++++++++++++++++++++++++++++++++------- diff --git a/meta/recipes-kernel/linux/linux-intel-rt_%.bbappend b/meta/recipes-kernel/linux/linux-intel-rt_%.bbappend index c74eab3..7f516b6 100644 --- a/meta/recipes-kernel/linux/linux-intel-rt_%.bbappend +++ b/meta/recipes-kernel/linux/linux-intel-rt_%.bbappend @@ -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} += "\ diff --git a/meta/recipes-support/aldebaran/aldebaran-binaries.bb b/meta/recipes-support/aldebaran/aldebaran-binaries.bb index e7e673e..c174a6f 100644 --- a/meta/recipes-support/aldebaran/aldebaran-binaries.bb +++ b/meta/recipes-support/aldebaran/aldebaran-binaries.bb @@ -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" @@ -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" diff --git a/meta/recipes-support/aldebaran/aldebaran.bb b/meta/recipes-support/aldebaran/aldebaran.bb index af0652f..2500fbb 100644 --- a/meta/recipes-support/aldebaran/aldebaran.bb +++ b/meta/recipes-support/aldebaran/aldebaran.bb @@ -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} = "\ diff --git a/meta/recipes-support/aldebaran/flash-cx3/0001-Use-libusb-context-instead-of-NULL.patch b/meta/recipes-support/aldebaran/flash-cx3/0001-Use-libusb-context-instead-of-NULL.patch index ea11467..04019e3 100644 --- a/meta/recipes-support/aldebaran/flash-cx3/0001-Use-libusb-context-instead-of-NULL.patch +++ b/meta/recipes-support/aldebaran/flash-cx3/0001-Use-libusb-context-instead-of-NULL.patch @@ -2,6 +2,7 @@ From b9486eaaa3e4c66bfab7d383612babc9c63a6735 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Tue, 3 May 2022 16:55:10 +0200 Subject: [PATCH] Use libusb context instead of NULL +Upstream-Status: Pending --- src/FX3Device.cpp | 2 +- diff --git a/meta/recipes-support/aldebaran/flash-cx3/0002-Include-cstdint.patch b/meta/recipes-support/aldebaran/flash-cx3/0002-Include-cstdint.patch index bcc9aa2..04eab27 100644 --- a/meta/recipes-support/aldebaran/flash-cx3/0002-Include-cstdint.patch +++ b/meta/recipes-support/aldebaran/flash-cx3/0002-Include-cstdint.patch @@ -2,6 +2,7 @@ From 93996a51f564b65d556896f4b3180122d03934c9 Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt Date: Tue, 12 Mar 2024 12:23:13 +0000 Subject: [PATCH] Include cstdint +Upstream-Status: Pending --- src/FX3Device.hpp | 1 + diff --git a/patches/0001-congatec-scarthgap-support.patch b/patches/0001-congatec-walnascar-support.patch similarity index 85% rename from patches/0001-congatec-scarthgap-support.patch rename to patches/0001-congatec-walnascar-support.patch index c639ef2..0da2ed6 100644 --- a/patches/0001-congatec-scarthgap-support.patch +++ b/patches/0001-congatec-walnascar-support.patch @@ -1,7 +1,7 @@ From 78ee96785053ecb3198963d0d781930a35935874 Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt Date: Wed, 9 Nov 2022 17:38:52 +0100 -Subject: [PATCH] congatec scarthgap support +Subject: [PATCH] congatec walnascar support --- conf/layer.conf | 2 +- @@ -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 diff --git a/patches/0002-congatec-new-override-syntax.patch b/patches/0002-congatec-new-override-syntax.patch index 6eabe83..23f5113 100644 --- a/patches/0002-congatec-new-override-syntax.patch +++ b/patches/0002-congatec-new-override-syntax.patch @@ -2,6 +2,7 @@ From a1611a185f96804da256a51dfe2dc6b9e9567252 Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt Date: Sun, 5 Dec 2021 18:41:44 +0100 Subject: [PATCH 2/2] congatec new override syntax +Upstream-Status: Pending --- README | 6 +- diff --git a/patches/0004-compress-sdk-with-zstd.patch b/patches/0004-compress-sdk-with-zstd.patch deleted file mode 100644 index d8063b7..0000000 --- a/patches/0004-compress-sdk-with-zstd.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass -index 81896d808f..bd705d8a3c 100644 ---- a/meta/classes-recipe/populate_sdk_base.bbclass -+++ b/meta/classes-recipe/populate_sdk_base.bbclass -@@ -75,6 +75,8 @@ SDK_ARCHIVE_TYPE ?= "tar.xz" - SDK_XZ_COMPRESSION_LEVEL ?= "-9" - SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" - SDK_ZIP_OPTIONS ?= "-y" -+SDK_ZSTD_COMPRESSION_LEVEL ?= "-3" -+SDK_ZSTD_OPTIONS ?= "-T0 ${SDK_ZSTD_COMPRESSION_LEVEL}" - - - # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz -@@ -84,6 +86,9 @@ python () { - # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} - # recommand to cd into input dir first to avoid archive with buildpath - d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') -+ elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst': -+ d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native') -+ d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | zstd ${SDK_ZSTD_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') - else: - d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') - d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') -diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh -index 4386b985bb..db28bad7b8 100644 ---- a/meta/files/toolchain-shar-extract.sh -+++ b/meta/files/toolchain-shar-extract.sh -@@ -51,6 +51,13 @@ if [ "$INST_ARCH" != "$SDK_ARCH" ]; then - fi - fi - -+if [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then -+ if ! zstd -V > /dev/null 2>&1; then -+ echo "Error: zstd is required for installation of this SDK, please install it first" -+ exit 1 -+ fi -+fi -+ - if ! xz -V > /dev/null 2>&1; then - echo "Error: xz is required for installation of this SDK, please install it first" - exit 1 -@@ -121,6 +128,8 @@ if [ "$listcontents" = "1" ] ; then - else - rm sdk.zip && exit 1 - fi -+ elif [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then -+ tail -n +$payload_offset "$0"| tar tv --zstd || exit 1 - else - tail -n +$payload_offset "$0"| tar tvJ || exit 1 - fi -@@ -249,6 +258,8 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then - else - rm sdk.zip && exit 1 - fi -+elif [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then -+ tail -n +$payload_offset "$0"| $SUDO_EXEC tar mx --zstd -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 - else - tail -n +$payload_offset "$0"| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 - fi diff --git a/patches/0004-congatec-no-s-workspace.patch b/patches/0004-congatec-no-s-workspace.patch new file mode 100644 index 0000000..2376881 --- /dev/null +++ b/patches/0004-congatec-no-s-workspace.patch @@ -0,0 +1,59 @@ +diff --git a/recipes-kernel/low-speed-spidev/low-speed-spidev.bb b/recipes-kernel/low-speed-spidev/low-speed-spidev.bb +index 4e3bac9..562dcc4 100644 +--- a/recipes-kernel/low-speed-spidev/low-speed-spidev.bb ++++ b/recipes-kernel/low-speed-spidev/low-speed-spidev.bb +@@ -23,4 +23,5 @@ do_install:append () { + install -m 0655 low-speed-spidev.conf ${D}/etc/modprobe.d/ + } + +-S = "${WORKDIR}" ++S = "${WORKDIR}/sources" ++UNPACKDIR = "${S}" +diff --git a/recipes-kernel/spidev-test/spidev-test.bb b/recipes-kernel/spidev-test/spidev-test.bb +index d7ef55c..4fc4536 100644 +--- a/recipes-kernel/spidev-test/spidev-test.bb ++++ b/recipes-kernel/spidev-test/spidev-test.bb +@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 + PR = "r3" + PROVIDES = "spidev_test" + +-S = "${WORKDIR}" ++S = "${WORKDIR}/sources" ++UNPACKDIR = "${S}" + SRC_URI += "file://spidev_test.c \ + file://001-device-name.patch \ + " +diff --git a/recipes-network/lte-connect/lte-connect.bb b/recipes-network/lte-connect/lte-connect.bb +index 3c3e2a2..1879524 100644 +--- a/recipes-network/lte-connect/lte-connect.bb ++++ b/recipes-network/lte-connect/lte-connect.bb +@@ -10,12 +10,13 @@ SRC_URI = "file://lte-connect.sh" + + inherit allarch + +-S = "${WORKDIR}" ++S = "${WORKDIR}/sources" ++UNPACKDIR = "${S}" + + do_compile() { + } + + do_install() { + install -d ${D}${bindir} +- install -m 0755 ${WORKDIR}/lte-connect.sh ${D}${bindir}/lte-connect.sh ++ install -m 0755 ${S}/lte-connect.sh ${D}${bindir}/lte-connect.sh + } +diff --git a/recipes-tools/cgspi-test/cgspi-test_0.2.bb b/recipes-tools/cgspi-test/cgspi-test_0.2.bb +index 6f986ef..97924ef 100644 +--- a/recipes-tools/cgspi-test/cgspi-test_0.2.bb ++++ b/recipes-tools/cgspi-test/cgspi-test_0.2.bb +@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 + PR = "r1" + PROVIDES = "cgspi-test" + +-S = "${WORKDIR}" ++S = "${WORKDIR}/sources" ++UNPACKDIR = "${S}" + SRC_URI += "file://SPI_V0.c" + + FILES:${PN} += "${bindir}/cgspi_test" diff --git a/patches/0005-congatec-upstream-status.patch b/patches/0005-congatec-upstream-status.patch new file mode 100644 index 0000000..f4f8a5e --- /dev/null +++ b/patches/0005-congatec-upstream-status.patch @@ -0,0 +1,10 @@ +diff --git a/recipes-tools/cgos/files/cgoslx-x64-1.03.025.patch b/recipes-tools/cgos/files/cgoslx-x64-1.03.025.patch +index b68a714..4b500e5 100644 +--- a/recipes-tools/cgos/files/cgoslx-x64-1.03.025.patch ++++ b/recipes-tools/cgos/files/cgoslx-x64-1.03.025.patch +@@ -1,3 +1,5 @@ ++Upstream-Status: Pending ++ + diff --git a/CgosDrv/Lx/Makefile b/CgosDrv/Lx/Makefile + index 93933e7..ee205be 100644 + --- a/CgosDrv/Lx/Makefile