Skip to content
Draft
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: build
on:
pull_request:
branches:
- walnascar
- whinlatter
- stable-*
push:
branches:
- walnascar
- whinlatter
- stable-*
schedule:
- cron: '10 21 * * 4'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/bitbake-cookerdaemon.log
/build*/
*.swp
*.orig
Expand Down
32 changes: 20 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
[submodule "bitbake"]
path = bitbake
url = https://git.openembedded.org/bitbake
branch = 2.14
[submodule "openembedded-core"]
path = openembedded-core
url = https://git.openembedded.org/openembedded-core
branch = whinlatter
[submodule "meta-yocto"]
path = meta-yocto
url = https://git.yoctoproject.org/meta-yocto
branch = whinlatter
[submodule "meta-ptx"]
path = meta-ptx
url = https://github.com/pengutronix/meta-ptx.git
branch = walnascar
branch = master
[submodule "meta-oe"]
path = meta-oe
url = https://github.com/openembedded/meta-openembedded.git
branch = walnascar
branch = whinlatter
[submodule "meta-rauc"]
path = meta-rauc
url = https://github.com/rauc/meta-rauc.git
branch = walnascar
branch = master
[submodule "meta-labgrid"]
path = meta-labgrid
url = https://github.com/labgrid-project/meta-labgrid.git
branch = walnascar
branch = master
[submodule "meta-virtualization"]
path = meta-virtualization
url = https://github.com/lgirdk/meta-virtualization.git
branch = walnascar
[submodule "poky"]
path = poky
url = https://git.yoctoproject.org/poky
branch = walnascar
url = https://git.yoctoproject.org/meta-virtualization
branch = master
[submodule "meta-selinux"]
path = meta-selinux
url = https://git.yoctoproject.org/meta-selinux
branch = walnascar
branch = master
[submodule "meta-arm"]
path = meta-arm
url = https://git.yoctoproject.org/meta-arm
branch = walnascar
branch = master
1 change: 1 addition & 0 deletions bitbake
Submodule bitbake added at 9a3568
2 changes: 1 addition & 1 deletion meta-arm
Submodule meta-arm updated from b68089 to 108053
2 changes: 1 addition & 1 deletion meta-lxatac-bsp/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BBFILE_PATTERN_lxatac-bsp = "^${LAYERDIR}/"
BBFILE_PRIORITY_lxatac-bsp = "11"

LAYERDEPENDS_lxatac-bsp = "core ptx rauc lxatac-software"
LAYERSERIES_COMPAT_lxatac-bsp = "walnascar"
LAYERSERIES_COMPAT_lxatac-bsp = "whinlatter"

RAUC_KEY_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.key.pem"
RAUC_CERT_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.cert.pem"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ SRC_URI += " \
file://lxatac-factory-data.sh \
"

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

