diff mbox series

[2/2] amazon-ssm-agent: Enable build for aarch64

Message ID 20220808202824.1120321-2-michael.tremer@ipfire.org
State Accepted
Commit f605a2d303f9239963b0049ff308b25b7782b691
Headers
Series [1/2] go: Add for aarch64 |

Commit Message

Michael Tremer Aug. 8, 2022, 8:28 p.m. UTC 
  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 .../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

Comments

Peter Müller Aug. 9, 2022, 10:27 a.m. UTC | #1 
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>  .../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
diff mbox series

Patch

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