Re: [Buildroot] [PATCH 1/1] package/qbee-agent: new package

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello Jon,

Thanks for your patch, and sorry for the long delay in getting back to
you. I have applied your patch, with some fixes (see below).

On Tue,  5 Mar 2024 10:38:39 +0100
Jon Henrik Bjørnstad via buildroot <buildroot@buildroot.org> wrote:

> diff --git a/package/qbee-agent/Config.in b/package/qbee-agent/Config.in
> new file mode 100644
> index 0000000000..02e35827ef
> --- /dev/null
> +++ b/package/qbee-agent/Config.in
> @@ -0,0 +1,17 @@
> +config BR2_PACKAGE_QBEE_AGENT
> +	bool "qbee-agent"
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
> +	select BR2_PACKAGE_IPTABLES # runtime
> +	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # runtime
> +	select BR2_PACKAGE_SHADOW # runtime
> +	select BR2_PACKAGE_BASH # runtime

When you select something, you need to replicate the "depends on" of
the thing you are selecting. So here:

+       depends on BR2_USE_MMU # bash
+       depends on !BR2_STATIC_LIBS # shadow
+       depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # shadow

> +	help
> +	  Qbee is a device management platform that comprise
> +	  of an open-source agent and a hosted SaaS backend.
> +	  This config installs pre-built static binaries made
> +	  with the official public signing key for qbee.io. The
> +	  binaries will work seamlessly with the qbee.io device
> +	  management backend.
> +
> +	  https://github.com/qbee-io/qbee-agent
> +	  https://qbee.io

And you need to add a Config.in comment about those dependencies:

+comment "qbee-agent needs a toolchain w/ headers >= 4.14, dynamic library"
+       depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+       depends on BR2_USE_MMU
+       depends on BR2_STATIC_LIBS || \
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14

> diff --git a/package/qbee-agent/qbee-agent.hash b/package/qbee-agent/qbee-agent.hash
> new file mode 100644
> index 0000000000..1c6a361ff6
> --- /dev/null
> +++ b/package/qbee-agent/qbee-agent.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256  b1b5a6d4e18fbd8536d05616c632f10ef309d26036a19c5ce28d0635c45d8cab  qbee-agent-2024.09.tar.gz

I had to update the hash and the filename, due to the recent changes in
the download infrastructure (not your fault, the changes were committed
very recently).

> +sha256  02d07d96be99eb042b01ba650079a440ce26a78c5e0e1e8060c33a8c9e200404  LICENSE
> diff --git a/package/qbee-agent/qbee-agent.mk b/package/qbee-agent/qbee-agent.mk
> new file mode 100644
> index 0000000000..66037195c1
> --- /dev/null
> +++ b/package/qbee-agent/qbee-agent.mk
> @@ -0,0 +1,35 @@
> +################################################################################
> +#
> +# qbee-agent package
> +#
> +################################################################################
> +
> +QBEE_AGENT_VERSION = 2024.09

Added a comment above this line, saying that QBEE_AGENT_COMMIT_ID
should be kept in sync.

> +QBEE_AGENT_SITE = $(call github,qbee-io,qbee-agent,$(QBEE_AGENT_VERSION))
> +QBEE_AGENT_LICENSE = Apache-2.0
> +QBEE_AGENT_LICENSE_FILES = LICENSE
> +
> +QBEE_AGENT_COMMIT_ID = c30d43b8e64cfef960cee9475b58ae083e4ad246
> +
> +QBEE_AGENT_GOMOD = go.qbee.io/agent
> +
> +QBEE_AGENT_LDFLAGS = -s -w \
> +	-X $(QBEE_AGENT_GOMOD)/app.Version=$(QBEE_AGENT_VERSION) \
> +	-X $(QBEE_AGENT_GOMOD)/app.Commit=$(QBEE_AGENT_COMMIT_ID)
> +
> +define QBEE_AGENT_INSTALL_TARGET_CMDS
> +	$(INSTALL) -m 0755 $(@D)/bin/qbee-agent $(TARGET_DIR)/usr/bin/qbee-agent
> +	$(INSTALL) -D -m 0600 $(@D)/package/share/ssl/ca.cert $(TARGET_DIR)/etc/qbee/ppkeys/ca.cert
> +endef

As suggested by Yann E. Morin in a previous iteration, I dropped the
installation of the binary from there, and turned this into a
post-install target hook. Indeed, the golang-package infrastructure
already takes care of installing the binary.

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot