From: Eric Ball Date: Tue, 6 Aug 2024 16:38:40 +0000 (-0700) Subject: Fix: All pre-commit lint fixes X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=aa65de08e28e176527b53903501261a7ef267502;p=iec.git Fix: All pre-commit lint fixes Issue-ID: LF-Jira RELENG-4799 Change-Id: Ic40aa366cac010a8b4f457d746c8ca6ab34c8777 Signed-off-by: Eric Ball --- diff --git a/src/foundation/api/Makefile b/src/foundation/api/Makefile index 6fa5c98..1f95c56 100644 --- a/src/foundation/api/Makefile +++ b/src/foundation/api/Makefile @@ -33,7 +33,7 @@ IMAGE_VERSION ?= $(GIT_VERSION) IMAGE_TAG := $(shell echo $(IMAGE_VERSION) | cut -d. -f1,2) IMAGE_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD | tr -d '/') -#Currently, we choose golang-alpine based image as the default image base due to its +#Currently, we choose golang-alpine based image as the default image base due to its #small size base: @IMAGE_NAME="$(REGISTRY)/iec-apiserver-base"; \ @@ -110,7 +110,7 @@ pre_manifest: ./manifest-tool push from-args --platforms $(PLATFORMS) --template $(REGISTRY)/$(TARGET)-ARCH:$(VERSION) --target $(REGISTRY)/$(TARGET):$(VERSION) -#Note: Currently, just multi-arch the latest version of the images to avoid the possible version +#Note: Currently, just multi-arch the latest version of the images to avoid the possible version #mismatch between amd64 and arm64 in docker hub. In case we need them, we can just remove the comment tags below #Just multi-arch the iec-apiserver image currently diff --git a/src/foundation/api/apiserver/app/routes/routes.go b/src/foundation/api/apiserver/app/routes/routes.go index fcac773..8890e10 100644 --- a/src/foundation/api/apiserver/app/routes/routes.go +++ b/src/foundation/api/apiserver/app/routes/routes.go @@ -13,14 +13,14 @@ var App tApp func (_ tApp) Index( ) string { args := make(map[string]string) - + return revel.MainRouter.Reverse("App.Index", args).URL } func (_ tApp) GetStatus( ) string { args := make(map[string]string) - + return revel.MainRouter.Reverse("App.GetStatus", args).URL } @@ -34,7 +34,7 @@ func (_ tStatic) Serve( filepath string, ) string { args := make(map[string]string) - + revel.Unbind(args, "prefix", prefix) revel.Unbind(args, "filepath", filepath) return revel.MainRouter.Reverse("Static.Serve", args).URL @@ -45,7 +45,7 @@ func (_ tStatic) ServeDir( filepath string, ) string { args := make(map[string]string) - + revel.Unbind(args, "prefix", prefix) revel.Unbind(args, "filepath", filepath) return revel.MainRouter.Reverse("Static.ServeDir", args).URL @@ -57,7 +57,7 @@ func (_ tStatic) ServeModule( filepath string, ) string { args := make(map[string]string) - + revel.Unbind(args, "moduleName", moduleName) revel.Unbind(args, "prefix", prefix) revel.Unbind(args, "filepath", filepath) @@ -70,7 +70,7 @@ func (_ tStatic) ServeModuleDir( filepath string, ) string { args := make(map[string]string) - + revel.Unbind(args, "moduleName", moduleName) revel.Unbind(args, "prefix", prefix) revel.Unbind(args, "filepath", filepath) @@ -85,7 +85,7 @@ var TestRunner tTestRunner func (_ tTestRunner) Index( ) string { args := make(map[string]string) - + return revel.MainRouter.Reverse("TestRunner.Index", args).URL } @@ -93,7 +93,7 @@ func (_ tTestRunner) Suite( suite string, ) string { args := make(map[string]string) - + revel.Unbind(args, "suite", suite) return revel.MainRouter.Reverse("TestRunner.Suite", args).URL } @@ -103,7 +103,7 @@ func (_ tTestRunner) Run( test string, ) string { args := make(map[string]string) - + revel.Unbind(args, "suite", suite) revel.Unbind(args, "test", test) return revel.MainRouter.Reverse("TestRunner.Run", args).URL @@ -112,7 +112,7 @@ func (_ tTestRunner) Run( func (_ tTestRunner) List( ) string { args := make(map[string]string) - + return revel.MainRouter.Reverse("TestRunner.List", args).URL } diff --git a/src/foundation/api/apiserver/app/tmp/run/run.go b/src/foundation/api/apiserver/app/tmp/run/run.go index cd09452..21c835d 100644 --- a/src/foundation/api/apiserver/app/tmp/run/run.go +++ b/src/foundation/api/apiserver/app/tmp/run/run.go @@ -30,115 +30,115 @@ func Run(port int) { // Register all the controllers func Register() { revel.AppLog.Info("Running revel server") - + revel.RegisterController((*controllers.App)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ }, - RenderArgNames: map[int][]string{ - 12: []string{ + RenderArgNames: map[int][]string{ + 12: []string{ }, }, }, &revel.MethodType{ Name: "GetStatus", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, - + }) - + revel.RegisterController((*controllers0.Static)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Serve", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ Name: "ServeDir", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ Name: "ServeModule", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "moduleName", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ Name: "ServeModuleDir", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "moduleName", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, - + }) - + revel.RegisterController((*controllers1.TestRunner)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ }, - RenderArgNames: map[int][]string{ - 76: []string{ + RenderArgNames: map[int][]string{ + 76: []string{ "testSuites", }, }, }, &revel.MethodType{ Name: "Suite", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "suite", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ Name: "Run", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "suite", Type: reflect.TypeOf((*string)(nil)) }, &revel.MethodArg{Name: "test", Type: reflect.TypeOf((*string)(nil)) }, }, - RenderArgNames: map[int][]string{ - 125: []string{ + RenderArgNames: map[int][]string{ + 125: []string{ }, }, }, &revel.MethodType{ Name: "List", - Args: []*revel.MethodArg{ + Args: []*revel.MethodArg{ }, - RenderArgNames: map[int][]string{ + RenderArgNames: map[int][]string{ }, }, - + }) - - revel.DefaultValidationKeys = map[string]map[int]string{ + + revel.DefaultValidationKeys = map[string]map[int]string{ } - testing.TestSuites = []interface{}{ + testing.TestSuites = []interface{}{ (*tests.AppTest)(nil), } } diff --git a/src/foundation/api/apiserver/conf/app.conf b/src/foundation/api/apiserver/conf/app.conf index 15e78d8..e2b47f2 100644 --- a/src/foundation/api/apiserver/conf/app.conf +++ b/src/foundation/api/apiserver/conf/app.conf @@ -99,9 +99,9 @@ format.datetime = 2006-01-02 15:04 # sending data before the entire template has been fully rendered. results.chunked = false -# Compression of your HTML and CSS files with gzip typically saves around -# fifty to seventy percent of the file size. This means that it takes less -# time to load your pages, and less bandwidth is used over all. +# Compression of your HTML and CSS files with gzip typically saves around +# fifty to seventy percent of the file size. This means that it takes less +# time to load your pages, and less bandwidth is used over all. # To enable compression, set value to true. results.compressed = false @@ -154,7 +154,7 @@ results.pretty = true # Watch your applicaton files for changes and automatically rebuild # Values: # "true" -# Enables auto rebuilding. +# Enables auto rebuilding. # "false" # Disables auto rebuilding. watch = true diff --git a/src/foundation/api/revel/CHANGELOG.md b/src/foundation/api/revel/CHANGELOG.md index 5273460..cfebc95 100644 --- a/src/foundation/api/revel/CHANGELOG.md +++ b/src/foundation/api/revel/CHANGELOG.md @@ -5,7 +5,7 @@ # Maintenance Release -This release is focused on improving the security and resolving some issues. +This release is focused on improving the security and resolving some issues. **There are no breaking changes from version 0.18** @@ -33,7 +33,7 @@ Everything else should just work.... ## New items * Server Engine revel/revel#998 The server engine implementation is described in the [docs](http://revel.github.io/manual/server-engine.html) -* Allow binding to a structured map. revel/revel#998 +* Allow binding to a structured map. revel/revel#998 Have a structure inside a map object which will be realized properly from params * Gorm module revel/modules/#51 Added transaction controller @@ -42,7 +42,7 @@ Added transaction controller Start the application without doing a request first using revel run .... * Logger update revel/revel#1213 Configurable logger and added context logging on controller via controller.Log -* Before after finally panic controller method detection revel/revel#1211 +* Before after finally panic controller method detection revel/revel#1211 Controller methods will be automatically detected and called - similar to interceptors but without the extra code * Float validation revel/revel#1209 Added validation for floats @@ -52,17 +52,17 @@ Added timeago function to Revel template functions Added ability to specify authorization to access the jobs module routes * Add MessageKey, ErrorKey methods to ValidationResult object revel/revel#1215 This allows the message translator to translate the keys added. So model objects can send out validation codes -* Vendor friendlier - Revel recognizes and uses `deps` (to checkout go libraries) if a vendor folder exists in the project root. +* Vendor friendlier - Revel recognizes and uses `deps` (to checkout go libraries) if a vendor folder exists in the project root. * Updated examples to use Gorp modules and new loggers ### Breaking Changes -* `http.Request` is no longer contained in `revel.Request` revel.Request remains functionally the same but +* `http.Request` is no longer contained in `revel.Request` revel.Request remains functionally the same but you cannot extract the `http.Request` from it. You can get the `http.Request` from `revel.Controller.Request.In.GetRaw().(*http.Request)` * `http.Response.Out` Is not the http.Response and is deprecated, you can get the output writer by doing `http.Response.GetWriter()`. You can get the `http.Response` from revel.Controller.Response.Out.Server.GetRaw().(*http.Response)` -* `Websocket` changes. `revel.ServerWebsocket` is the new type of object you need to declare for controllers +* `Websocket` changes. `revel.ServerWebsocket` is the new type of object you need to declare for controllers which should need to attach to websockets. Implementation of these objects have been simplified Old @@ -132,7 +132,7 @@ func (c WebSocket) RoomSocket(user string, ws revel.ServerWebSocket) revel.Resul } }() ``` -* GORM module has been refactored into modules/orm/gorm +* GORM module has been refactored into modules/orm/gorm ### Deprecated methods @@ -149,7 +149,7 @@ func (c WebSocket) RoomSocket(user string, ws revel.ServerWebSocket) revel.Resul * Pluggable server engine support. You can now implement **your own server engine**. This means if you need to listen to more then 1 IP address or port you can implement a custom server engine to do this. By default Revel uses GO http server, but also available is fasthttp server in the revel/modules repository. See the docs for more information on how to implement your own engine. ### Enhancements -* Controller instances are cached for reuse. This speeds up the request response time and prevents unnecessary garbage collection cycles. +* Controller instances are cached for reuse. This speeds up the request response time and prevents unnecessary garbage collection cycles. ### Bug fixes @@ -199,24 +199,24 @@ Deprecating support for golang versions prior to 1.6 ### Features -* Modular Template Engine #1170 +* Modular Template Engine #1170 * Pongo2 engine driver added revel/modules#39 * Ace engine driver added revel/modules#40 -* Added i18n template support #746 +* Added i18n template support #746 ### Enhancements -* JSON request binding #1161 -* revel.SetSecretKey function added #1127 -* ResolveFormat now looks at the extension as well (this sets the content type) #936 +* JSON request binding #1161 +* revel.SetSecretKey function added #1127 +* ResolveFormat now looks at the extension as well (this sets the content type) #936 * Updated command to run tests using the configuration revel/cmd#61 ### Bug fixes * Updated documentation typos revel/modules#37 -* Updated order of parameter map assignment #1155 -* Updated cookie lifetime for firefox #1174 -* Added test path for modules, so modules will run tests as well #1162 +* Updated order of parameter map assignment #1155 +* Updated cookie lifetime for firefox #1174 +* Added test path for modules, so modules will run tests as well #1162 * Fixed go profiler module revel/modules#20 diff --git a/src/foundation/api/revel/README.md b/src/foundation/api/revel/README.md index c89e193..a415117 100644 --- a/src/foundation/api/revel/README.md +++ b/src/foundation/api/revel/README.md @@ -1,6 +1,6 @@ # Revel Framework -[![Build Status](https://secure.travis-ci.org/revel/revel.svg?branch=master)](http://travis-ci.org/revel/revel) +[![Build Status](https://secure.travis-ci.org/revel/revel.svg?branch=master)](http://travis-ci.org/revel/revel) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Go Report Card](https://goreportcard.com/badge/github.com/revel/revel)](https://goreportcard.com/report/github.com/revel/revel) diff --git a/src/foundation/api/revel/testdata/i18n/messages/dutch_messages.nl b/src/foundation/api/revel/testdata/i18n/messages/dutch_messages.nl index 2e75b47..90e4d15 100644 --- a/src/foundation/api/revel/testdata/i18n/messages/dutch_messages.nl +++ b/src/foundation/api/revel/testdata/i18n/messages/dutch_messages.nl @@ -1,4 +1,4 @@ -greeting=Hallo +greeting=Hallo greeting.name=Rob greeting.suffix=, welkom bij Revel! diff --git a/src/foundation/api/revel/testdata/i18n/messages/english_messages.en b/src/foundation/api/revel/testdata/i18n/messages/english_messages.en index 653bfd9..0538a7e 100644 --- a/src/foundation/api/revel/testdata/i18n/messages/english_messages.en +++ b/src/foundation/api/revel/testdata/i18n/messages/english_messages.en @@ -1,4 +1,4 @@ -greeting=Hello +greeting=Hello greeting.name=Rob greeting.suffix=, welcome to Revel! diff --git a/src/foundation/microk8s/main.tf b/src/foundation/microk8s/main.tf index e71d42a..1e1ef09 100644 --- a/src/foundation/microk8s/main.tf +++ b/src/foundation/microk8s/main.tf @@ -47,7 +47,7 @@ resource "aws_instance" "master" { provisioner "local-exec" { command = <> ~/.ssh/known_hosts scp -i terraform.pem ubuntu@${self.public_dns}:/microk8s.join_token . diff --git a/src/foundation/microk8s/readme b/src/foundation/microk8s/readme index 517da56..596e4ff 100644 --- a/src/foundation/microk8s/readme +++ b/src/foundation/microk8s/readme @@ -6,8 +6,8 @@ Pre-requisite ------------- 1. Install terraform - https://www.terraform.io/downloads.html - (a)Downlaod the zip file based on the server type. - (b)Unzip the file to get the terraform binary. + (a)Downlaod the zip file based on the server type. + (b)Unzip the file to get the terraform binary. (c)Currently supported ubuntu version is 18.04 2. IAM Access Keys - Permissions required for running the template - AmazonEC2FullAccess @@ -34,9 +34,9 @@ variable "secret_key" { Terraform template ------------------ -The template contains main.tf file, variable.tf file, pem file (add your pem file here) and worker_user_data.tmpl +The template contains main.tf file, variable.tf file, pem file (add your pem file here) and worker_user_data.tmpl You can move the pem file to the the directory where this template resides or you can change the location of the pem file in the main.tf file. - + Master's main.tf file -------------------- The first step to using Terraform is typically to configure the provider(s) you want to use. @@ -46,7 +46,7 @@ This tells Terraform that you are going to be using the AWS provider and that yo region = var.aws_region } -The user_data installs the microk8s inside the EC2 instance. +The user_data installs the microk8s inside the EC2 instance. #!/bin/bash sudo su @@ -60,7 +60,7 @@ The user_data installs the microk8s inside the EC2 instance. microk8s add-node > microk8s.join_token microk8s config > configFile -Since terraform does not wait until the user_data is executed, we exec into the instace by using the 'remote-exec' type provisioner and add the following script. This script will make terraform wait util microk8s.join-token file is created. +Since terraform does not wait until the user_data is executed, we exec into the instace by using the 'remote-exec' type provisioner and add the following script. This script will make terraform wait util microk8s.join-token file is created. provisioner "remote-exec" { inline = ["until [ -f /microk8s.join_token ]; do sleep 5; done; cat /microk8s.join_token"] @@ -77,15 +77,15 @@ For example, if you want to change the aws_instace type from t2.small to t2.micr description = "instance_type" default = "t2.small" } -Other resource specific values like aws_region, aws_ami, vpc and the subenet can also be changed the same way by editing the variable.tf file. +Other resource specific values like aws_region, aws_ami, vpc and the subenet can also be changed the same way by editing the variable.tf file. Apply terraform --------------- -To create a master node with microk8s, run the following commands. +To create a master node with microk8s, run the following commands. terraform init terraform plan terraform apply -Once the worked nodes are created, it will be connected to the master. A multi-node k8s cluster will be provisioned with calico CNI. +Once the worked nodes are created, it will be connected to the master. A multi-node k8s cluster will be provisioned with calico CNI. diff --git a/src/foundation/scripts/cni/calico/k8s-new/calico-3.24.3-install-vxlan.yaml b/src/foundation/scripts/cni/calico/k8s-new/calico-3.24.3-install-vxlan.yaml index 54ab835..30f7184 100644 --- a/src/foundation/scripts/cni/calico/k8s-new/calico-3.24.3-install-vxlan.yaml +++ b/src/foundation/scripts/cni/calico/k8s-new/calico-3.24.3-install-vxlan.yaml @@ -4179,7 +4179,7 @@ rules: resources: - endpointslices verbs: - - watch + - watch - list - apiGroups: [""] resources: diff --git a/src/foundation/scripts/cni/multus/multus-sriov-calico/multus-sriov-calico-daemonsets-k8s-v1.16.yaml b/src/foundation/scripts/cni/multus/multus-sriov-calico/multus-sriov-calico-daemonsets-k8s-v1.16.yaml index 0238e6d..32e89a9 100644 --- a/src/foundation/scripts/cni/multus/multus-sriov-calico/multus-sriov-calico-daemonsets-k8s-v1.16.yaml +++ b/src/foundation/scripts/cni/multus/multus-sriov-calico/multus-sriov-calico-daemonsets-k8s-v1.16.yaml @@ -387,7 +387,7 @@ metadata: spec: selector: matchLabels: - name: sriov-cni + name: sriov-cni template: metadata: labels: diff --git a/src/foundation/scripts/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 b/src/foundation/scripts/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 index fd02efd..fae0d84 100644 --- a/src/foundation/scripts/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 +++ b/src/foundation/scripts/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 @@ -21,7 +21,7 @@ metadata: # Create the service account and policies. # ovnkube interacts with kubernetes and the environment # must be properly set up. -# +# # This provisioning is done as part of installation after the cluster is # up and before the ovn daemonsets are created. diff --git a/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-monitor.yaml b/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-monitor.yaml index fe537f8..eb88e72 100644 --- a/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-monitor.yaml +++ b/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-monitor.yaml @@ -42,7 +42,6 @@ spec: protocol: TCP targetPort: 9409 --- - apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -82,7 +81,6 @@ spec: port: 9410 protocol: TCP targetPort: 9410 - --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-node.yaml b/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-node.yaml index a371538..6e68c4f 100644 --- a/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-node.yaml +++ b/src/foundation/scripts/cni/ovn-kubernetes/yaml/ovnkube-node.yaml @@ -165,7 +165,6 @@ spec: capabilities: add: ["NET_ADMIN", "SYS_ADMIN", "SYS_PTRACE"] - terminationMessagePolicy: FallbackToLogsOnError volumeMounts: # for the iptables wrapper @@ -193,7 +192,6 @@ spec: name: host-ovn-cert readOnly: true - resources: requests: cpu: 100m @@ -294,6 +292,5 @@ spec: hostPath: path: /etc/origin/openvswitch - tolerations: - operator: "Exists" diff --git a/src/foundation/service_mesh/Istio/istio-demo-arm64.yaml b/src/foundation/service_mesh/Istio/istio-demo-arm64.yaml index bb1690c..aa5110b 100644 --- a/src/foundation/service_mesh/Istio/istio-demo-arm64.yaml +++ b/src/foundation/service_mesh/Istio/istio-demo-arm64.yaml @@ -810,7 +810,7 @@ metadata: release: istio istio: galley data: - validatingwebhookconfiguration.yaml: |- + validatingwebhookconfiguration.yaml: |- apiVersion: admissionregistration.k8s.io/v1beta1 kind: ValidatingWebhookConfiguration metadata: @@ -941,7 +941,7 @@ metadata: release: istio istio: grafana data: - custom-resources.yaml: |- + custom-resources.yaml: |- apiVersion: authentication.istio.io/v1alpha1 kind: Policy metadata: @@ -957,18 +957,18 @@ data: - name: grafana ports: - number: 3000 - run.sh: |- + run.sh: |- #!/bin/sh - + set -x - + if [ "$#" -ne "1" ]; then echo "first argument should be path to custom resource yaml" exit 1 fi - + pathToResourceYAML=${1} - + kubectl get validatingwebhookconfiguration istio-galley 2>/dev/null if [ "$?" -eq 0 ]; then echo "istio-galley validatingwebhookconfiguration found - waiting for istio-galley deployment to be ready" @@ -988,7 +988,7 @@ data: fi sleep 5 kubectl apply -f ${pathToResourceYAML} - + --- # Source: istio/charts/grafana/templates/configmap-dashboards.yaml @@ -14212,7 +14212,7 @@ data: orgId: 1 type: prometheus url: http://prometheus:9090 - + dashboardproviders.yaml: | apiVersion: 1 providers: @@ -14223,7 +14223,7 @@ data: path: /var/lib/grafana/dashboards/istio orgId: 1 type: file - + --- # Source: istio/charts/kiali/templates/configmap.yaml apiVersion: v1 @@ -14246,9 +14246,9 @@ data: web_root: /kiali external_services: tracing: - url: + url: grafana: - url: + url: prometheus: url: http://prometheus:9090 @@ -14650,14 +14650,14 @@ data: sdsUdsPath: # This flag is used by secret discovery service(SDS). - # If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount - # for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which + # If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount + # for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which # will be used to generate key/cert eventually. This isn't supported for non-k8s case. enableSdsTokenMount: false # This flag is used by secret discovery service(SDS). - # If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' - # (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) + # If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' + # (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) # and pass to sds server, which will be used to request key/cert eventually. # this flag is ignored if enableSdsTokenMount is set. # This isn't supported for non-k8s case. @@ -16671,7 +16671,7 @@ spec: resources: requests: cpu: 10m - + volumes: - name: certs secret: @@ -17287,7 +17287,7 @@ spec: resources: requests: cpu: 10m - + volumes: - name: kiali-configuration configMap: @@ -17437,7 +17437,7 @@ spec: requests: cpu: 10m memory: 100Mi - + volumeMounts: - name: istio-certs mountPath: /etc/certs @@ -17492,7 +17492,7 @@ spec: requests: cpu: 10m memory: 40Mi - + volumeMounts: - name: istio-certs mountPath: /etc/certs @@ -17673,7 +17673,7 @@ spec: requests: cpu: 10m memory: 40Mi - + volumeMounts: - name: istio-certs mountPath: /etc/certs @@ -17767,7 +17767,7 @@ spec: requests: cpu: 10m memory: 100Mi - + volumeMounts: - name: config-volume mountPath: /etc/istio/config @@ -17912,7 +17912,7 @@ spec: resources: requests: cpu: 10m - + volumeMounts: - name: config-volume mountPath: /etc/prometheus @@ -18010,7 +18010,7 @@ spec: resources: requests: cpu: 10m - + affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -18122,7 +18122,7 @@ spec: resources: requests: cpu: 10m - + volumes: - name: config-volume configMap: @@ -18227,7 +18227,7 @@ spec: - name: MEMORY_MAX_TRACES value: "50000" - name: QUERY_BASE_PATH - value: /jaeger + value: /jaeger livenessProbe: httpGet: path: / @@ -18239,7 +18239,7 @@ spec: resources: requests: cpu: 10m - + affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: diff --git a/src/tools/wrk_test.sh b/src/tools/wrk_test.sh index 86cd318..89c067b 100755 --- a/src/tools/wrk_test.sh +++ b/src/tools/wrk_test.sh @@ -8,7 +8,7 @@ END=5 urlIP=${1:-172.26.12.101} urlPort=${2:-30942} - + IFS_OLD=$IFS IFS=$'\n' @@ -18,7 +18,7 @@ runCmd(){ for (( c=$START; c<=$END; c++)) do - + #curl -w "%{time_total}\n" -o /dev/null -s http://$svcIP cmd=$1 echo "Round:"$c"--"$cmd @@ -45,7 +45,7 @@ do sleep 0.1 done -done +done echo "Latency:" for (( c=$START; c<=$END; c++)) diff --git a/src/type3_AndroidCloud/anbox-master/COPYING.GPL b/src/type3_AndroidCloud/anbox-master/COPYING.GPL index 4432540..bf0f7d3 100644 --- a/src/type3_AndroidCloud/anbox-master/COPYING.GPL +++ b/src/type3_AndroidCloud/anbox-master/COPYING.GPL @@ -77,7 +77,7 @@ modification follow. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/shared/OpenglCodecCommon/GLSharedGroup.h b/src/type3_AndroidCloud/anbox-master/android/opengl/shared/OpenglCodecCommon/GLSharedGroup.h index 6dfcd8f..3b71e98 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/shared/OpenglCodecCommon/GLSharedGroup.h +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/shared/OpenglCodecCommon/GLSharedGroup.h @@ -41,7 +41,7 @@ struct BufferData { BufferData(); BufferData(GLsizeiptr size, void * data); GLsizeiptr m_size; - FixedBuffer m_fixedBuffer; + FixedBuffer m_fixedBuffer; }; class ProgramData { @@ -119,7 +119,7 @@ public: bool isProgram(GLuint program); bool isProgramInitialized(GLuint program); - void addProgramData(GLuint program); + void addProgramData(GLuint program); void initProgramData(GLuint program, GLuint numIndexes); void attachShader(GLuint program, GLuint shader); void detachShader(GLuint program, GLuint shader); @@ -139,6 +139,6 @@ public: void unrefShaderData(GLuint shader); }; -typedef SmartPtr GLSharedGroupPtr; +typedef SmartPtr GLSharedGroupPtr; #endif //_GL_SHARED_GROUP_H_ diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/GLEncoder.h b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/GLEncoder.h index f6d4b6a..0bbc308 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/GLEncoder.h +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/GLEncoder.h @@ -76,7 +76,7 @@ private: glBufferData_client_proc_t m_glBufferData_enc; glBufferSubData_client_proc_t m_glBufferSubData_enc; glDeleteBuffers_client_proc_t m_glDeleteBuffers_enc; - + glEnableClientState_client_proc_t m_glEnableClientState_enc; glDisableClientState_client_proc_t m_glDisableClientState_enc; glIsEnabled_client_proc_t m_glIsEnabled_enc; diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/gl_client_proc.h b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/gl_client_proc.h index 707c524..f2747c0 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/gl_client_proc.h +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv1_enc/gl_client_proc.h @@ -7,7 +7,7 @@ #include "gl_types.h" #ifndef gl_APIENTRY -#define gl_APIENTRY +#define gl_APIENTRY #endif typedef void (gl_APIENTRY *glAlphaFunc_client_proc_t) (void * ctx, GLenum, GLclampf); typedef void (gl_APIENTRY *glClearColor_client_proc_t) (void * ctx, GLclampf, GLclampf, GLclampf, GLclampf); diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv2_enc/gl2_client_proc.h b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv2_enc/gl2_client_proc.h index 445910d..1a9f696 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv2_enc/gl2_client_proc.h +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/GLESv2_enc/gl2_client_proc.h @@ -7,7 +7,7 @@ #include "gl2_types.h" #ifndef gl2_APIENTRY -#define gl2_APIENTRY +#define gl2_APIENTRY #endif typedef void (gl2_APIENTRY *glActiveTexture_client_proc_t) (void * ctx, GLenum); typedef void (gl2_APIENTRY *glAttachShader_client_proc_t) (void * ctx, GLuint, GLuint); diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/egl/ClientAPIExts.cpp b/src/type3_AndroidCloud/anbox-master/android/opengl/system/egl/ClientAPIExts.cpp index 5e81afe..095a2b1 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/egl/ClientAPIExts.cpp +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/egl/ClientAPIExts.cpp @@ -135,7 +135,7 @@ static const struct _client_ext_funcs { } s_client_ext_funcs[] = { #include "ClientAPIExts.in" }; -static const int numExtFuncs = sizeof(s_client_ext_funcs) / +static const int numExtFuncs = sizeof(s_client_ext_funcs) / sizeof(s_client_ext_funcs[0]); #undef API_ENTRY diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/README b/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/README index 349b6db..d623914 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/README +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/README @@ -30,7 +30,7 @@ EGLint rcGetConfigs(uint32_t bufSize, GLuint* buffer); with their attribute values. bufSize is the size of buffer, the size should be at least equal to (numConfigs + 1) * numAttribs * sizeof(GLuint) - where numConfigs and numAttribs are the values returned in + where numConfigs and numAttribs are the values returned in rcGetNumConfigs. if bufSize is not big enough then the negative number of required bytes is returned otherwise the function returns the number of configs and buffer is filled as follows: The first 'numAttribs' @@ -40,13 +40,13 @@ EGLint rcGetConfigs(uint32_t bufSize, GLuint* buffer); in the same order as the attribute vector. EGLint rcChooseConfig(EGLint *attribs, uint32_t attribs_size, uint32_t *configs, uint32_t configs_size) - This function triggers an eglChooseConfig on the host, to get a list of + This function triggers an eglChooseConfig on the host, to get a list of configs matching the given attribs values. attribs - a list of attribute names followed by the desired values, terminated by EGL_NONE attribs_size - the size of the list configs - the returned matching configuration names (same names as familiar to the client in rcGetConfigs) configs_size - the size of the configs buffers - returns - the actual number of matching configurations (<= configs_size) + returns - the actual number of matching configurations (<= configs_size) EGLint rcGetFBParam(EGLint param); queries the host for framebuffer parameter, see renderControl_types.h @@ -73,7 +73,7 @@ void rcDestroyWindowSurface(uint32_t windowSurface); uint32_t rcCreateColorBuffer(uint32_t width, uint32_t height, GLenum internalFormat); This function creates a colorBuffer object on the host which can be then - be specified as a render target for a window surface through + be specified as a render target for a window surface through rcSetWindowColorBuffer or to be displayed on the framebuffer window through rcFBPost. The function returns a handle to the colorBuffer object, with an initial @@ -96,7 +96,7 @@ void rcSetWindowColorBuffer(uint32_t windowSurface, uint32_t colorBuffer); colorBuffer. EGLint rcMakeCurrent(uint32_t context, uint32_t drawSurf, uint32_t readSurf); - Binds a windowSurface(s) and current rendering context for the + Binds a windowSurface(s) and current rendering context for the calling thread. void rcFBPost(uint32_t colorBuffer); @@ -122,15 +122,15 @@ EGLint rcColorBufferCacheFlush(uint32_t colorbuffer, EGLint postCount, int forRe with non-zero 'forRead' value, otherwise the function returns zero or negative value on failure. -void rcReadColorBuffer(uint32_t colorbuffer, GLint x, GLint y, - GLint width, GLint height, GLenum format, +void rcReadColorBuffer(uint32_t colorbuffer, GLint x, GLint y, + GLint width, GLint height, GLenum format, GLenum type, void* pixels); This function queries the host for the pixel content of a colorBuffer's subregion. It act the same as OpenGL glReadPixels however pixels are always packed with alignment of 1. -void rcUpdateColorBuffer(uint32_t colorbuffer, GLint x, GLint y, - GLint width, GLint height, GLenum format, +void rcUpdateColorBuffer(uint32_t colorbuffer, GLint x, GLint y, + GLint width, GLint height, GLenum format, GLenum type, void* pixels); Updates the content of a subregion of a colorBuffer object. pixels are always unpacked with alignment of 1. diff --git a/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/renderControl_client_proc.h b/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/renderControl_client_proc.h index 565fd12..80a42ce 100644 --- a/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/renderControl_client_proc.h +++ b/src/type3_AndroidCloud/anbox-master/android/opengl/system/renderControl_enc/renderControl_client_proc.h @@ -7,7 +7,7 @@ #include "renderControl_types.h" #ifndef renderControl_APIENTRY -#define renderControl_APIENTRY +#define renderControl_APIENTRY #endif typedef GLint (renderControl_APIENTRY *rcGetRendererVersion_client_proc_t) (void * ctx); typedef EGLint (renderControl_APIENTRY *rcGetEGLVersion_client_proc_t) (void * ctx, EGLint*, EGLint*); diff --git a/src/type3_AndroidCloud/anbox-master/android/sensors/sensors_qemu.c b/src/type3_AndroidCloud/anbox-master/android/sensors/sensors_qemu.c index b0e858c..737bedc 100644 --- a/src/type3_AndroidCloud/anbox-master/android/sensors/sensors_qemu.c +++ b/src/type3_AndroidCloud/anbox-master/android/sensors/sensors_qemu.c @@ -336,7 +336,7 @@ static int sensor_device_poll_event_locked(SensorDevice* dev) events[ID_TEMPERATURE].type = SENSOR_TYPE_TEMPERATURE; continue; } - + /* "proximity:" */ if (sscanf(buff, "proximity:%g", params+0) == 1) { new_sensors |= SENSORS_PROXIMITY; diff --git a/src/type3_AndroidCloud/anbox-master/cross-compile-chroot.sh b/src/type3_AndroidCloud/anbox-master/cross-compile-chroot.sh index 15f8e35..d4d8114 100644 --- a/src/type3_AndroidCloud/anbox-master/cross-compile-chroot.sh +++ b/src/type3_AndroidCloud/anbox-master/cross-compile-chroot.sh @@ -38,7 +38,7 @@ BUILD_DIR=build-android-arm NUM_JOBS=5 _do_update_chroot=0 -# Default to vivid as we don't seem to have any working wily devices right now +# Default to vivid as we don't seem to have any working wily devices right now dist=vivid clean=0 update_build_dir=0 @@ -97,12 +97,12 @@ if [ "${AC_NDK_PATH}" = "" ]; then export AC_NDK_PATH=~/.cache/anbox-${target_arch}-chroot-${dist} fi -if [ ! -d ${AC_NDK_PATH} ]; then +if [ ! -d ${AC_NDK_PATH} ]; then echo "no partial chroot dir detected. attempting to create one" _do_update_chroot=1 fi -if [ ! -d ${BUILD_DIR} ]; then +if [ ! -d ${BUILD_DIR} ]; then mkdir ${BUILD_DIR} fi diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/DESIGN b/src/type3_AndroidCloud/anbox-master/external/android-emugl/DESIGN index 943a0e4..87da16a 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/DESIGN +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/DESIGN @@ -148,7 +148,7 @@ of components, which are: | | | - - - | - - - - - - - - - | - - - - - - - - - | - - - - - | | | - ____v____ ____v_____ _____v____ HOST + ____v____ ____v_____ _____v____ HOST | | | | | | SYSTEM | GLX | | GL 2.0 | | GL 2.0 | LIBRARIES |_________| |__________| |__________| diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/README b/src/type3_AndroidCloud/anbox-master/external/android-emugl/README index 8db2d9d..fe3fcfc 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/README +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/README @@ -75,7 +75,7 @@ to debug the various modules described above: tests/ut_rendercontrol_dec -> host library used by tests/ut_renderer tests/ut_renderer -> unit-test for render control and rendering library. - + II. Build system considerations: -------------------------------- diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv1_dec/gles1.attrib b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv1_dec/gles1.attrib index 8889bd7..cf5f5ab 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv1_dec/gles1.attrib +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv1_dec/gles1.attrib @@ -1,7 +1,7 @@ GLOBAL base_opcode 1024 encoder_headers "glUtils.h" "GLEncoderUtils.h" - + #void glClipPlanef(GLenum plane, GLfloat *equation) glClipPlanef dir equation in @@ -103,12 +103,12 @@ glCompressedTexSubImage2D #void glDeleteBuffers(GLsizei n, GLuint *buffers) glDeleteBuffers len buffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDeleteTextures(GLsizei n, GLuint *textures) glDeleteTextures len textures (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #this function is marked as unsupported - it shouldn't be called directly #instead it translated into - glDrawDirectElements and glDrawIndirectElements @@ -135,13 +135,13 @@ glGetBufferParameteriv glGenBuffers len buffers (n * sizeof(GLuint)) dir buffers out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenTextures(GLsizei n, GLuint *textures) glGenTextures len textures (n * sizeof(GLuint)) dir textures out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGetFixedv(GLenum pname, GLfixed *params) glGetFixedv @@ -475,13 +475,13 @@ glTexParameterxvOES glDeleteRenderbuffersOES dir renderbuffers in len renderbuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenRenderbuffersOES(GLsizei n, GLuint *renderbuffers) glGenRenderbuffersOES - dir renderbuffers out + dir renderbuffers out len renderbuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint *params) glGetRenderbufferParameterivOES @@ -492,13 +492,13 @@ glGetRenderbufferParameterivOES glDeleteFramebuffersOES dir framebuffers in len framebuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenFramebuffersOES(GLsizei n, GLuint *framebuffers) glGenFramebuffersOES dir framebuffers out len framebuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGetFramebufferAttachmentParameterivOES(GLenum target, GLenum attachment, GLenum pname, GLint *params) glGetFramebufferAttachmentParameterivOES @@ -573,13 +573,13 @@ glGetTexGenxvOES glDeleteVertexArraysOES dir arrays in len arrays (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenVertexArraysOES(GLsizei n, GLuint *arrays) glGenVertexArraysOES dir arrays out len arrays (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum *attachments) glDiscardFramebufferEXT @@ -589,7 +589,7 @@ glDiscardFramebufferEXT #void glMultiDrawArraysEXT(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount) glMultiDrawArraysEXT flag unsupported - + #void glMultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount) glMultiDrawElementsEXT flag unsupported @@ -597,7 +597,7 @@ glMultiDrawElementsEXT #void glMultiDrawArraysSUN(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount) glMultiDrawArraysSUN flag unsupported - + #void glMultiDrawElementsSUN(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount) glMultiDrawElementsSUN flag unsupported @@ -606,13 +606,13 @@ glMultiDrawElementsSUN glDeleteFencesNV dir fences in len fences (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenFencesNV(GLsizei n, GLuint *fences) glGenFencesNV dir fences in len fences (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGetFenceivNV(GLuint fence, GLenum pname, GLint *params) glGetFenceivNV diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib index d84a8b6..4df552c 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib @@ -29,22 +29,22 @@ glCompressedTexSubImage2D #void glDeleteBuffers(GLsizei n, GLuint *buffers) glDeleteBuffers len buffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDeleteFramebuffers(GLsizei n, GLuint *framebuffers) glDeleteFramebuffers len framebuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDeleteRenderbuffers(GLsizei n, GLuint *renderbuffers) glDeleteRenderbuffers len renderbuffers (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDeleteTextures(GLsizei n, GLuint *textures) glDeleteTextures len textures (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDrawElements(GLenum mode, GLsizei count, GLenum type, GLvoid *indices) glDrawElements @@ -54,25 +54,25 @@ glDrawElements glGenBuffers len buffers (n * sizeof(GLuint)) dir buffers out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenFramebuffers(GLsizei n, GLuint *framebuffers) glGenFramebuffers len framebuffers (n * sizeof(GLuint)) dir framebuffers out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenRenderbuffers(GLsizei n, GLuint *renderbuffers) glGenRenderbuffers len renderbuffers (n * sizeof(GLuint)) dir renderbuffers out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenTextures(GLsizei n, GLuint *textures) glGenTextures len textures (n * sizeof(GLuint)) dir textures out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name) glGetActiveAttrib @@ -88,7 +88,7 @@ glGetActiveAttrib dir type out len type (sizeof(GLenum)) var_flag type nullAllowed - + #void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name) glGetActiveUniform len name bufsize @@ -176,7 +176,7 @@ glGetShaderInfoLog var_flag length nullAllowed dir infolog out len infolog bufsize - + #void glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision) glGetShaderPrecisionFormat @@ -223,7 +223,7 @@ glGetUniformLocation # client-state shall be handled locally by the encoder in most cases. # however, GL_CURRENT_VERTEX_ATTRIB and potential others are handled by the server side, -# thus we still need to implement it. +# thus we still need to implement it. #void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) glGetVertexAttribfv dir params out @@ -263,7 +263,7 @@ glTexParameteriv glTexSubImage2D len pixels glesv2_enc::pixelDataSize(self, width, height, format, type, 0) var_flag pixels nullAllowed isLarge - + #void glUniform1fv(GLint location, GLsizei count, GLfloat *v) glUniform1fv len v (count * sizeof(GLfloat)) @@ -303,7 +303,7 @@ glUniformMatrix2fv #void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, GLfloat *value) glUniformMatrix3fv len value (count * 9 * sizeof(GLfloat)) - + #void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, GLfloat *value) glUniformMatrix4fv len value (count * 16 * sizeof(GLfloat)) @@ -346,7 +346,7 @@ glTexImage3DOES #void glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *pixels) glTexSubImage3DOES - len pixels glesv2_enc::pixelDataSize3D(self, width, height, depth, format, type, 0) + len pixels glesv2_enc::pixelDataSize3D(self, width, height, depth, format, type, 0) var_flag pixels nullAllowed isLarge #void glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLvoid *data) @@ -362,13 +362,13 @@ glCompressedTexSubImage3DOES #void glDeleteVertexArraysOES(GLsizei n, GLuint *arrays) glDeleteVertexArraysOES len arrays (n * sizeof(GLuint)) - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glGenVertexArraysOES(GLsizei n, GLuint *arrays) glGenVertexArraysOES len arrays (n * sizeof(GLuint)) dir arrays out - param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } + param_check n if(n<0){ ctx->setError(GL_INVALID_VALUE); return; } #void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, GLenum *attachments) @@ -554,7 +554,7 @@ glEndTilingQCOM #void glVertexAttribPointerData(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, void * data, GLuint datalen) glVertexAttribPointerData len data datalen - custom_pack data glUtilsPackPointerData((unsigned char *)ptr, (unsigned char *)data, size, type, stride, datalen) + custom_pack data glUtilsPackPointerData((unsigned char *)ptr, (unsigned char *)data, size, type, stride, datalen) flag custom_decoder flag not_api @@ -588,7 +588,7 @@ glShaderString len string len flag custom_decoder flag not_api - + glFinishRoundTrip flag custom_decoder flag not_api diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/ApiGen.cpp b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/ApiGen.cpp index f912cb5..41d14b0 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/ApiGen.cpp +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/ApiGen.cpp @@ -718,7 +718,7 @@ int ApiGen::genEncoderImpl(const std::string &filename) for (size_t i = 0; i < n; i++) { EntryPoint *e = &at(i); if (e->unsupported()) { - fprintf(fp, + fprintf(fp, "\tthis->%s = (%s_%s_proc_t) &enc_unsupported;\n", e->name().c_str(), e->name().c_str(), @@ -767,8 +767,8 @@ int ApiGen::genDecoderHeader(const std::string &filename) fprintf(fp, "struct %s : public %s_%s_context_t {\n\n", classname.c_str(), m_basename.c_str(), sideString(SERVER_SIDE)); fprintf(fp, "\tsize_t decode(void *buf, size_t bufsize, IOStream *stream);\n"); - if (strcmp(classname.c_str(), "gles2_decoder_context_t") == 0){ - fprintf(fp, + if (strcmp(classname.c_str(), "gles2_decoder_context_t") == 0){ + fprintf(fp, "\tvoid freeShader(); \n\ \tvoid freeProgram(); \n\ \tstd::map m_programs; \n\ @@ -853,7 +853,7 @@ int ApiGen::genDecoderImpl(const std::string &filename) // glsl shader/program free; if (strcmp(classname.c_str(), "gles2_decoder_context_t") == 0) { fprintf(fp, "void %s::freeShader(){\n", classname.c_str()); - fprintf(fp, + fprintf(fp, " \n\ \tauto it = m_shaders.begin();\n\ \tm_lock.lock();\n\ @@ -866,7 +866,7 @@ int ApiGen::genDecoderImpl(const std::string &filename) }\n\n"); fprintf(fp, "void %s::freeProgram(){\n", classname.c_str()); - fprintf(fp, + fprintf(fp, " \n\ \tauto it = m_programs.begin(); \n\ \tm_lock.lock();\n\ @@ -1211,7 +1211,7 @@ int ApiGen::genDecoderImpl(const std::string &filename) m_shaders.insert({var_shader, 1});\n\ m_lock.unlock();\n"); } else if(strcmp(e->name().c_str(), "glDeleteProgram") == 0){ - fprintf(fp, + fprintf(fp, "\t\t\tm_lock.lock(); \n" "\t\t\tauto pro = m_programs.find(var_program); \n" "\t\t\tif (pro != m_programs.end()) \n" @@ -1220,7 +1220,7 @@ int ApiGen::genDecoderImpl(const std::string &filename) "\t\t\t}\n" "\t\t\tm_lock.unlock();\n"); } else if(strcmp(e->name().c_str(), "glDeleteShader") == 0){ - fprintf(fp, + fprintf(fp, "\t\t\tm_lock.lock(); \n\ \t\t\tauto shader = m_shaders.find(var_shader); \n\ \t\t\tif (shader != m_shaders.end()) \n\ diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/EntryPoint.cpp b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/EntryPoint.cpp index 8f91c83..6663c80 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/EntryPoint.cpp +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/EntryPoint.cpp @@ -65,8 +65,8 @@ bool EntryPoint::parse(unsigned int lc, const std::string & str) if (!parseTypeDeclaration(field, &retTypeName, &error)) { fprintf(stderr, "line: %d: Parsing error in field <%s>: %s\n", - lc, - field.c_str(), + lc, + field.c_str(), error.c_str()); return false; } diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/README b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/README index 0fe85f9..09f751b 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/README +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/README @@ -117,19 +117,19 @@ the files that are generated for this protocol. A line in the .in file has the following format: [prefix](retvalType, FuncName, [param name],...) -where +where retvalType - The function return value type FuncName - function name mandatory parameter type [param name] - optional parameter name Examples: -GL_ENTRY(void, glVertex1f, float v) +GL_ENTRY(void, glVertex1f, float v) XXX(int *, foo, int n, float, short) XXX(void, glFlush, void) Note: Empty lines in the file are ignored. A line starts with # is a comment -2. basename.attrib - Attributes information of the API. +2. basename.attrib - Attributes information of the API. This file includes additional flags, pointers datalen information and global attributes of the protocol. For uptodate format of the file, please refer to the specification file in the project source @@ -153,7 +153,7 @@ GLint 32 %d false GLint* 32 %p true GLptr 32 %p true -Encoder generated code files +Encoder generated code files ---------------------------- In order to generate the encoder files, one should run the ‘emugen’ tool as follows: @@ -176,7 +176,7 @@ provide a callback function that is used by the functions to access the encoder context. For example, such callback could fetch the context from a Thread Local Storage (TLS) location. -api_client_proc.h - type defintions for the protocol procedures. +api_client_proc.h - type defintions for the protocol procedures. api_client_context.h - defines the client side dispatch table data structure that stores the encoding functions. This data structure also @@ -191,7 +191,7 @@ encoder data structure inherits its functionality from the ‘client_context’ class above and adds encoding and streaming functionality. -api_enc.cpp - Encoder implementation. +api_enc.cpp - Encoder implementation. Decoder generated files ----------------------- @@ -311,7 +311,7 @@ custom_pack to the codec, out from data that returns from the codec. format: dir <[in | out | inout]> - var_flag + var_flag description : set variable flags format: var_flag < nullAllowed | isLarge | ... > @@ -319,10 +319,10 @@ custom_pack isLarge -> for pointer variables, indicates that the data should be sent without an intermediate copy flag - description: set entry point flag; + description: set entry point flag; format: flag < unsupported | ... > supported flags are: - unsupported - The encoder side implementation is pointed to "unsuppored reporting function". + unsupported - The encoder side implementation is pointed to "unsuppored reporting function". custom_decoder - The decoder is expected to be provided with custom implementation. The call to the deocder function includes a pointer to the diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.cpp b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.cpp index 8122de0..df513d0 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.cpp +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.cpp @@ -32,18 +32,18 @@ using namespace emugl; size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) { - + size_t pos = 0; - if (len < 8) return pos; + if (len < 8) return pos; unsigned char *ptr = (unsigned char *)buf; - bool unknownOpcode = false; -#ifdef CHECK_GL_ERROR - char lastCall[256] = {0}; -#endif - while ((len - pos >= 8) && !unknownOpcode) { - uint32_t opcode = *(uint32_t *)ptr; + bool unknownOpcode = false; +#ifdef CHECK_GL_ERROR + char lastCall[256] = {0}; +#endif + while ((len - pos >= 8) && !unknownOpcode) { + uint32_t opcode = *(uint32_t *)ptr; size_t packetLen = *(uint32_t *)(ptr + 4); - if (len - pos < packetLen) return pos; + if (len - pos < packetLen) return pos; bool useChecksum = ChecksumCalculatorThreadInfo::getVersion() > 0; size_t checksumSize = 0; if (useChecksum) { @@ -54,7 +54,7 @@ size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) FooInt var_func = Unpack(ptr + 8); FooFloat var_ref = Unpack(ptr + 8 + 4); if (useChecksum) { - ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + 4, ptr + 8 + 4 + 4, checksumSize, + ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + 4, ptr + 8 + 4 + 4, checksumSize, "8 + 4 + 4::decode, OP_foo_decoder_context_t: GL checksumCalculator failure\n"); } DEBUG("foo(%p): fooAlphaFunc(%d %f )\n", stream,var_func, var_ref); @@ -66,7 +66,7 @@ size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) uint32_t size_stuff __attribute__((unused)) = Unpack(ptr + 8); InputBuffer inptr_stuff(ptr + 8 + 4, size_stuff); if (useChecksum) { - ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_stuff, ptr + 8 + 4 + size_stuff, checksumSize, + ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_stuff, ptr + 8 + 4 + size_stuff, checksumSize, "8 + 4 + size_stuff::decode, OP_foo_decoder_context_t: GL checksumCalculator failure\n"); } size_t totalTmpSize = sizeof(FooBoolean); @@ -85,7 +85,7 @@ size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) uint32_t size_params __attribute__((unused)) = Unpack(ptr + 8); InputBuffer inptr_params(ptr + 8 + 4, size_params); if (useChecksum) { - ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_params, ptr + 8 + 4 + size_params, checksumSize, + ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_params, ptr + 8 + 4 + size_params, checksumSize, "8 + 4 + size_params::decode, OP_foo_decoder_context_t: GL checksumCalculator failure\n"); } DEBUG("foo(%p): fooUnsupported(%p(%u) )\n", stream,(void*)(inptr_params.get()), size_params); @@ -96,7 +96,7 @@ size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) case OP_fooDoEncoderFlush: { FooInt var_param = Unpack(ptr + 8); if (useChecksum) { - ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4, ptr + 8 + 4, checksumSize, + ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4, ptr + 8 + 4, checksumSize, "8 + 4::decode, OP_foo_decoder_context_t: GL checksumCalculator failure\n"); } DEBUG("foo(%p): fooDoEncoderFlush(%d )\n", stream,var_param); @@ -108,7 +108,7 @@ size_t foo_decoder_context_t::decode(void *buf, size_t len, IOStream *stream) uint32_t size_param __attribute__((unused)) = Unpack(ptr + 8); InputBuffer inptr_param(ptr + 8 + 4, size_param); if (useChecksum) { - ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_param, ptr + 8 + 4 + size_param, checksumSize, + ChecksumCalculatorThreadInfo::validOrDie(ptr, 8 + 4 + size_param, ptr + 8 + 4 + size_param, checksumSize, "8 + 4 + size_param::decode, OP_foo_decoder_context_t: GL checksumCalculator failure\n"); } DEBUG("foo(%p): fooTakeConstVoidPtrConstPtr(%p(%u) )\n", stream,(const void* const*)(inptr_param.get()), size_param); diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.h b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.h index 3646de5..dea42f2 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.h +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_dec.h @@ -4,7 +4,7 @@ #ifndef GUARD_foo_decoder_context_t #define GUARD_foo_decoder_context_t -#include "IOStream.h" +#include "IOStream.h" #include "foo_server_context.h" diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_server_proc.h b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_server_proc.h index bf7ff53..49b57c2 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_server_proc.h +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/decoder/foo_server_proc.h @@ -9,7 +9,7 @@ #include "emugl/common/logging.h" #ifndef foo_APIENTRY -#define foo_APIENTRY +#define foo_APIENTRY #endif typedef void (foo_APIENTRY *fooAlphaFunc_server_proc_t) (FooInt, FooFloat); typedef FooBoolean (foo_APIENTRY *fooIsBuffer_server_proc_t) (void*); diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/encoder/foo_client_proc.h b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/encoder/foo_client_proc.h index 6cf72d5..f00c0c7 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/encoder/foo_client_proc.h +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/encoder/foo_client_proc.h @@ -9,7 +9,7 @@ #include "emugl/common/logging.h" #ifndef foo_APIENTRY -#define foo_APIENTRY +#define foo_APIENTRY #endif typedef void (foo_APIENTRY *fooAlphaFunc_client_proc_t) (void * ctx, FooInt, FooFloat); typedef FooBoolean (foo_APIENTRY *fooIsBuffer_client_proc_t) (void * ctx, void*); diff --git a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/wrapper/foo_wrapper_proc.h b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/wrapper/foo_wrapper_proc.h index 421c910..7296e85 100644 --- a/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/wrapper/foo_wrapper_proc.h +++ b/src/type3_AndroidCloud/anbox-master/external/android-emugl/host/tools/emugen/tests/t.001/expected/wrapper/foo_wrapper_proc.h @@ -9,7 +9,7 @@ #include "emugl/common/logging.h" #ifndef foo_APIENTRY -#define foo_APIENTRY +#define foo_APIENTRY #endif typedef void (foo_APIENTRY *fooAlphaFunc_wrapper_proc_t) (FooInt, FooFloat); typedef FooBoolean (foo_APIENTRY *fooIsBuffer_wrapper_proc_t) (void*); diff --git a/src/type3_AndroidCloud/anbox-master/external/backward-cpp/BackwardConfig.cmake b/src/type3_AndroidCloud/anbox-master/external/backward-cpp/BackwardConfig.cmake index 6cff86c..8fa9b5f 100644 --- a/src/type3_AndroidCloud/anbox-master/external/backward-cpp/BackwardConfig.cmake +++ b/src/type3_AndroidCloud/anbox-master/external/backward-cpp/BackwardConfig.cmake @@ -196,7 +196,7 @@ if (NOT TARGET Backward::Backward) ) if(BACKWARD_HAS_EXTERNAL_LIBRARIES) set_target_properties(Backward::Backward PROPERTIES - INTERFACE_LINK_LIBRARIES "${BACKWARD_LIBRARIES}" + INTERFACE_LINK_LIBRARIES "${BACKWARD_LIBRARIES}" ) endif() endif() diff --git a/src/type3_AndroidCloud/anbox-master/external/backward-cpp/README.md b/src/type3_AndroidCloud/anbox-master/external/backward-cpp/README.md index 0eaab31..7aee25c 100644 --- a/src/type3_AndroidCloud/anbox-master/external/backward-cpp/README.md +++ b/src/type3_AndroidCloud/anbox-master/external/backward-cpp/README.md @@ -324,7 +324,7 @@ class Printer { public: FILE* print(StackTrace& st, FILE* fp = stderr); // Resolve and print a stack trace to the given std::ostream object. - // Color will only be used if color_mode is set to always. + // Color will only be used if color_mode is set to always. template std::ostream& print(ST& st, std::ostream& os); ``` diff --git a/src/type3_AndroidCloud/anbox-master/external/cpu_features/scripts/test_integration.sh b/src/type3_AndroidCloud/anbox-master/external/cpu_features/scripts/test_integration.sh index 53d1d3b..f73e8a1 100644 --- a/src/type3_AndroidCloud/anbox-master/external/cpu_features/scripts/test_integration.sh +++ b/src/type3_AndroidCloud/anbox-master/external/cpu_features/scripts/test_integration.sh @@ -7,7 +7,7 @@ function set_aarch64-linux-gnu() { QEMU_ARCH=aarch64 } -# Toolchains for little-endian, hard-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems +# Toolchains for little-endian, hard-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems function set_arm-linux-gnueabihf() { TOOLCHAIN=LINARO TARGET=arm-linux-gnueabihf diff --git a/src/type3_AndroidCloud/anbox-master/external/cpu_features/test/cpuinfo_arm_test.cc b/src/type3_AndroidCloud/anbox-master/external/cpu_features/test/cpuinfo_arm_test.cc index a72c566..514861b 100644 --- a/src/type3_AndroidCloud/anbox-master/external/cpu_features/test/cpuinfo_arm_test.cc +++ b/src/type3_AndroidCloud/anbox-master/external/cpu_features/test/cpuinfo_arm_test.cc @@ -82,17 +82,17 @@ TEST(CpuinfoArmTest, InvalidArmv7) { DisableHardwareCapabilities(); auto& fs = GetEmptyFilesystem(); fs.CreateFile("/proc/cpuinfo", - R"(Processor : ARMv6-compatible processor rev 6 (v6l) -BogoMIPS : 199.47 -Features : swp half thumb fastmult vfp edsp java -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x0 -CPU part : 0xb76 -CPU revision : 6 - -Hardware : SPICA -Revision : 0020 + R"(Processor : ARMv6-compatible processor rev 6 (v6l) +BogoMIPS : 199.47 +Features : swp half thumb fastmult vfp edsp java +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xb76 +CPU revision : 6 + +Hardware : SPICA +Revision : 0020 Serial : 33323613546d00ec )"); const auto info = GetArmInfo(); EXPECT_EQ(info.architecture, 6); diff --git a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/include/core/connection.h b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/include/core/connection.h index 03dbaf8..10dbf52 100644 --- a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/include/core/connection.h +++ b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/include/core/connection.h @@ -30,7 +30,7 @@ class ScopedConnection; */ class Connection { -public: +public: typedef std::function&)> Dispatcher; /** diff --git a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/CMakeLists.txt b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/CMakeLists.txt index dec4659..bce14c5 100644 --- a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/CMakeLists.txt +++ b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/CMakeLists.txt @@ -17,7 +17,7 @@ add_library( process-cpp STATIC - + core/posix/backtrace.h core/posix/backtrace.cpp diff --git a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/CMakeLists.txt b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/CMakeLists.txt index fbbaa81..598df74 100644 --- a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/CMakeLists.txt +++ b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/CMakeLists.txt @@ -21,4 +21,3 @@ add_library( ) add_subdirectory(linux) - \ No newline at end of file diff --git a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/linux/CMakeLists.txt b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/linux/CMakeLists.txt index 19f87b4..7a45772 100644 --- a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/linux/CMakeLists.txt +++ b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/linux/CMakeLists.txt @@ -25,4 +25,3 @@ target_link_libraries( posix-process ) - \ No newline at end of file diff --git a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/this_process.cpp b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/this_process.cpp index 53f5241..b7baa49 100644 --- a/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/this_process.cpp +++ b/src/type3_AndroidCloud/anbox-master/external/process-cpp-minimal/src/core/posix/this_process.cpp @@ -58,7 +58,7 @@ void for_each(const std::function& auto it = ::environ; while (it != nullptr && *it != nullptr) { - std::string line(*it); + std::string line(*it); functor(line.substr(0,line.find_first_of('=')), line.substr(line.find_first_of('=')+1)); ++it; diff --git a/src/type3_AndroidCloud/anbox-master/external/xdg/CMakeLists.txt b/src/type3_AndroidCloud/anbox-master/external/xdg/CMakeLists.txt index 249da48..8a41552 100644 --- a/src/type3_AndroidCloud/anbox-master/external/xdg/CMakeLists.txt +++ b/src/type3_AndroidCloud/anbox-master/external/xdg/CMakeLists.txt @@ -1,5 +1,5 @@ -# We have to manually alter the cxx flags to have a working -# travis-ci build. Its container-based infrastructure only features +# We have to manually alter the cxx flags to have a working +# travis-ci build. Its container-based infrastructure only features # a very old cmake that does not support the more current: # set_property(TARGET xdg_test PROPERTY CXX_STANDARD 11) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") diff --git a/src/type3_AndroidCloud/anbox-master/external/xdg/xdg.cpp b/src/type3_AndroidCloud/anbox-master/external/xdg/xdg.cpp index d54fdfe..dc8b750 100644 --- a/src/type3_AndroidCloud/anbox-master/external/xdg/xdg.cpp +++ b/src/type3_AndroidCloud/anbox-master/external/xdg/xdg.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Thomas Voß -// +// // This library is free software: you can redistribute it and/or modify // it under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation, either version 3 of the License, or diff --git a/src/type3_AndroidCloud/anbox-master/scripts/setup-partial-chroot.sh b/src/type3_AndroidCloud/anbox-master/scripts/setup-partial-chroot.sh index 983a649..2bb8386 100644 --- a/src/type3_AndroidCloud/anbox-master/scripts/setup-partial-chroot.sh +++ b/src/type3_AndroidCloud/anbox-master/scripts/setup-partial-chroot.sh @@ -52,7 +52,7 @@ while getopts a:d:r:h opt; do sources="$sources source$sourceid" ;; :) - echo "Option -$OPTARG requires an argument" + echo "Option -$OPTARG requires an argument" usage exit 1 ;; @@ -61,7 +61,7 @@ while getopts a:d:r:h opt; do exit 0 ;; \?) - echo "Invalid option: -$OPTARG" + echo "Invalid option: -$OPTARG" usage exit 1 ;; @@ -79,7 +79,7 @@ directory=${1} echo "creating phablet-compatible $arch partial chroot for anbox compilation in directory ${directory}" if [ ! -d ${directory} ]; then - mkdir -p ${directory} + mkdir -p ${directory} fi DEBCONTROL=$(pwd)/../debian/control @@ -96,7 +96,7 @@ set +e # dpkg-checkbuilddeps returns non-zero when dependencies are not met and the list is sent to stderr builddeps=$(dpkg-checkbuilddeps -a ${arch} --admindir=. ${DEBCONTROL} 2>&1 ) if [ $? -eq 0 ] ; then - exit 0 + exit 0 fi echo "${builddeps}" @@ -158,7 +158,7 @@ suite=${dist} " >> mstrap.conf done -multistrap -f mstrap.conf +multistrap -f mstrap.conf rm -f var/cache/apt/archives/lock @@ -178,4 +178,4 @@ for broken_symlink in $(find . -name \*.so -type l -xtype l) ; do ln -sf $(pwd)$(readlink ${broken_symlink}) ${broken_symlink} done -popd > /dev/null +popd > /dev/null diff --git a/src/type3_AndroidCloud/anbox-master/src/anbox/cmds/check_features.cpp b/src/type3_AndroidCloud/anbox-master/src/anbox/cmds/check_features.cpp index 8a6f505..37e0fab 100644 --- a/src/type3_AndroidCloud/anbox-master/src/anbox/cmds/check_features.cpp +++ b/src/type3_AndroidCloud/anbox-master/src/anbox/cmds/check_features.cpp @@ -41,7 +41,7 @@ std::vector cpu_whitelist = { // Intel Core i7 Q720 "Q 720", // Intel Pentium T4500 - "T4500", + "T4500", // Intel Core i7 Q720 "Q 720", // Intel Xeon E5520 diff --git a/src/type3_AndroidCloud/anbox-master/src/anbox/graphics/emugl/RenderControl.cpp b/src/type3_AndroidCloud/anbox-master/src/anbox/graphics/emugl/RenderControl.cpp index 9f25585..75499ac 100644 --- a/src/type3_AndroidCloud/anbox-master/src/anbox/graphics/emugl/RenderControl.cpp +++ b/src/type3_AndroidCloud/anbox-master/src/anbox/graphics/emugl/RenderControl.cpp @@ -324,7 +324,7 @@ static void rcBindRenderbuffer(uint32_t colorBuffer) { renderer->bindColorBufferToRenderbuffer(colorBuffer); } -static EGLint rcColorBufferCacheFlush(uint32_t, EGLint, +static EGLint rcColorBufferCacheFlush(uint32_t, EGLint, int) { // XXX: TBD - should be implemented return 0; diff --git a/src/type3_AndroidCloud/anbox-master/src/anbox/platform/sdl/platform.cpp b/src/type3_AndroidCloud/anbox-master/src/anbox/platform/sdl/platform.cpp index 4c5b3a5..d0fa31a 100644 --- a/src/type3_AndroidCloud/anbox-master/src/anbox/platform/sdl/platform.cpp +++ b/src/type3_AndroidCloud/anbox-master/src/anbox/platform/sdl/platform.cpp @@ -284,7 +284,7 @@ void Platform::process_input_event(const SDL_Event &event) { } if (mouse_events.size() > 0) { - mouse_events.push_back({EV_SYN, SYN_REPORT, 0}); + mouse_events.push_back({EV_SYN, SYN_REPORT, 0}); pointer_->send_events(mouse_events); } @@ -326,7 +326,7 @@ void Platform::push_finger_down(int x, int y, int finger_id, std::vector &touch_events){ int slot = find_touch_slot(finger_id); - if (slot == -1) + if (slot == -1) return; push_slot(touch_events, slot); touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, -1}); @@ -336,7 +336,7 @@ void Platform::push_finger_up(int finger_id, std::vector &touch_ev void Platform::push_finger_motion(int x, int y, int finger_id, std::vector &touch_events){ int slot = find_touch_slot(finger_id); - if (slot == -1) + if (slot == -1) return; push_slot(touch_events, slot); touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x}); diff --git a/src/type3_AndroidCloud/anbox-master/src/anbox/runtime.cpp b/src/type3_AndroidCloud/anbox-master/src/anbox/runtime.cpp index 90c6768..853b440 100644 --- a/src/type3_AndroidCloud/anbox-master/src/anbox/runtime.cpp +++ b/src/type3_AndroidCloud/anbox-master/src/anbox/runtime.cpp @@ -53,13 +53,13 @@ std::shared_ptr Runtime::create(std::uint32_t pool_size) { Runtime::Runtime(std::uint32_t pool_size) : pool_size_{pool_size}, - + #if BOOST_VERSION >= 106600 service_{static_cast(pool_size_)}, #else service_{pool_size_}, #endif - + strand_{service_}, keep_alive_{service_} {} diff --git a/src/use_cases/seba_on_arm/README.rst b/src/use_cases/seba_on_arm/README.rst index 94ba303..318a4e7 100644 --- a/src/use_cases/seba_on_arm/README.rst +++ b/src/use_cases/seba_on_arm/README.rst @@ -29,7 +29,7 @@ SEBA on Arm Use Case .. _SEBA: https://wiki.opencord.org/display/CORD/SEBA SDN-Enabled Broadband Access (SEBA) is an Exemplar Platform being built by the ONF and CORD community, -which would also be a sample use case of IEC. +which would also be a sample use case of IEC. We would enable SEBA on arm with the native installation method for SEBA by great efforts. diff --git a/src/use_cases/seba_on_arm/docker/build/cord-tester/Dockerfile.cord-tester b/src/use_cases/seba_on_arm/docker/build/cord-tester/Dockerfile.cord-tester index 1ccbc24..b87b1fd 100644 --- a/src/use_cases/seba_on_arm/docker/build/cord-tester/Dockerfile.cord-tester +++ b/src/use_cases/seba_on_arm/docker/build/cord-tester/Dockerfile.cord-tester @@ -37,7 +37,7 @@ RUN apt update && apt install kubectl=$KUBE_VERSION RUN pip install virtualenv RUN apt-mark hold kubectl && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -RUN groupadd -r $TEST_USER && useradd -m -s /bin/bash -g $TEST_USER \ - --system -G sudo -p $(openssl passwd -1 $TEST_USER) $TEST_USER +RUN groupadd -r $TEST_USER && useradd -m -s /bin/bash -g $TEST_USER \ + --system -G sudo -p $(openssl passwd -1 $TEST_USER) $TEST_USER RUN echo "$TEST_USER\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/90-docker-users USER $TEST_USER diff --git a/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch b/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch index a1ab567..3cfd3d9 100644 --- a/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch +++ b/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch @@ -15,16 +15,16 @@ index 9cdcb4a..31ed20b 100644 --- a/templates/Dockerfile.j2 +++ b/templates/Dockerfile.j2 @@ -24,8 +24,8 @@ FROM centos:7 - + RUN yum update -y && yum install -y curl && yum clean all - + -COPY --from=golang /go/src/github.com/alexandruavadanii/beats/{{ beat }}/build/distributions/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz /tmp -RUN tar zxf /tmp/FIXME -C /tmp && \ +COPY --from=golang /go/src/github.com/elastic/beats/{{ beat }}/build/distributions/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz /tmp +RUN tar zxf /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz -C /tmp && \ mv /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64 {{ beat_home }} && \ rm /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz - --- + +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/cord-tester/0001-pin-pynacl-to-1.1.2-fixed-issue-of-pwhash_scrypt-fai.patch b/src/use_cases/seba_on_arm/patches/cord-tester/0001-pin-pynacl-to-1.1.2-fixed-issue-of-pwhash_scrypt-fai.patch index bb640aa..b86d05b 100644 --- a/src/use_cases/seba_on_arm/patches/cord-tester/0001-pin-pynacl-to-1.1.2-fixed-issue-of-pwhash_scrypt-fai.patch +++ b/src/use_cases/seba_on_arm/patches/cord-tester/0001-pin-pynacl-to-1.1.2-fixed-issue-of-pwhash_scrypt-fai.patch @@ -15,13 +15,13 @@ index d79dcb6..206a3a8 100644 +++ b/src/test/cord-api/Dockerfile.k8s-api-tester @@ -19,7 +19,7 @@ FROM python:2.7 - + RUN pip install httpie robotframework robotframework-requests pexpect \ - robotframework-sshlibrary robotframework-httplibrary robotframework-kafkalibrary pygments pyyaml tinydb && \ + robotframework-sshlibrary robotframework-httplibrary robotframework-kafkalibrary pygments pyyaml tinydb pynacl==1.1.2 && \ pip install -U requests && rm -rf /var/lib/apt/lists/* - + RUN mkdir -p /src/cord-api --- +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch b/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch index 817a9ab..5e728ed 100644 --- a/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch +++ b/src/use_cases/seba_on_arm/patches/kafka-exporter/0001-modify-Makefile-for-aarch64-support.patch @@ -13,14 +13,14 @@ index e2ba788..d44171c 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ release: promu github-release - + promu: @GOOS=$(shell uname -s | tr A-Z a-z) \ - GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \ + GOARCH=$(subst aarch64,arm64,$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))) \ $(GO) get -u github.com/prometheus/promu - + github-release: --- +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch b/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch index 08068e9..901d2d1 100644 --- a/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch +++ b/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch @@ -13,14 +13,14 @@ index 4d43b54..19782bb 100644 --- a/kafka/Dockerfile +++ b/kafka/Dockerfile @@ -5,7 +5,7 @@ ENV kafka_bin_version=2.12-$kafka_version - + RUN apk add --no-cache --update-cache --virtual build-dependencies curl ca-certificates \ && mkdir -p /opt/kafka \ - && curl -SLs "https://www-eu.apache.org/dist/kafka/$kafka_version/kafka_$kafka_bin_version.tgz" | tar -xzf - --strip-components=1 -C /opt/kafka \ + && curl -SLs "https://archive.apache.org/dist/kafka/$kafka_version/kafka_$kafka_bin_version.tgz" |tar -xzf - --strip-components=1 -C /opt/kafka \ && apk del build-dependencies \ && rm -rf /var/cache/apk/* - --- + +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch b/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch index 58b4151..fe41698 100644 --- a/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch +++ b/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch @@ -14,12 +14,12 @@ index 117b386..88195c6 100644 +++ b/Dockerfile @@ -1,13 +1,11 @@ FROM alpine:3.6 - + -LABEL MAINTAINER="Sergii Nuzhdin " - -ENV KUBE_LATEST_VERSION="v1.13.0" +ENV KUBE_LATEST_VERSION="v1.6.4" - + RUN apk add --update ca-certificates \ && apk add --update -t deps curl \ && apk add --update gettext \ @@ -28,6 +28,6 @@ index 117b386..88195c6 100644 && chmod +x /usr/local/bin/kubectl \ && apk del --purge deps \ && rm /var/cache/apk/* --- +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch b/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch index 09e505b..702858c 100644 --- a/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch +++ b/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch @@ -14,13 +14,13 @@ index c84eab6..9509770 100644 +++ b/Dockerfile.synchronizer @@ -16,7 +16,7 @@ # docker build -t xosproject/rcord-synchronizer:candidate -f Dockerfile.synchronizer . - + # xosproject/rcord-synchronizer -FROM xosproject/xos-synchronizer-base:2.1.25 +FROM cachengo/xos-synchronizer-base:2.1.38 - + COPY xos/synchronizer /opt/xos/synchronizers/rcord COPY VERSION /opt/xos/synchronizers/rcord/ --- +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch b/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch index 4492497..c26c3c2 100644 --- a/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch +++ b/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch @@ -19,9 +19,9 @@ index 5f2cfd2..004a069 100755 packaging==17.1 pexpect==4.6.0 +pynacl==1.1.2 - + # python-consul>=0.6.1 we need the pre-released version for now, because 0.6.1 does not # yet support Twisted. Once this is released, it will be the 0.6.2 version --- +-- 2.17.1 diff --git a/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch b/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch index 29d771c..ba471a9 100644 --- a/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch +++ b/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch @@ -15,14 +15,14 @@ index d015bb2..c6ceded 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,7 @@ jenkins-containers: base voltha ofagent netconf consul cli envoy fluentd unum j2 - + prod-containers: base voltha ofagent netconf shovel onos dashd cli grafana consul tools envoy fluentd unum j2 - + -seba-containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer envoy alarm-generator test_runner +seba-containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer envoy alarm-generator ponsim test_runner - + containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer grafana nginx consul tools envoy fluentd unum ponsim j2 alarm-generator test_runner - --- + +-- 2.17.1