* [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12
@ 2025-01-22 10:41 Rouven Czerwinski
2025-01-22 12:09 ` Roland Hieber
2025-01-27 8:35 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Rouven Czerwinski @ 2025-01-22 10:41 UTC (permalink / raw)
To: ptxdist; +Cc: Rouven Czerwinski
License changes because the copyright was extended for 2024.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
rules/rauc.make | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/rules/rauc.make b/rules/rauc.make
index 38577f94d..06b8419c0 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
#
# Paths and names
#
-RAUC_VERSION := 1.11.3
-RAUC_MD5 := f6822268230e50efb6b2fe3a4db28e2b
+RAUC_VERSION := 1.12
+RAUC_MD5 := cb95d7491bf65f313357bc268c7bca29
RAUC := rauc-$(RAUC_VERSION)
RAUC_SUFFIX := tar.xz
RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
@@ -23,7 +23,7 @@ RAUC_SOURCE := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
RAUC_DIR := $(BUILDDIR)/$(RAUC)
RAUC_LICENSE := LGPL-2.1-or-later
RAUC_LICENSE_FILES := \
- file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
+ file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
file://COPYING;md5=4fbd65380cdd255951079008b364516c
# ----------------------------------------------------------------------------
@@ -40,6 +40,7 @@ RAUC_CONF_OPT := \
-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
-Ddbuspolicydir=/usr/share/dbus-1/system.d \
-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
+ -Dsystemdcatalogdir=/usr/lib/systemd/catalog \
-Dfuzzing=false \
-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
-Dhtmldocs=false \
@@ -99,6 +100,7 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
/usr/lib/systemd/system/rauc-mark-good.service)
@$(call install_link, rauc, ../rauc-mark-good.service, \
/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
+ @$(call install_copy, rauc, 0, 0, 0644, -, /usr/lib/systemd/catalog/rauc.catalog)
else
@$(call install_copy, rauc, 0, 0, 0755, -, \
/usr/libexec/rauc-service.sh)
--
2.39.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12
2025-01-22 10:41 [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12 Rouven Czerwinski
@ 2025-01-22 12:09 ` Roland Hieber
2025-01-22 16:40 ` Michael Olbrich
2025-01-27 8:35 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Roland Hieber @ 2025-01-22 12:09 UTC (permalink / raw)
To: Rouven Czerwinski; +Cc: ptxdist
On Wed, Jan 22, 2025 at 11:41:41AM +0100, Rouven Czerwinski wrote:
> License changes because the copyright was extended for 2024.
>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
> rules/rauc.make | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 38577f94d..06b8419c0 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
> #
> # Paths and names
> #
> -RAUC_VERSION := 1.11.3
> -RAUC_MD5 := f6822268230e50efb6b2fe3a4db28e2b
> +RAUC_VERSION := 1.12
> +RAUC_MD5 := cb95d7491bf65f313357bc268c7bca29
> RAUC := rauc-$(RAUC_VERSION)
> RAUC_SUFFIX := tar.xz
> RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> @@ -23,7 +23,7 @@ RAUC_SOURCE := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
> RAUC_DIR := $(BUILDDIR)/$(RAUC)
> RAUC_LICENSE := LGPL-2.1-or-later
> RAUC_LICENSE_FILES := \
> - file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
> + file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
> file://COPYING;md5=4fbd65380cdd255951079008b364516c
>
> # ----------------------------------------------------------------------------
> @@ -40,6 +40,7 @@ RAUC_CONF_OPT := \
> -Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> -Ddbuspolicydir=/usr/share/dbus-1/system.d \
> -Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> + -Dsystemdcatalogdir=/usr/lib/systemd/catalog \
> -Dfuzzing=false \
> -Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> -Dhtmldocs=false \
> @@ -99,6 +100,7 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
> /usr/lib/systemd/system/rauc-mark-good.service)
> @$(call install_link, rauc, ../rauc-mark-good.service, \
> /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
> + @$(call install_copy, rauc, 0, 0, 0644, -, /usr/lib/systemd/catalog/rauc.catalog)
Just a small note, the commit introducing the catalog [1] mentions that running
"journalctl --update-catalog" is needed to update the binary catalog index. Do
we have a way to do that during the build for read-only file systems?
[1]: https://github.com/rauc/rauc/commit/432d212f34493277476a
Other than that, looks good to me.
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
> else
> @$(call install_copy, rauc, 0, 0, 0755, -, \
> /usr/libexec/rauc-service.sh)
> --
> 2.39.5
--
Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12
2025-01-22 12:09 ` Roland Hieber
@ 2025-01-22 16:40 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-01-22 16:40 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist, Rouven Czerwinski
On Wed, Jan 22, 2025 at 01:09:40PM +0100, Roland Hieber wrote:
> On Wed, Jan 22, 2025 at 11:41:41AM +0100, Rouven Czerwinski wrote:
> > License changes because the copyright was extended for 2024.
> >
> > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > ---
> > rules/rauc.make | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/rules/rauc.make b/rules/rauc.make
> > index 38577f94d..06b8419c0 100644
> > --- a/rules/rauc.make
> > +++ b/rules/rauc.make
> > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
> > #
> > # Paths and names
> > #
> > -RAUC_VERSION := 1.11.3
> > -RAUC_MD5 := f6822268230e50efb6b2fe3a4db28e2b
> > +RAUC_VERSION := 1.12
> > +RAUC_MD5 := cb95d7491bf65f313357bc268c7bca29
> > RAUC := rauc-$(RAUC_VERSION)
> > RAUC_SUFFIX := tar.xz
> > RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> > @@ -23,7 +23,7 @@ RAUC_SOURCE := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
> > RAUC_DIR := $(BUILDDIR)/$(RAUC)
> > RAUC_LICENSE := LGPL-2.1-or-later
> > RAUC_LICENSE_FILES := \
> > - file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
> > + file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
> > file://COPYING;md5=4fbd65380cdd255951079008b364516c
> >
> > # ----------------------------------------------------------------------------
> > @@ -40,6 +40,7 @@ RAUC_CONF_OPT := \
> > -Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> > -Ddbuspolicydir=/usr/share/dbus-1/system.d \
> > -Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> > + -Dsystemdcatalogdir=/usr/lib/systemd/catalog \
> > -Dfuzzing=false \
> > -Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> > -Dhtmldocs=false \
> > @@ -99,6 +100,7 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
> > /usr/lib/systemd/system/rauc-mark-good.service)
> > @$(call install_link, rauc, ../rauc-mark-good.service, \
> > /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
> > + @$(call install_copy, rauc, 0, 0, 0644, -, /usr/lib/systemd/catalog/rauc.catalog)
>
> Just a small note, the commit introducing the catalog [1] mentions that running
> "journalctl --update-catalog" is needed to update the binary catalog index. Do
> we have a way to do that during the build for read-only file systems?
We're currently not installing any catalog files in PTXdist. And I don't
think we should install it at all.
This needs something like what we do for the hwdb to generate the database
at buildtime.
I'll drop this hunk.
Michael
> [1]: https://github.com/rauc/rauc/commit/432d212f34493277476a
>
> Other than that, looks good to me.
>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
>
> > else
> > @$(call install_copy, rauc, 0, 0, 0755, -, \
> > /usr/libexec/rauc-service.sh)
> > --
> > 2.39.5
>
> --
> Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de |
> Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rauc: package bump 1.11.3 -> 1.12
2025-01-22 10:41 [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12 Rouven Czerwinski
2025-01-22 12:09 ` Roland Hieber
@ 2025-01-27 8:35 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-01-27 8:35 UTC (permalink / raw)
To: ptxdist; +Cc: Rouven Czerwinski
Thanks, applied as a55c24450a699adb051be059c59fa0559a1ceb99.
Michael
[sent from post-receive hook]
On Mon, 27 Jan 2025 09:35:08 +0100, Rouven Czerwinski <r.czerwinski@pengutronix.de> wrote:
> License changes because the copyright was extended for 2024.
>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20250122104141.286629-1-r.czerwinski@pengutronix.de>
> [mol: don't install catalog file]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 38577f94d486..775060b1d512 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
> #
> # Paths and names
> #
> -RAUC_VERSION := 1.11.3
> -RAUC_MD5 := f6822268230e50efb6b2fe3a4db28e2b
> +RAUC_VERSION := 1.12
> +RAUC_MD5 := cb95d7491bf65f313357bc268c7bca29
> RAUC := rauc-$(RAUC_VERSION)
> RAUC_SUFFIX := tar.xz
> RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> @@ -23,7 +23,7 @@ RAUC_SOURCE := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
> RAUC_DIR := $(BUILDDIR)/$(RAUC)
> RAUC_LICENSE := LGPL-2.1-or-later
> RAUC_LICENSE_FILES := \
> - file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
> + file://README.rst;startline=281;endline=294;md5=a0262c76b558b6a450c56cae990d129a \
> file://COPYING;md5=4fbd65380cdd255951079008b364516c
>
> # ----------------------------------------------------------------------------
> @@ -40,6 +40,7 @@ RAUC_CONF_OPT := \
> -Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> -Ddbuspolicydir=/usr/share/dbus-1/system.d \
> -Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> + -Dsystemdcatalogdir=/usr/lib/systemd/catalog \
> -Dfuzzing=false \
> -Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> -Dhtmldocs=false \
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-27 8:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-22 10:41 [ptxdist] [PATCH] rauc: package bump 1.11.3 -> 1.12 Rouven Czerwinski
2025-01-22 12:09 ` Roland Hieber
2025-01-22 16:40 ` Michael Olbrich
2025-01-27 8:35 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox