From patchwork Mon Aug 8 20:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5851 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M1npV2qF7z40W2 for ; Mon, 8 Aug 2022 20:28:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M1npS58BRz5Tb; Mon, 8 Aug 2022 20:28:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M1npS0Myzz3044; Mon, 8 Aug 2022 20:28:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M1npR01qcz2xPk for ; Mon, 8 Aug 2022 20:28:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M1npQ6KkhzqV; Mon, 8 Aug 2022 20:28:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1659990510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rrut1JdInnSb2RPttu78eiVNB6lwlMk7qqb9/n1C7F8=; b=7B7nnEspVGThBgTviq+/KD420awuU/gbx5wQB9MX801ioOgwpVs+KWUdfS36vW9flUaEcr NLnAr09rup4gnJBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1659990510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rrut1JdInnSb2RPttu78eiVNB6lwlMk7qqb9/n1C7F8=; b=lF7hUpZTvTvE1LE1iwIwu1iaHTS4skqBhbJJ2gphMpH6UfyERtIcgvk1J1zZcbel04fxWZ 4oIBMA3GYZNn3ocXq7H+lrY0FbesjpXtNE0ybbRN5NDeI0xRCdM12AWmeyTpKx4iB33JJW 0TvHcDp6Yf6GuqAZPXQ8sAecOY+8z46+1h5Va3FvXxgUyS1mIrishfXs3UoxQbqewdcJZ5 0k1/pKdTobvpha3L5x9G7DmNP+CaXiefYZZf8QQjcHATU6Jp4/a+vAK6ptmaAt4OR0ZMDO PAdJOt0m4+AUC0WHzoM8WbuRbZ+NDjXl1ccW0V4Sg1pjew9hl7+0BWLKxkUEgQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] amazon-ssm-agent: Enable build for aarch64 Date: Mon, 8 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> References: <20220808202824.1120321-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer Reviewed-by: Peter Müller --- .../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/rootfiles/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 = Amazon Remote System Config Management VER = 3.0.356.0 -SUP_ARCH = x86_64 +SUP_ARCH = aarch64 x86_64 THISAPP = amazon-ssm-agent-$(VER) DL_FILE = $(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 + # 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 # 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