From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] amazon-ssm-agent: Enable build for aarch64 Date: Mon, 08 Aug 2022 20:28:23 +0000 Message-ID: <20220808202824.1120321-2-michael.tremer@ipfire.org> In-Reply-To: <20220808202824.1120321-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2798242113639418909==" List-Id: --===============2798242113639418909== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- .../packages/aarch64/amazon-ssm-agent | 1 + lfs/amazon-ssm-agent | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 120000 config/rootfiles/packages/aarch64/amazon-ssm-agent diff --git a/config/rootfiles/packages/aarch64/amazon-ssm-agent b/config/root= files/packages/aarch64/amazon-ssm-agent new file mode 120000 index 000000000..3acbdf17c --- /dev/null +++ b/config/rootfiles/packages/aarch64/amazon-ssm-agent @@ -0,0 +1 @@ +../x86_64/amazon-ssm-agent \ No newline at end of file diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent index 8779908d8..ee13a904b 100644 --- a/lfs/amazon-ssm-agent +++ b/lfs/amazon-ssm-agent @@ -27,7 +27,7 @@ include Config SUMMARY =3D Amazon Remote System Config Management =20 VER =3D 3.0.356.0 -SUP_ARCH =3D x86_64 +SUP_ARCH =3D aarch64 x86_64 =20 THISAPP =3D amazon-ssm-agent-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -96,8 +96,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_BUILD) && sed -e "/localpackages/d" \ -i agent/plugins/inventory/gatherers/application/dataProvider.go =20 + # Cleanup anything shipped + cd $(DIR_BUILD) && make clean + # Build +ifeq "$(BUILD_ARCH)" "aarch64" + cd $(DIR_BUILD) && make build-arm64 +else cd $(DIR_BUILD) && make build-linux +endif =20 # Remove some temporary files (no idea why those are being created) rm -rfv /usr/lib/go/pkg/linux_$(GOARCH)_shared @@ -105,12 +112,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install mkdir -pv /etc/amazon/ssm /usr/bin /var/lib/amazon/ssm cd $(DIR_BUILD) && install -v -m 755 \ - bin/linux_amd64/amazon-ssm-agent \ - bin/linux_amd64/ssm-agent-worker \ - bin/linux_amd64/ssm-cli \ - bin/linux_amd64/ssm-document-worker \ - bin/linux_amd64/ssm-session-worker \ - bin/linux_amd64/ssm-session-logger \ + bin/linux_$(GOARCH)/amazon-ssm-agent \ + bin/linux_$(GOARCH)/ssm-agent-worker \ + bin/linux_$(GOARCH)/ssm-cli \ + bin/linux_$(GOARCH)/ssm-document-worker \ + bin/linux_$(GOARCH)/ssm-session-worker \ + bin/linux_$(GOARCH)/ssm-session-logger \ /usr/bin cd $(DIR_BUILD) && install -v -m 644 \ seelog_unix.xml /etc/amazon/ssm/seelog.xml --=20 2.30.2 --===============2798242113639418909==--