From 63e0ea358f1902b1dd9968b21b5eea649d04329e Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 27 Jun 2024 12:46:02 +0000 Subject: Move html5 demo into sublayer The HTML5 demo needs additional fixes. Move it into a sublayer and activate with agl-demo-html5. Bug-AGL: SPEC-5188 Change-Id: I2f1a07dcfbcaf7e09d4d0d3aec1aa8f096336287 Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30042 ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account Reviewed-by: Scott Murray ci-image-boot-test: Jenkins Job builder account --- .../files/databroker-grpc-web-proxy.env | 7 ----- .../files/databroker-grpc-web-proxy.service | 13 --------- recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb | 34 ---------------------- 3 files changed, 54 deletions(-) delete mode 100644 recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env delete mode 100644 recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service delete mode 100644 recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb (limited to 'recipes-wam/grpc-web-proxy') diff --git a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env b/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env deleted file mode 100644 index 1435253d3..000000000 --- a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_ARGS="--backend_addr=localhost:55555 \ - --backend_client_tls_key_file=/etc/kuksa-val/Client.key \ - --backend_client_tls_cert_file=/etc/kuksa-val/Client.pem \ - --server_tls_key_file=/etc/kuksa-val/Server.key \ - --server_tls_cert_file=/etc/kuksa-val/Server.pem \ - --backend_tls_ca_files=/etc/kuksa-val/CA.pem --backend_tls=true \ - --server_http_tls_port=8888 --run_tls_server=true --allowed_origins=true" diff --git a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service b/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service deleted file mode 100644 index ff6afe44d..000000000 --- a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=gRPC web reverse proxy to kuksa.val databroker -Requires=kuksa-databroker.service -After=kuksa-databroker.service - -[Service] -User=kuksa -EnvironmentFile=-/etc/default/databroker-grpc-web-proxy.env -ExecStart=/usr/bin/grpcwebproxy $EXTRA_ARGS -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb b/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb deleted file mode 100644 index dfb763b64..000000000 --- a/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "A small reverse proxy that can front existing gRPC servers and expose their functionality using gRPC-Web protocol, allowing for the gRPC services to be consumed from browsers." -HOMEPAGE = "https://github.com/improbable-eng/grpc-web" - -inherit go-mod systemd - -RDEPENDS:${PN} = "bash" -RDEPENDS:${PN}-dev = "bash" - -GO_IMPORT = "github.com/improbable-eng/grpc-web" -GO_INSTALL = "${GO_IMPORT}/go/grpcwebproxy" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE.txt;md5=71a6955f3cd81a809549da266346dc59" - -SRCREV = "1d9bbb09a0990bdaff0e37499570dbc7d6e58ce8" -SRC_URI = "git://${GO_IMPORT};branch=master;protocol=https \ - file://databroker-grpc-web-proxy.env \ - file://databroker-grpc-web-proxy.service" - -do_compile[network] = "1" - -do_install:append() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/databroker-grpc-web-proxy.service ${D}${systemd_system_unitdir} - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/databroker-grpc-web-proxy.env ${D}${sysconfdir}/default/databroker-grpc-web-proxy.env -} - -SYSTEMD_SERVICE:${PN} = "databroker-grpc-web-proxy.service" - -FILES:${PN} = "${bindir} \ - ${systemd_system_unitdir} \ - ${sysconfdir}/default " -- cgit 1.2.3-korg