From c1e0cfde45bd614f213b00f5effd92423d863ddc Mon Sep 17 00:00:00 2001 From: yseto Date: Thu, 15 Dec 2022 17:38:16 +0900 Subject: [PATCH 1/2] generate plugin-lists for rpm-v1, deb-v1 package --- packaging/plugin-lists | 52 ++++++++++++++++++++++++++++++++++++++++++ tool/update-docs.pl | 6 +++++ 2 files changed, 58 insertions(+) create mode 100644 packaging/plugin-lists diff --git a/packaging/plugin-lists b/packaging/plugin-lists new file mode 100644 index 000000000..61888c52d --- /dev/null +++ b/packaging/plugin-lists @@ -0,0 +1,52 @@ +mackerel-plugin-accesslog +mackerel-plugin-apache2 +mackerel-plugin-aws-cloudfront +mackerel-plugin-aws-dynamodb +mackerel-plugin-aws-ec2-cpucredit +mackerel-plugin-aws-ec2-ebs +mackerel-plugin-aws-elasticache +mackerel-plugin-aws-elasticsearch +mackerel-plugin-aws-elb +mackerel-plugin-aws-kinesis-streams +mackerel-plugin-aws-lambda +mackerel-plugin-aws-rds +mackerel-plugin-aws-s3-requests +mackerel-plugin-aws-ses +mackerel-plugin-conntrack +mackerel-plugin-docker +mackerel-plugin-elasticsearch +mackerel-plugin-fluentd +mackerel-plugin-gostats +mackerel-plugin-h2o +mackerel-plugin-haproxy +mackerel-plugin-inode +mackerel-plugin-jmx-jolokia +mackerel-plugin-jvm +mackerel-plugin-linux +mackerel-plugin-mailq +mackerel-plugin-memcached +mackerel-plugin-mongodb +mackerel-plugin-multicore +mackerel-plugin-munin +mackerel-plugin-mysql +mackerel-plugin-nginx +mackerel-plugin-openldap +mackerel-plugin-php-apc +mackerel-plugin-php-fpm +mackerel-plugin-php-opcache +mackerel-plugin-plack +mackerel-plugin-postgres +mackerel-plugin-proc-fd +mackerel-plugin-rabbitmq +mackerel-plugin-redis +mackerel-plugin-sidekiq +mackerel-plugin-snmp +mackerel-plugin-solr +mackerel-plugin-squid +mackerel-plugin-td-table-count +mackerel-plugin-trafficserver +mackerel-plugin-twemproxy +mackerel-plugin-unicorn +mackerel-plugin-uptime +mackerel-plugin-uwsgi-vassal +mackerel-plugin-varnish diff --git a/tool/update-docs.pl b/tool/update-docs.pl index 1504c67b4..a7b2d89b8 100644 --- a/tool/update-docs.pl +++ b/tool/update-docs.pl @@ -59,6 +59,11 @@ sub update_packaging_specs { path('packaging/deb/debian/source/include-binaries')->spew(join("\n", map { "debian/$PLUGIN_PREFIX$_" } @plugins) . "\n"); } +sub update_packaging_binaries_list { + my @plugins = @_; + path('packaging/plugin-lists')->spew(join("\n", map { "$PLUGIN_PREFIX$_" } @plugins) . "\n"); +} + sub load_packaging_confg { decode_json path('packaging/config.json')->slurp; } @@ -68,6 +73,7 @@ sub main { update_readme(@plugins); my $config = load_packaging_confg; update_packaging_specs(sort @{ $config->{plugins} }); + update_packaging_binaries_list(sort @{ $config->{plugins} }); } main(); From b65802c149f85c3ca3ed962726735802c13cc61c Mon Sep 17 00:00:00 2001 From: yseto Date: Thu, 15 Dec 2022 17:38:33 +0900 Subject: [PATCH 2/2] switch over build-for-packaging --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2c2b7762e..80302f6dc 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,12 @@ build: $(MAKE) $(BINDIR)/$$i; \ done +.PHONY: build-for-packaging +build-for-packaging: + for i in `cat packaging/plugin-lists`; do \ + $(MAKE) $(BINDIR)/$$i; \ + done + build/mackerel-plugin: $(patsubst %,depends_on,$(GOOS)$(GOARCH)) mkdir -p build go build -ldflags="-s -w -X main.gitcommit=$(CURRENT_REVISION)" \ @@ -54,11 +60,11 @@ rpm: rpm-v1 rpm-v2 .PHONY: rpm-v1 rpm-v1: - $(MAKE) build GOOS=linux GOARCH=386 + $(MAKE) build-for-packaging GOOS=linux GOARCH=386 rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/386" \ --define "_version ${VERSION}" --define "buildarch noarch" \ --target noarch -bb packaging/rpm/mackerel-agent-plugins.spec - $(MAKE) build GOOS=linux GOARCH=amd64 + $(MAKE) build-for-packaging GOOS=linux GOARCH=amd64 rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/amd64" \ --define "_version ${VERSION}" --define "buildarch x86_64" \ --target x86_64 -bb packaging/rpm/mackerel-agent-plugins.spec @@ -91,7 +97,7 @@ deb: deb-v1 deb-v2 .PHONY: deb-v1 deb-v1: - $(MAKE) build GOOS=linux GOARCH=386 + $(MAKE) build-for-packaging GOOS=linux GOARCH=386 for i in `cat packaging/deb/debian/source/include-binaries`; do \ cp build/linux/386/`basename $$i` packaging/deb/debian/; \ done