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.

Sign up for GitHub

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

Jump to bottom

New functionality is added #50

Merged
merged 5 commits into from
Dec 2, 2022
Merged

New functionality is added #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b090ed
a bbclass and bb file added
stlachev Dec 2, 2022
3d6508d
Merge branch 'main' of https://github.com/SoftwareDefinedVehicle/meta…
stlachev Dec 2, 2022
3030c7f
Coments removed
stlachev Dec 2, 2022
6eeb0f7
Added service template
stlachev Dec 2, 2022
e8ef871
Merge pull request #19 from SoftwareDefinedVehicle/kanto-auto-deployer
mikehaller Dec 2, 2022
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
14 changes: 14 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/classes/kanto-auto-deployer.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# /********************************************************************************
# * Copyright (c) 2022 Contributors to the Eclipse Foundation
# *
# * See the NOTICE file(s) distributed with this work for additional
# * information regarding copyright ownership.
# *
# * This program and the accompanying materials are made available under the
# * terms of the Apache License 2.0 which is available at
# * https://www.apache.org/licenses/LICENSE-2.0
# *
# * SPDX-License-Identifier: Apache-2.0
# ********************************************************************************/
#
KANTO_MANIFESTS_DIR ??= "/var/containers/manifests"
4 changes: 3 additions & 1 deletion ...se-leda/files/kanto-auto-deployer.service → ...iles/kanto-auto-deployer.service.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ Requires=container-management.service
WantedBy=multi-user.target

[Service]
ExecStart=/usr/bin/kanto-auto-deployer /var/containers/manifests
Restart=on-failure
RestartSec=5s
ExecStart=@KD_BIN_DD@/kanto-auto-deployer @KD_CFG_DD@
24 changes: 13 additions & 11 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ PACKAGES = "${PN}"
FILES:${PN} += "${bindir}/kanto-auto-deployer"
FILES:${PN} += "${systemd_unitdir}/system/kanto-auto-deployer.service"

#containers
FILES:${PN} += "/var/containers/manifests/databroker.json"

do_install:append() {
cargo_do_install
install_containers
install_service
}

cargo_do_install () {
Expand Down Expand Up @@ -59,13 +56,18 @@ cargo_do_install () {

}

install_containers() {
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${THISDIR}/files/kanto-auto-deployer.service ${D}${systemd_unitdir}/system
install -d ${D}/var/containers/manifests

#containers
install ${THISDIR}/kanto-containers/databroker.json ${D}/var/containers/manifests
KANTO_SERVICE_DIR = "${systemd_unitdir}/system"

install_service() {
install -d ${D}${KANTO_SERVICE_DIR}
install -m 0644 ${THISDIR}/files/kanto-auto-deployer.service.template ${D}${KANTO_SERVICE_DIR}/kanto-auto-deployer.service

# fill in the kanto auto deployer service template with the result configurations
sed -e 's,@KD_BIN_DD@,${bindir},g' \
-e 's,@KD_CFG_DD@,${KANTO_MANIFESTS_DIR},g' \
-i ${D}${KANTO_SERVICE_DIR}/kanto-auto-deployer.service

install -d ${D}${KANTO_MANIFESTS_DIR}
}


4 changes: 2 additions & 2 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kanto
PROVIDES:${PN} += "kanto-auto-deployer"
RPROVIDES:${PN} += "kanto-auto-deployer"

inherit cargo
inherit cargo kanto-auto-deployer

RDEPENDS_${PN} += " grpc protobuf nativesdk-protobuf"
DEPENDS += " protobuf protobuf-native grpc"
DEPENDS += " protobuf protobuf-native grpc git-native"

SRCREV = "1a7ccb4d37c6ca6bbfce2d915c31aa4478623791"
PV:append = ".AUTOINC+1a7ccb4d37"
Expand Down
28 changes: 28 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# /********************************************************************************
# * Copyright (c) 2022 Contributors to the Eclipse Foundation
# *
# * See the NOTICE file(s) distributed with this work for additional
# * information regarding copyright ownership.
# *
# * This program and the accompanying materials are made available under the
# * terms of the Apache License 2.0 which is available at
# * https://www.apache.org/licenses/LICENSE-2.0
# *
# * SPDX-License-Identifier: Apache-2.0
# ********************************************************************************/
#
inherit kanto-auto-deployer

DESCRIPTION = "Kanto Default Containers"
SRC_URI += "file://LICENSE"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

do_install:append() {
install -d ${D}${KANTO_MANIFESTS_DIR}
install ${THISDIR}/kanto-containers/databroker.json ${D}${KANTO_MANIFESTS_DIR}
}

PACKAGES = "${PN}"
FILES:${PN} += "${KANTO_MANIFESTS_DIR}/databroker.json"

3 changes: 2 additions & 1 deletion meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ RDEPENDS:${PN} = "\
system-metrics \
rauc-hawkbit-updater \
kanto-auto-deployer \
"
sdv-default-containers \
"