* [ptxdist] [PATCH v2 1/2] passwd/group: add rauc-hawkbit user/group
@ 2020-09-24 16:56 Bastian Krause
2020-09-24 16:56 ` [ptxdist] [PATCH v2 2/2] rauc-hawkbit-updater: new package Bastian Krause
2020-10-06 8:18 ` [ptxdist] [APPLIED] passwd/group: add rauc-hawkbit user/group Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Bastian Krause @ 2020-09-24 16:56 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
No changes since v1.
---
projectroot/etc/group | 1 +
projectroot/etc/passwd | 1 +
2 files changed, 2 insertions(+)
diff --git a/projectroot/etc/group b/projectroot/etc/group
index 2de3bfd9f..09df73ba0 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -32,4 +32,5 @@ systemd-journal-upload:x:208:
render:x:209:
pulse:x:210:
chrony:x:211:
+rauc-hawkbit:x:212:
nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index bd0cc6e7b..529f49a77 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -16,5 +16,6 @@ systemd-journal-remote:x:207:203:systemd-journal-remote:/dev/null:/bin/false
systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
pulse:x:209:210:pulse:/dev/null:/bin/false
chrony:x:210:211:chrony:/dev/null:/bin/false
+rauc-hawkbit:x:211:212:rauc-hawkbit:/dev/null:/bin/false
rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] rauc-hawkbit-updater: new package
2020-09-24 16:56 [ptxdist] [PATCH v2 1/2] passwd/group: add rauc-hawkbit user/group Bastian Krause
@ 2020-09-24 16:56 ` Bastian Krause
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-10-06 8:18 ` [ptxdist] [APPLIED] passwd/group: add rauc-hawkbit user/group Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Bastian Krause @ 2020-09-24 16:56 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since v1:
- introduce RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT instead of using
INITMETHOD_SYSTEMD
---
.../etc/rauc-hawkbit-updater/config.conf | 43 +++++++++++
rules/rauc-hawkbit-updater.in | 26 +++++++
rules/rauc-hawkbit-updater.make | 72 +++++++++++++++++++
3 files changed, 141 insertions(+)
create mode 100644 projectroot/etc/rauc-hawkbit-updater/config.conf
create mode 100644 rules/rauc-hawkbit-updater.in
create mode 100644 rules/rauc-hawkbit-updater.make
diff --git a/projectroot/etc/rauc-hawkbit-updater/config.conf b/projectroot/etc/rauc-hawkbit-updater/config.conf
new file mode 100644
index 000000000..a1dfa97ef
--- /dev/null
+++ b/projectroot/etc/rauc-hawkbit-updater/config.conf
@@ -0,0 +1,43 @@
+[client]
+# host or IP and optional port
+hawkbit_server = 10.10.0.254:8080
+
+# true = HTTPS, false = HTTP
+ssl = false
+
+# validate ssl certificate (only use if ssl is true)
+ssl_verify = false
+
+# Tenant id
+tenant_id = DEFAULT
+
+# Target name (controller id)
+target_name = test-target
+
+# Security token
+auth_token = cb115a721af28f781b493fa467819ef5
+
+# Or gateway_token can be used instead of auth_token
+#gateway_token = cb115a721af28f781b493fa467819ef5
+
+# Temporay file RAUC bundle should be downloaded to
+bundle_download_location = /tmp/bundle.raucb
+
+# time in seconds to wait before retrying
+retry_wait = 60
+
+# connection timeout in seconds
+connect_timeout = 20
+
+# request timeout in seconds
+timeout = 60
+
+# debug, info, message, critical, error, fatal
+log_level = message
+
+# Every key / value under [device] is sent to HawkBit (target attributes),
+# and can be used in target filter.
+[device]
+mac_address = ff:ff:ff:ff:ff:ff
+hw_revision = 2
+model = T1
diff --git a/rules/rauc-hawkbit-updater.in b/rules/rauc-hawkbit-updater.in
new file mode 100644
index 000000000..4df4e84ed
--- /dev/null
+++ b/rules/rauc-hawkbit-updater.in
@@ -0,0 +1,26 @@
+## SECTION=applications
+
+config RAUC_HAWKBIT_UPDATER
+ tristate
+ prompt "rauc-hawkbit-updater"
+ select HOST_CMAKE
+ select DBUS
+ select JSON_GLIB
+ select LIBCURL
+ select LIBCURL_HTTP
+ select LIBCURL_SSL
+ select RAUC
+ select RAUC_SERVICE
+ select SYSTEMD if RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
+ help
+ Daemon operating as an interface between the RAUC D-Bus API and the hawkBit DDI API.
+
+if RAUC_HAWKBIT_UPDATER
+
+config RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
+ bool
+ default y
+ depends on INITMETHOD_SYSTEMD
+ prompt "install and enable systemd service file"
+
+endif
diff --git a/rules/rauc-hawkbit-updater.make b/rules/rauc-hawkbit-updater.make
new file mode 100644
index 000000000..5a9bfce71
--- /dev/null
+++ b/rules/rauc-hawkbit-updater.make
@@ -0,0 +1,72 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Bastian Krause <bst@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_RAUC_HAWKBIT_UPDATER) += rauc-hawkbit-updater
+
+#
+# Paths and names
+#
+RAUC_HAWKBIT_UPDATER_VERSION := 2020-09-09-gb38f5a5
+RAUC_HAWKBIT_UPDATER_MD5 := c2accd9bdcab813dbf9850e6ed63085e
+RAUC_HAWKBIT_UPDATER := rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION)
+RAUC_HAWKBIT_UPDATER_SUFFIX := tar.gz
+RAUC_HAWKBIT_UPDATER_URL := https://github.com/rauc/rauc-hawkbit-updater/archive/$(RAUC_HAWKBIT_UPDATER).$(RAUC_HAWKBIT_UPDATER_SUFFIX)
+RAUC_HAWKBIT_UPDATER_SOURCE := $(SRCDIR)/$(RAUC_HAWKBIT_UPDATER).$(RAUC_HAWKBIT_UPDATER_SUFFIX)
+RAUC_HAWKBIT_UPDATER_DIR := $(BUILDDIR)/$(RAUC_HAWKBIT_UPDATER)
+RAUC_HAWKBIT_UPDATER_LICENSE := LGPL-2.1-or-later
+RAUC_HAWKBIT_UPDATER_LICENSE_FILES := file://LICENSE;md5=1a6d268fd218675ffea8be556788b780
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+RAUC_HAWKBIT_UPDATER_CONF_TOOL := cmake
+RAUC_HAWKBIT_UPDATER_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DWITH_SYSTEMD=$(call ptx/onoff,PTXCONF_RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT) \
+ -DBUILD_DOC=OFF \
+ -DQA_BUILD=ON \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/rauc-hawkbit-updater.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, rauc-hawkbit-updater)
+ @$(call install_fixup, rauc-hawkbit-updater,PRIORITY,optional)
+ @$(call install_fixup, rauc-hawkbit-updater,SECTION,base)
+ @$(call install_fixup, rauc-hawkbit-updater,AUTHOR,"Bastian Krause <bst@pengutronix.de>")
+ @$(call install_fixup, rauc-hawkbit-updater,DESCRIPTION,missing)
+
+ @$(call install_copy, rauc-hawkbit-updater, 0, 0, 0755, -, \
+ /usr/bin/rauc-hawkbit-updater)
+
+ @$(call install_alternative, rauc-hawkbit-updater, 0, 0, 0644, \
+ /etc/rauc-hawkbit-updater/config.conf)
+
+ifdef PTXCONF_RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
+ @$(call install_alternative, rauc-hawkbit-updater, 0, 0, 0644, \
+ /usr/lib/systemd/system/rauc-hawkbit-updater.service)
+ @$(call install_link, rauc-hawkbit-updater, ../rauc-hawkbit-updater.service, \
+ /usr/lib/systemd/system/multi-user.target.wants/rauc-hawkbit-updater.service)
+endif
+
+ @$(call install_finish, rauc-hawkbit-updater)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rauc-hawkbit-updater: new package
2020-09-24 16:56 ` [ptxdist] [PATCH v2 2/2] rauc-hawkbit-updater: new package Bastian Krause
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 399ce56f9106b1c671fbab3dc98db6c0db670109.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:51 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200924165621.24177-2-bst@pengutronix.de>
> [mol: use menuconfig instead of config]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/projectroot/etc/rauc-hawkbit-updater/config.conf b/projectroot/etc/rauc-hawkbit-updater/config.conf
> new file mode 100644
> index 000000000000..a1dfa97efecf
> --- /dev/null
> +++ b/projectroot/etc/rauc-hawkbit-updater/config.conf
> @@ -0,0 +1,43 @@
> +[client]
> +# host or IP and optional port
> +hawkbit_server = 10.10.0.254:8080
> +
> +# true = HTTPS, false = HTTP
> +ssl = false
> +
> +# validate ssl certificate (only use if ssl is true)
> +ssl_verify = false
> +
> +# Tenant id
> +tenant_id = DEFAULT
> +
> +# Target name (controller id)
> +target_name = test-target
> +
> +# Security token
> +auth_token = cb115a721af28f781b493fa467819ef5
> +
> +# Or gateway_token can be used instead of auth_token
> +#gateway_token = cb115a721af28f781b493fa467819ef5
> +
> +# Temporay file RAUC bundle should be downloaded to
> +bundle_download_location = /tmp/bundle.raucb
> +
> +# time in seconds to wait before retrying
> +retry_wait = 60
> +
> +# connection timeout in seconds
> +connect_timeout = 20
> +
> +# request timeout in seconds
> +timeout = 60
> +
> +# debug, info, message, critical, error, fatal
> +log_level = message
> +
> +# Every key / value under [device] is sent to HawkBit (target attributes),
> +# and can be used in target filter.
> +[device]
> +mac_address = ff:ff:ff:ff:ff:ff
> +hw_revision = 2
> +model = T1
> diff --git a/rules/rauc-hawkbit-updater.in b/rules/rauc-hawkbit-updater.in
> new file mode 100644
> index 000000000000..267bffc5b1da
> --- /dev/null
> +++ b/rules/rauc-hawkbit-updater.in
> @@ -0,0 +1,26 @@
> +## SECTION=applications
> +
> +menuconfig RAUC_HAWKBIT_UPDATER
> + tristate
> + prompt "rauc-hawkbit-updater "
> + select HOST_CMAKE
> + select DBUS
> + select JSON_GLIB
> + select LIBCURL
> + select LIBCURL_HTTP
> + select LIBCURL_SSL
> + select RAUC
> + select RAUC_SERVICE
> + select SYSTEMD if RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
> + help
> + Daemon operating as an interface between the RAUC D-Bus API and the hawkBit DDI API.
> +
> +if RAUC_HAWKBIT_UPDATER
> +
> +config RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
> + bool
> + default y
> + depends on INITMETHOD_SYSTEMD
> + prompt "install and enable systemd service file"
> +
> +endif
> diff --git a/rules/rauc-hawkbit-updater.make b/rules/rauc-hawkbit-updater.make
> new file mode 100644
> index 000000000000..5a9bfce71f33
> --- /dev/null
> +++ b/rules/rauc-hawkbit-updater.make
> @@ -0,0 +1,72 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Bastian Krause <bst@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_RAUC_HAWKBIT_UPDATER) += rauc-hawkbit-updater
> +
> +#
> +# Paths and names
> +#
> +RAUC_HAWKBIT_UPDATER_VERSION := 2020-09-09-gb38f5a5
> +RAUC_HAWKBIT_UPDATER_MD5 := c2accd9bdcab813dbf9850e6ed63085e
> +RAUC_HAWKBIT_UPDATER := rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION)
> +RAUC_HAWKBIT_UPDATER_SUFFIX := tar.gz
> +RAUC_HAWKBIT_UPDATER_URL := https://github.com/rauc/rauc-hawkbit-updater/archive/$(RAUC_HAWKBIT_UPDATER).$(RAUC_HAWKBIT_UPDATER_SUFFIX)
> +RAUC_HAWKBIT_UPDATER_SOURCE := $(SRCDIR)/$(RAUC_HAWKBIT_UPDATER).$(RAUC_HAWKBIT_UPDATER_SUFFIX)
> +RAUC_HAWKBIT_UPDATER_DIR := $(BUILDDIR)/$(RAUC_HAWKBIT_UPDATER)
> +RAUC_HAWKBIT_UPDATER_LICENSE := LGPL-2.1-or-later
> +RAUC_HAWKBIT_UPDATER_LICENSE_FILES := file://LICENSE;md5=1a6d268fd218675ffea8be556788b780
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# cmake
> +#
> +RAUC_HAWKBIT_UPDATER_CONF_TOOL := cmake
> +RAUC_HAWKBIT_UPDATER_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DWITH_SYSTEMD=$(call ptx/onoff,PTXCONF_RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT) \
> + -DBUILD_DOC=OFF \
> + -DQA_BUILD=ON \
> + --with-systemdsystemunitdir=/usr/lib/systemd/system
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/rauc-hawkbit-updater.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, rauc-hawkbit-updater)
> + @$(call install_fixup, rauc-hawkbit-updater,PRIORITY,optional)
> + @$(call install_fixup, rauc-hawkbit-updater,SECTION,base)
> + @$(call install_fixup, rauc-hawkbit-updater,AUTHOR,"Bastian Krause <bst@pengutronix.de>")
> + @$(call install_fixup, rauc-hawkbit-updater,DESCRIPTION,missing)
> +
> + @$(call install_copy, rauc-hawkbit-updater, 0, 0, 0755, -, \
> + /usr/bin/rauc-hawkbit-updater)
> +
> + @$(call install_alternative, rauc-hawkbit-updater, 0, 0, 0644, \
> + /etc/rauc-hawkbit-updater/config.conf)
> +
> +ifdef PTXCONF_RAUC_HAWKBIT_UPDATER_SYSTEMD_UNIT
> + @$(call install_alternative, rauc-hawkbit-updater, 0, 0, 0644, \
> + /usr/lib/systemd/system/rauc-hawkbit-updater.service)
> + @$(call install_link, rauc-hawkbit-updater, ../rauc-hawkbit-updater.service, \
> + /usr/lib/systemd/system/multi-user.target.wants/rauc-hawkbit-updater.service)
> +endif
> +
> + @$(call install_finish, rauc-hawkbit-updater)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] passwd/group: add rauc-hawkbit user/group
2020-09-24 16:56 [ptxdist] [PATCH v2 1/2] passwd/group: add rauc-hawkbit user/group Bastian Krause
2020-09-24 16:56 ` [ptxdist] [PATCH v2 2/2] rauc-hawkbit-updater: new package Bastian Krause
@ 2020-10-06 8:18 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as dacef54355c2fbff82b3369c679762cbb14471df.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:50 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200924165621.24177-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/projectroot/etc/group b/projectroot/etc/group
> index 2de3bfd9f208..09df73ba064d 100644
> --- a/projectroot/etc/group
> +++ b/projectroot/etc/group
> @@ -32,4 +32,5 @@ systemd-journal-upload:x:208:
> render:x:209:
> pulse:x:210:
> chrony:x:211:
> +rauc-hawkbit:x:212:
> nogroup:x:65534:
> diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
> index bd0cc6e7ba61..529f49a77b83 100644
> --- a/projectroot/etc/passwd
> +++ b/projectroot/etc/passwd
> @@ -16,5 +16,6 @@ systemd-journal-remote:x:207:203:systemd-journal-remote:/dev/null:/bin/false
> systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
> pulse:x:209:210:pulse:/dev/null:/bin/false
> chrony:x:210:211:chrony:/dev/null:/bin/false
> +rauc-hawkbit:x:211:212:rauc-hawkbit:/dev/null:/bin/false
> rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
> nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-06 8:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-24 16:56 [ptxdist] [PATCH v2 1/2] passwd/group: add rauc-hawkbit user/group Bastian Krause
2020-09-24 16:56 ` [ptxdist] [PATCH v2 2/2] rauc-hawkbit-updater: new package Bastian Krause
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-10-06 8:18 ` [ptxdist] [APPLIED] passwd/group: add rauc-hawkbit user/group Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox