Hello community, here is the log from the commit of package cilium-proxy for openSUSE:Factory checked in at 2020-09-29 19:00:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium-proxy (Old) and /work/SRC/openSUSE:Factory/.cilium-proxy.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium-proxy" Tue Sep 29 19:00:09 2020 rev:6 rq:837188 version:20200813 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium-proxy/cilium-proxy.changes 2020-08-04 20:18:00.500919147 +0200 +++ /work/SRC/openSUSE:Factory/.cilium-proxy.new.4249/cilium-proxy.changes 2020-09-29 19:00:35.709685424 +0200 @@ -1,0 +2,22 @@ +Thu Sep 17 08:46:45 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Relax constraints on aarch64 + +------------------------------------------------------------------- +Mon Sep 07 18:51:33 UTC 2020 - mroste...@suse.com + +- Update to version 20200813: + * istio: Update README.Istio.md to Istio 1.5.9 + * npds: Add TODO comments + * npds: Refine KafkaNetworkPolicyRule + * accesslog: Add Kafka support + * accesslog: Support Envoy filter metadata. + * npds: Support deny rules for L7 + * network_policy: Support L7 enforcement. + * bpf_metadata: Set requested application protocol + * docker: Limit Bazel local resources by default + * xDS: Send Node only on the first request. +- Remove the old patch for compatibility with Envoy 1.12.2: + * 0001-Adjust-cilium-proxy-to-Envoy-1.12.2.patch + +------------------------------------------------------------------- Old: ---- 0001-Adjust-cilium-proxy-to-Envoy-1.12.2.patch BUILD cilium-proxy-20200109.obscpio cilium-proxy.obsinfo New: ---- _servicedata cilium-proxy-20200813.tar.gz vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium-proxy.spec ++++++ --- /var/tmp/diff_new_pack.S6krTg/_old 2020-09-29 19:00:37.657687790 +0200 +++ /var/tmp/diff_new_pack.S6krTg/_new 2020-09-29 19:00:37.661687795 +0200 @@ -17,89 +17,151 @@ Name: cilium-proxy -Version: 20200109 +Version: 20200813 Release: 0 Summary: L7 proxy and communication bus for Cilium License: Apache-2.0 URL: https://github.com/cilium/proxy -Source0: %{name}-%{version}.tar.xz -Source1: BUILD -Patch0: 0001-Adjust-cilium-proxy-to-Envoy-1.12.2.patch -BuildRequires: abseil-cpp-source -BuildRequires: backward-cpp-devel -BuildRequires: bazel-apple-support-source -BuildRequires: bazel-gazelle-source -BuildRequires: bazel-platforms -BuildRequires: bazel-rules-apple-source -BuildRequires: bazel-rules-cc-source -BuildRequires: bazel-rules-foreign-cc-source -BuildRequires: bazel-rules-go-source -BuildRequires: bazel-rules-java-source -BuildRequires: bazel-rules-proto-source -BuildRequires: bazel-rules-python-source -BuildRequires: bazel-rules-swift-source -BuildRequires: bazel-skylib-source -BuildRequires: bazel-toolchains-source +Source0: %{name}-%{version}.tar.gz +# AUTOGENERATED BY obs-service-bazel_repositories +# vendor.tar.gz contains the following dependencies: +# - https://github.com/Cyan4973/xxHash/archive/v0.7.3.tar.gz +# - https://github.com/DataDog/dd-opentracing-cpp/archive/v1.1.3.tar.gz +# - https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz +# - https://github.com/Tencent/rapidjson/archive/dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1.tar.gz +# - https://github.com/abseil/abseil-cpp/archive/06f0e767d13d4d68071c4fc51e25724e0fc8bc74.tar.gz +# - https://github.com/apache/kafka/archive/2.4.0.zip +# - https://github.com/bazelbuild/apple_support/releases/download/0.7.2/apple_support.0.7.2.tar.gz +# - https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz +# - https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz +# - https://github.com/bazelbuild/bazel-toolchains/releases/download/2.2.0/bazel-toolchains-2.2.0.tar.gz +# - https://github.com/bazelbuild/platforms/archive/9ded0f9c3144258dad27ad84628845bcd7ca6fe6.zip +# - https://github.com/bazelbuild/rules_apple/releases/download/0.19.0/rules_apple.0.19.0.tar.gz +# - https://github.com/bazelbuild/rules_cc/archive/818289e5613731ae410efb54218a4077fb9dbb03.tar.gz +# - https://github.com/bazelbuild/rules_foreign_cc/archive/7bc4be735b0560289f6b86ab6136ee25d20b65b7.tar.gz +# - https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz +# - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip +# - https://github.com/bazelbuild/rules_proto/archive/2c0468366367d7ed97a1f702f9cd7155ab3f73c5.tar.gz +# - https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz +# - https://github.com/bazelbuild/rules_swift/releases/download/0.13.0/rules_swift.0.13.0.tar.gz +# - https://github.com/c-ares/c-ares/archive/d7e070e7283f822b1d2787903cce3615536c5610.tar.gz +# - https://github.com/census-instrumentation/opencensus-cpp/archive/04ed0211931f12b03c1a76b3907248ca4db7bc90.tar.gz +# - https://github.com/census-instrumentation/opencensus-proto/archive/be218fb6bd674af7519b1850cdf8410d8cbd48e8.tar.gz +# - https://github.com/circonus-labs/libcircllhist/archive/63a16dd6f2fc7bc841bb17ff92be8318df60e2e1.tar.gz +# - https://github.com/cncf/udpa/archive/e8cd3a4bb307e2c810cffff99f93e96e6d7fee85.tar.gz +# - https://github.com/envoyproxy/envoy-build-tools/archive/84ca08de00eedd0ba08e7d5551108d6f03f5d362.tar.gz +# - https://github.com/envoyproxy/protoc-gen-validate/archive/ab56c3dd1cf9b516b62c5087e1ec1471bd63631e.tar.gz +# - https://github.com/envoyproxy/sql-parser/archive/b14d010afd4313f2372a1cc96aa2327e674cc798.tar.gz +# - https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz +# - https://github.com/gabime/spdlog/archive/v1.4.0.tar.gz +# - https://github.com/golang/protobuf/archive/v1.4.1.zip +# - https://github.com/golang/tools/archive/2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd.zip +# - https://github.com/google/cel-cpp/archive/80e1cca533190d537a780ad007e8db64164c582e.tar.gz +# - https://github.com/google/jwt_verify_lib/archive/40e2cc938f4bcd059a97dc6c73f59ecfa5a71bac.tar.gz +# - https://github.com/google/re2/archive/2020-03-03.tar.gz +# - https://github.com/googleapis/googleapis/archive/82944da21578a53b74e547774cf62ed31a05b841.tar.gz +# - https://github.com/gperftools/gperftools/archive/gperftools-2.7.90.tar.gz +# - https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/faf8af1e9788cd4385b94c8f85edab5ea5d4b2d6.tar.gz +# - https://github.com/grpc/grpc/archive/d8f4928fa779f6005a7fe55a176bdb373b0f910f.tar.gz +# - https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz +# - https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz +# - https://github.com/lightstep/lightstep-tracer-cpp/archive/3efe2372ee3d7c2138d6b26e542d757494a7938d.tar.gz +# - https://github.com/mirror/tclap/archive/tclap-1-2-1-release-final.tar.gz +# - https://github.com/moonjit/moonjit/archive/2.2.0.tar.gz +# - https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.1/msgpack-3.2.1.tar.gz +# - https://github.com/nodejs/http-parser/archive/v2.9.3.tar.gz +# - https://github.com/opentracing/opentracing-cpp/archive/v1.5.1.tar.gz +# - https://github.com/openzipkin/zipkin-api/archive/0.2.2.tar.gz +# - https://github.com/pallets/jinja/archive/2.10.3.tar.gz +# - https://github.com/pallets/markupsafe/archive/1.1.1.tar.gz +# - https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz +# - https://github.com/protocolbuffers/protobuf-go/archive/v1.22.0.zip +# - https://github.com/protocolbuffers/protobuf/releases/download/v3.10.1/protobuf-all-3.10.1.tar.gz +# - https://github.com/protocolbuffers/upb/archive/8a3ae1ef3e3e3f26b45dec735c5776737fc7247f.tar.gz +# - https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/9ded0f9c3144258dad27ad84628845bcd7ca6fe6.zip +# - https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip +# - https://mirror.bazel.build/github.com/golang/protobuf/archive/v1.4.1.zip +# - https://mirror.bazel.build/github.com/golang/tools/archive/2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd.zip +# - https://mirror.bazel.build/github.com/protocolbuffers/protobuf-go/archive/v1.22.0.zip +Source1: vendor.tar.gz +# END obs-service-bazel_repositories +# AUTOGENERATED BY obs-service-bazel_repositories +Provides: bundled(abseil-cpp) = 06f0e767d13d4d68071c4fc51e25724e0fc8bc74 +Provides: bundled(apple_support) = 0.7.2 +Provides: bundled(bazel-gazelle) = 0.19.1 +Provides: bundled(bazel-skylib) = 0.9.0 +Provides: bundled(bazel-toolchains) = 2.2.0 +Provides: bundled(c-ares) = d7e070e7283f822b1d2787903cce3615536c5610 +Provides: bundled(cel-cpp) = 80e1cca533190d537a780ad007e8db64164c582e +Provides: bundled(client_model) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(dd-opentracing-cpp) = 1.1.3 +Provides: bundled(envoy-build-tools) = 84ca08de00eedd0ba08e7d5551108d6f03f5d362 +Provides: bundled(fmt) = 6.0.0 +Provides: bundled(googleapis) = 82944da21578a53b74e547774cf62ed31a05b841 +Provides: bundled(gperftools) = 2.7.90 +Provides: bundled(grpc) = d8f4928fa779f6005a7fe55a176bdb373b0f910f +Provides: bundled(grpc-httpjson-transcoding) = faf8af1e9788cd4385b94c8f85edab5ea5d4b2d6 +Provides: bundled(http-parser) = 2.9.3 +Provides: bundled(jinja) = 2.10.3 +Provides: bundled(jwt_verify_lib) = 40e2cc938f4bcd059a97dc6c73f59ecfa5a71bac +Provides: bundled(kafka) = 2.4.0 +Provides: bundled(libcircllhist) = 63a16dd6f2fc7bc841bb17ff92be8318df60e2e1 +Provides: bundled(libevent) = 0d7d85c2083f7a4c9efe01c061486f332b576d28 +Provides: bundled(lightstep-tracer-cpp) = 3efe2372ee3d7c2138d6b26e542d757494a7938d +Provides: bundled(luajit) = 2.1.0 +Provides: bundled(markupsafe) = 1.1.1 +Provides: bundled(moonjit) = 2.2.0 +Provides: bundled(msgpack-c) = 3.2.1 +Provides: bundled(opencensus-cpp) = 04ed0211931f12b03c1a76b3907248ca4db7bc90 +Provides: bundled(opencensus-proto) = be218fb6bd674af7519b1850cdf8410d8cbd48e8 +Provides: bundled(opentracing-cpp) = 1.5.1 +Provides: bundled(platforms) = 9ded0f9c3144258dad27ad84628845bcd7ca6fe6 +Provides: bundled(protobuf) = 1.4.1 +Provides: bundled(protobuf) = 3.10.1 +Provides: bundled(protobuf-go) = 1.22.0 +Provides: bundled(protoc-gen-validate) = ab56c3dd1cf9b516b62c5087e1ec1471bd63631e +Provides: bundled(rapidjson) = dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1 +Provides: bundled(re2) +Provides: bundled(rules_apple) = 0.19.0 +Provides: bundled(rules_cc) = 818289e5613731ae410efb54218a4077fb9dbb03 +Provides: bundled(rules_foreign_cc) = 7bc4be735b0560289f6b86ab6136ee25d20b65b7 +Provides: bundled(rules_go) = 0.23.3 +Provides: bundled(rules_java) = 7cf3cefd652008d0a64a419c34c13bdca6c8f178 +Provides: bundled(rules_proto) = 2c0468366367d7ed97a1f702f9cd7155ab3f73c5 +Provides: bundled(rules_python) = 0.0.1 +Provides: bundled(rules_swift) = 0.13.0 +Provides: bundled(spdlog) = 1.4.0 +Provides: bundled(sql-parser) = b14d010afd4313f2372a1cc96aa2327e674cc798 +Provides: bundled(tclap) +Provides: bundled(tools) = 2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd +Provides: bundled(udpa) = e8cd3a4bb307e2c810cffff99f93e96e6d7fee85 +Provides: bundled(upb) = 8a3ae1ef3e3e3f26b45dec735c5776737fc7247f +Provides: bundled(xxhash) = 0.7.3 +Provides: bundled(yaml-cpp) = 0.6.3 +Provides: bundled(zipkin-api) = 0.2.2 +# END obs-service-bazel_repositories +BuildRequires: bazel BuildRequires: bazel-workspaces -BuildRequires: bazel2.0 -BuildRequires: benchmark-devel +BuildRequires: boringssl-source BuildRequires: c-ares-devel -BuildRequires: cel-cpp-source BuildRequires: cmake -BuildRequires: dd-opentracing-cpp-devel -BuildRequires: envoy-build-tools -BuildRequires: envoy-protoc-gen-validate-source BuildRequires: envoy-proxy-source BuildRequires: fdupes BuildRequires: fmt-devel BuildRequires: gcc-c++ BuildRequires: gcovr BuildRequires: git -BuildRequires: golang-github-golang-protobuf -BuildRequires: golang-org-x-tools BuildRequires: golang-packaging -BuildRequires: googleapis-source -BuildRequires: gperftools-devel -BuildRequires: grpc-httpjson-transcoding-source -BuildRequires: grpc-source -BuildRequires: gtest -BuildRequires: http-parser-devel -BuildRequires: jwt_verify_lib-source -BuildRequires: kafka-source -BuildRequires: libcircllhist-devel BuildRequires: libcurl-devel -BuildRequires: libevent-devel BuildRequires: libnghttp2-devel -BuildRequires: libprotobuf-mutator-devel BuildRequires: libtool -BuildRequires: lightstep-tracer-cpp-source -BuildRequires: moonjit-devel -BuildRequires: msgpack-devel BuildRequires: nghttp2-devel BuildRequires: ninja -BuildRequires: opencensus-cpp-source -BuildRequires: opencensus-proto-source -BuildRequires: opentracing-cpp-source -BuildRequires: prometheus-client-model-source -BuildRequires: protobuf-source -BuildRequires: protoc-gen-gogo-source BuildRequires: python3 BuildRequires: python3-Jinja2 BuildRequires: python3-MarkupSafe -BuildRequires: rapidjson-devel -BuildRequires: re2-devel -BuildRequires: spdlog-devel -BuildRequires: sql-parser-devel -BuildRequires: tclap -BuildRequires: udpa-source -BuildRequires: upb-source -BuildRequires: vim -BuildRequires: xxhash-devel -BuildRequires: yaml-cpp-devel -BuildRequires: zipkin-api-source BuildRequires: zlib-devel BuildRequires: golang(API) >= 1.12 -BuildRequires: pkgconfig(openssl) ExcludeArch: %ix86 %description @@ -108,46 +170,24 @@ %prep %autosetup -p1 -# Point cilium-proxy TLS bits to the module with OpenSSL support. -sed -i \ - "s|@envoy//source/extensions/transport_sockets/tls|@envoy_openssl//source/extensions/transport_sockets/tls|" \ - cilium/BUILD - -# cilium-proxy is built from the envoy-proxy source tree, with cilium-proxy -# sources included as a dependency. -cp -r /usr/src/envoy-proxy %{_builddir} -cd %{_builddir}/envoy-proxy -cp %{SOURCE1} . - -# Add cilium-proxy as a depencency -cat <<EOF >> WORKSPACE - -local_repository( - name = "cilium_proxy", - path = "%{_builddir}/%{name}-%{version}", -) -EOF -# Envoy has to be built as a git repository, so let's create one... -git config --global user.email "y...@example.com" +# AUTOGENERATED BY obs-service-bazel_repositories +%setup -q -T -D -a 1 +# END obs-service-bazel_repositories + +%build +git config --global user.email y...@example.com git config --global user.name "Your Name" git init git add . -# use fixed date for reproducible builds (boo#1047218): GIT_AUTHOR_DATE=2000-01-01T01:01:01 GIT_COMMITTER_DATE=2000-01-01T01:01:01 \ git commit -m "Dummy commit just to satisfy bazel" &> /dev/null -# Fix the version string -sed -i "s|BoringSSL|OpenSSL|g" envoy/source/common/common/BUILD - -%build -cd %{_builddir}/envoy-proxy -# TODO(mrostecki): Create a macro in bazel package. -GO_PROTOBUF_DIR=$(find %{_datadir}/go -name protobuf -type d | grep -v vendor) -GO_TOOLS_DIR=$(find %{_datadir}/go -name tools -type d | grep -v vendor) bazel build \ -c dbg \ --color=no \ + --copt="-fsigned-char" \ + --cxxopt="-fsigned-char" \ --copt="-Wno-error=old-style-cast" \ --cxxopt="-Wno-error=old-style-cast" \ --copt="-Wno-unused-parameter" \ @@ -156,76 +196,23 @@ --cxxopt="-Wno-deprecated-declarations" \ --curses=no \ --host_force_python=PY3 \ - --incompatible_bzl_disallow_load_after_statement=false \ - --override_repository="bazel_gazelle=/usr/src/bazel-gazelle" \ - --override_repository="bazel_skylib=/usr/src/bazel-skylib" \ - --override_repository="bazel_toolchains=/usr/src/bazel-toolchains" \ - --override_repository="bssl_wrapper=%{_datadir}/bazel-workspaces/bsslwrapper" \ - --override_repository="build_bazel_apple_support=/usr/src/bazel-apple-support" \ - --override_repository="build_bazel_rules_apple=/usr/src/bazel-rules-apple" \ - --override_repository="build_bazel_rules_swift=/usr/src/bazel-rules-swift" \ - --override_repository="com_envoyproxy_protoc_gen_validate=/usr/src/envoy-protoc-gen-validate" \ - --override_repository="com_lightstep_tracer_cpp=/usr/src/lightstep-tracer-cpp" \ - --override_repository="com_github_c_ares_c_ares=%{_datadir}/bazel-workspaces/c-ares" \ - --override_repository="com_github_circonus_labs_libcircllhist=%{_datadir}/bazel-workspaces/libcircllhist" \ - --override_repository="com_github_cncf_udpa=/usr/src/udpa" \ - --override_repository="com_github_curl=%{_datadir}/bazel-workspaces/curl" \ - --override_repository="com_github_cyan4973_xxhash=%{_datadir}/bazel-workspaces/xxhash" \ - --override_repository="com_github_datadog_dd_opentracing_cpp=%{_datadir}/bazel-workspaces/dd-opentracing-cpp" \ - --override_repository="com_github_mirror_tclap=%{_datadir}/bazel-workspaces/tclap" \ - --override_repository="com_github_eile_tclap=%{_datadir}/bazel-workspaces/tclap" \ - --override_repository="com_github_envoyproxy_sqlparser=%{_datadir}/bazel-workspaces/sql-parser" \ - --override_repository="com_github_fmtlib_fmt=%{_datadir}/bazel-workspaces/fmtlib" \ - --override_repository="com_github_gabime_spdlog=%{_datadir}/bazel-workspaces/spdlog" \ - --override_repository="com_github_gogo_protobuf=/usr/src/protoc-gen-gogo" \ - --override_repository="com_github_golang_protobuf=${GO_PROTOBUF_DIR}" \ - --override_repository="com_github_google_jwt_verify=/usr/src/jwt_verify_lib" \ - --override_repository="com_github_google_jwt_verify_patched=/usr/src/jwt_verify_lib" \ - --override_repository="com_github_google_libprotobuf_mutator=%{_datadir}/bazel-workspaces/libprotobuf-mutator" \ - --override_repository="com_github_gperftools_gperftools=%{_datadir}/bazel-workspaces/gperftools" \ - --override_repository="com_github_grpc_grpc=/usr/src/grpc" \ - --override_repository="com_github_jbeder_yaml_cpp=%{_datadir}/bazel-workspaces/yaml-cpp" \ - --override_repository="com_github_libevent_libevent=%{_datadir}/bazel-workspaces/libevent" \ - --override_repository="com_github_luajit_luajit=%{_datadir}/bazel-workspaces/luajit" \ - --override_repository="com_github_nghttp2_nghttp2=%{_datadir}/bazel-workspaces/nghttp2" \ - --override_repository="com_github_nodejs_http_parser=%{_datadir}/bazel-workspaces/http-parser" \ - --override_repository="com_github_openzipkin_zipkinapi=/usr/src/zipkin-api" \ - --override_repository="com_github_tencent_rapidjson=%{_datadir}/bazel-workspaces/rapidjson" \ - --override_repository="com_google_absl=/usr/src/abseil-cpp" \ - --override_repository="com_google_cel_cpp=/usr/src/cel-cpp" \ - --override_repository="com_google_googleapis=/usr/src/googleapis" \ - --override_repository="com_google_protobuf=/usr/src/protobuf" \ - --override_repository="com_googlesource_code_re2=%{_datadir}/bazel-workspaces/re2" \ - --override_repository="envoy_build_tools=%{_datadir}/envoy-build-tools" \ - --override_repository="grpc_httpjson_transcoding=/usr/src/grpc-httpjson-transcoding" \ - --override_repository="io_bazel_rules_go=/usr/src/bazel-rules-go" \ - --override_repository="io_opencensus_cpp=/usr/src/opencensus-cpp" \ - --override_repository="io_opentracing_cpp=/usr/src/opentracing-cpp" \ - --override_repository="kafka_source=/usr/src/kafka" \ - --override_repository="opencensus_proto=/usr/src/opencensus-proto/src" \ - --override_repository="openssl_cbs=%{_datadir}/bazel-workspaces/openssl-cbs" \ - --override_repository="org_golang_x_tools=${GO_TOOLS_DIR}" \ - --override_repository="platforms=/usr/share/bazel-platforms" \ - --override_repository="prometheus_metrics_model=/usr/src/prometheus-client-model" \ - --override_repository="rules_cc=/usr/src/bazel-rules-cc" \ - --override_repository="rules_foreign_cc=/usr/src/bazel-rules-foreign-cc" \ - --override_repository="rules_java=/usr/src/bazel-rules-java" \ - --override_repository="rules_proto=/usr/src/bazel-rules-proto" \ - --override_repository="rules_python=/usr/src/bazel-rules-python" \ - --override_repository="upb=/usr/src/upb" \ - --override_repository="zlib=%{_datadir}/bazel-workspaces/zlib" \ + --repository_cache=BAZEL_CACHE \ + --override_repository="boringssl=/usr/src/boringssl/" \ + --override_repository="com_github_curl=/usr/share/bazel-workspaces/curl" \ + --override_repository="com_github_nghttp2_nghttp2=/usr/share/bazel-workspaces/nghttp2" \ + --override_repository="envoy=/usr/src/envoy-proxy" \ + --override_repository="zlib=/usr/share/bazel-workspaces/zlib" \ %ifarch ppc64le --local_cpu_resources=HOST_CPUS*.65 \ --local_ram_resources=HOST_RAM*.8 \ %endif --strip=never \ --verbose_failures \ - //:envoy + //:cilium-envoy bazel shutdown %install -cd %{_builddir}/envoy-proxy -install -D -m0755 bazel-bin/envoy %{buildroot}%{_bindir}/cilium-envoy +install -D -m0755 bazel-bin/cilium-envoy %{buildroot}%{_bindir}/cilium-envoy %files %license LICENSE ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.S6krTg/_old 2020-09-29 19:00:37.693687834 +0200 +++ /var/tmp/diff_new_pack.S6krTg/_new 2020-09-29 19:00:37.693687834 +0200 @@ -3,7 +3,6 @@ <overwrite> <conditions> <arch>x86_64</arch> - <arch>aarch64</arch> </conditions> <hardware> <processors>4</processors> @@ -11,7 +10,18 @@ <size unit="M">16000</size> </memory> </hardware> -</overwrite> + </overwrite> + <overwrite> + <conditions> + <arch>aarch64</arch> + </conditions> + <hardware> + <processors>4</processors> + <physicalmemory> + <size unit="G">10</size> + </physicalmemory> + </hardware> + </overwrite> <overwrite> <conditions> <arch>s390x</arch> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.S6krTg/_old 2020-09-29 19:00:37.709687853 +0200 +++ /var/tmp/diff_new_pack.S6krTg/_new 2020-09-29 19:00:37.713687858 +0200 @@ -1,16 +1,20 @@ <services> - <service mode="disabled" name="obs_scm"> + <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/cilium/proxy</param> <param name="scm">git</param> - <param name="changesgenerate">disable</param> + <param name="changesgenerate">enable</param> <param name="filename">cilium-proxy</param> <param name="versionformat">%cd</param> - <param name="revision">c16d0f195d4fa5e26c3a7cff9a27fc69a13437c5</param> + <param name="revision">1bae8b37ad80b56e1a378bb04cd06d01e5936347</param> </service> - <service mode="buildtime" name="tar" /> - <service mode="buildtime" name="recompress"> + <service mode="disabled" name="recompress"> <param name="file">*.tar</param> - <param name="compression">xz</param> + <param name="compression">gz</param> </service> <service mode="disabled" name="set_version" /> + <service mode="disabled" name="bazel_repositories"> + <param name="override-repository">boringssl=/usr/src/boringssl,com_github_curl=/usr/share/bazel-workspaces/curl,com_github_nghttp2_nghttp2=/usr/share/bazel-workspaces/nghttp2,envoy=/usr/src/envoy-proxy,zlib=/usr/share/bazel-workspaces/zlib</param> + <param name="exclude">boringssl,curl,nghttp2,zlib</param> + <param name="target">//:cilium-envoy</param> + </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cilium/proxy</param> <param name="changesrevision">1bae8b37ad80b56e1a378bb04cd06d01e5936347</param></service></servicedata>