do_install() {
install -m 0644 -D ${UNPACKDIR}/lxatac-factory-data.service ${D}${systemd_system_unitdir}/lxatac-factory-data.service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ SRC_URI += " \
file://lxatac-led-setup.sh \
"

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

SYSTEMD_SERVICE:${PN} = "lxatac-led-setup.service"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ SRC_URI = " \
file://01-switch.conf \
"

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

do_install() {
install -D -m0644 ${UNPACKDIR}/01-switch.conf ${D}${sysconfdir}/lldpd.d/01-switch.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ SRC_URI += " \
file://spi-irq-prio-44009000.service \
"

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

do_install() {
# Increase the kernel atomic memory pool size.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ SRC_URI += " \
file://52-switch.link \
"

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

N = "${libdir}/NetworkManager/system-connections"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ SRC_URI = " \
file://var-log-journal.mount \
"

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

inherit allarch

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ SRC_URI = " \
file://var-cache-labgrid.mount \
"

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

do_install () {
install -d ${D}${systemd_system_unitdir}/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ SRC_URI = " \
file://use-var-log-sa.conf \
"

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

inherit allarch

Expand Down
3 changes: 1 addition & 2 deletions meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ SRC_URI = " \
file://repart-before-tmpfiles.conf \
"

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

RDEPENDS:${PN} = "systemd"

Expand Down
3 changes: 1 addition & 2 deletions meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ SRC_URI += " \
file://01-watchdog.conf \
"

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

do_install () {
# We have decided against using the `WATCHDOG_RUNTIME_SEC` variable
Expand Down
2 changes: 1 addition & 1 deletion meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7
require files/patches/series.inc

PV = "${UMPF_PV}"
S = "${WORKDIR}/linux-${LINUX_VERSION}"
S = "${UNPACKDIR}/linux-${LINUX_VERSION}"

COMPATIBLE_MACHINE = "lxatac"

Expand Down
7 changes: 1 addition & 6 deletions meta-lxatac-software/conf/distro/tacos.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DISTRO = "tacos"
DISTRO_NAME = "TAC OS - The LXA TAC operating system"
DISTRO_VERSION = "25.09+dev"
DISTRO_CODENAME = "tacos-walnascar"
DISTRO_CODENAME = "tacos-whinlatter"

MAINTAINER = "Linux Automation GmbH <[email protected]>"

Expand Down Expand Up @@ -52,11 +52,6 @@ FILESYSTEM_PERMS_TABLES:remove = "files/fs-perms-volatile-log.txt"
# add build info file (/etc/build) to rootfs to ease traceability
INHERIT += "image-buildinfo"

# prepare to use icecc
# to enable icecc in your build, add ICECC_DISABLED = "" to your local.conf
INHERIT_DISTRO:append = " icecc"
ICECC_DISABLED ??= "1"

# add poky sanity bbclass
INHERIT += "poky-sanity"

Expand Down
3 changes: 1 addition & 2 deletions meta-lxatac-software/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ BBFILE_PATTERN_lxatac-software = "^${LAYERDIR}/"
BBFILE_PRIORITY_lxatac-software = "7"

LAYERDEPENDS_lxatac-software = "core openembedded-layer networking-layer ptx rauc"
LAYERSERIES_COMPAT_lxatac-software = "walnascar"

LAYERSERIES_COMPAT_lxatac-software = "whinlatter"
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BBFILES ?= ""

BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
##OEROOT##/../meta-yocto/meta-poky \
##OEROOT##/../meta-arm/meta-arm \
##OEROOT##/../meta-arm/meta-arm-toolchain \
##OEROOT##/../meta-ptx \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

SRC_URI = "file://01-labgrid.sh"

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

RDEPENDS:${PN} = "bash"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ SRC_URI = " \
file://container-update.sh \
"

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

do_install() {
install -D -m0755 ${UNPACKDIR}/container-start.sh ${D}${bindir}/container-start
Expand Down

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions meta-lxatac-software/recipes-devtools/qdl/qdl_2.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ inherit pkgconfig
SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
SRCREV = "a601db1868bcda454a77b6769ca9efac3b0a114c"

S = "${WORKDIR}/git"

do_install () {
oe_runmake install DESTDIR=${D} prefix=${prefix}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ SRC_URI = "git://github.com/rockchip-linux/rkdeveloptool.git;protocol=https;bran
SRCREV = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"
PV = "1.32+git"

S = "${WORKDIR}/git"

DEPENDS = "libusb1 udev"

inherit autotools pkgconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ SRC_URI = " \
file://gadget-storage.sh \
"

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

do_install () {
install -D -m0644 ${UNPACKDIR}/gadget-common.sh ${D}${datadir}/gadget/gadget-common
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
PANEL_FIRMWARE = "shineworld,lh133k.txt"
SRC_URI = "file://${PANEL_FIRMWARE}"

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
1 change: 0 additions & 1 deletion meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ inherit cargo cargo-update-recipe-crates

SRC_URI += "git://github.com/ClementTsang/bottom.git;protocol=https;branch=main"
SRCREV = "2ec1fb56c9db0b37acc4eca3230adfb52720376b"
S = "${WORKDIR}/git"
CARGO_SRC_DIR = ""

# The bottom Cargo.toml strips release builds, why makes it hard to debug.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ inherit cargo cargo-update-recipe-crates

SRC_URI += "git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master"
SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c"
S = "${WORKDIR}/git"
CARGO_SRC_DIR = ""

LIC_FILES_CHKSUM = " \
Expand Down
1 change: 0 additions & 1 deletion meta-lxatac-software/recipes-rust/tacd/tacd_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ DEFAULT_PREFERENCE = "-1"

SRC_URI += "git://github.com/linux-automation/tacd.git;protocol=https;branch=main"
SRCREV = "1c2f16f8b4041b31cee702677630298614c23feb"
S = "${WORKDIR}/git"
CARGO_SRC_DIR = ""
PV = "0.1.0+git${SRCPV}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5"

inherit cmake pkgconfig

S = "${WORKDIR}/git"

DEPENDS = "libusb zlib bzip2 openssl libtinyxml2"

BBCLASSEXTEND = "native nativesdk"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SUMMARY = "The LXA TAC System Daemon - Web Interface"
SRC_URI = " \
git://github.com/linux-automation/tacd.git;protocol=https;branch=main \
npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json;destsuffix=git/web \
npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json;destsuffix=${BP}/web \
"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = " \
Expand All @@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = " \
PV = "0.1.0+git${SRCPV}"
SRCREV = "1c2f16f8b4041b31cee702677630298614c23feb"

S = "${WORKDIR}/sources/git/web"
UNPACKDIR = "${WORKDIR}/sources"
S = "${UNPACKDIR}/${BP}/web"

inherit npm

Expand Down
2 changes: 1 addition & 1 deletion meta-oe
Submodule meta-oe updated 3089 files
2 changes: 1 addition & 1 deletion meta-selinux
Submodule meta-selinux updated from 3dec9c to 9a9132
2 changes: 1 addition & 1 deletion meta-virtualization
Submodule meta-virtualization updated from 4fedb6 to 26e2b4
1 change: 1 addition & 0 deletions meta-yocto
Submodule meta-yocto added at d02d3f
4 changes: 2 additions & 2 deletions oe-init-build-env
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ unset THIS_SCRIPT

TEMPLATECONF="${DIR}/meta-lxatac-software/conf/templates/default/"

# shellcheck source=poky/oe-init-build-env
. "${DIR}/poky/oe-init-build-env" "$1"
# shellcheck source=openembedded-core/oe-init-build-env
. "${DIR}/openembedded-core/oe-init-build-env" "$1"
1 change: 1 addition & 0 deletions openembedded-core
Submodule openembedded-core added at 851997
1 change: 0 additions & 1 deletion poky
Submodule poky deleted from d0b46a