Saro
fae0cd1f8e
Release Notes (42 new versions): https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.15.0.html . . . https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.19.12.html - Remove unnecessary '?' in "PKGNAMESUFFIX?=8". - Adjust COMMENT. - Simplify removing "./" from GO_TARGET. - Remove unnecessary '+' in "MAKE_ENV+=". - Fix GO_MODULE - must be "v7" instead of "v8". - Adjust CONFLICTS. - Use ".ifmake makesum" for generate distfiles with non-default modules too. - Add LOCAL/vvd/elastic to MASTER_SITES for those who can't download due to the HTTP error "Forbidden 403". - Replace PORTVERSION with DISTVERSION. - Add '(' and ')' around the block that is executed in the shell. - Refresh patches. - Fix description in rc.d scripts. PR: 290094 Approved by: elastic (maintainer, implicit - inactive for more than 6 months) Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
27 lines
1.4 KiB
Plaintext
27 lines
1.4 KiB
Plaintext
--- libbeat/scripts/Makefile.orig 2025-09-15 19:57:17 UTC
|
|
+++ libbeat/scripts/Makefile
|
|
@@ -47,7 +47,7 @@ GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name
|
|
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
|
|
GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go' 2>/dev/null)
|
|
GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name "stress" \) 2>/dev/null)
|
|
-SHELL=bash
|
|
+SHELL=sh
|
|
ES_HOST?=elasticsearch
|
|
ES_PORT?=9200
|
|
ES_USER?=beats
|
|
@@ -346,12 +346,12 @@ update: python-env fields collect config ## @build Upd
|
|
update: python-env fields collect config ## @build Update expects the most recent version of libbeat in the GOPATH
|
|
@echo "Updating generated files for ${BEAT_NAME}"
|
|
|
|
-ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
|
|
+ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
|
|
mkdir -p include
|
|
go run ${INSTALL_FLAG} ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license $(LICENSE) -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
|
|
endif
|
|
|
|
-ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
|
|
+ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
|
|
@# Update docs
|
|
@mkdir -p docs
|
|
@${PYTHON_ENV_EXE} ${ES_BEATS}/libbeat/scripts/generate_fields_docs.py $(PWD)/fields.yml ${BEAT_TITLE} ${ES_BEATS}
|