[Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Petr Vorel]

From: Petr Vorel <petr.vorel@gmail.com>

debian/copyright has been moved to a different tarball
(debianutils_5.7-0.2.debian.tar.xz) which does not contain the source
code, thus build from salsa git instead of tarball from
https://snapshot.debian.org/.

Add patch to disable po4a (unnecessary dependency just to get
translations).

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 package/debianutils/0001-Disable-po4a.patch | 25 +++++++++++++++++++++
 package/debianutils/debianutils.hash        |  6 ++---
 package/debianutils/debianutils.mk          |  7 +++---
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 package/debianutils/0001-Disable-po4a.patch

diff --git a/package/debianutils/0001-Disable-po4a.patch b/package/debianutils/0001-Disable-po4a.patch
new file mode 100644
index 0000000000..2af9a93279
--- /dev/null
+++ b/package/debianutils/0001-Disable-po4a.patch
@@ -0,0 +1,25 @@
+From 7134952f97ad5afb208e270571afbfe12670cc14 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel@gmail.com>
+Date: Mon, 25 Jul 2022 12:59:45 +0200
+Subject: [PATCH] Disable po4a
+
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 86ac499..7c61896 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = po4a
++# SUBDIRS = po4a
+ 
+ EXTRA_DIST = CHANGELOG CONTRIBUTING .gitlab-ci.yml
+ 
+-- 
+2.37.1
+
diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash
index 16a45d4ea1..cd77b54ad1 100644
--- a/package/debianutils/debianutils.hash
+++ b/package/debianutils/debianutils.hash
@@ -1,4 +1,4 @@
-# From http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils/debianutils_4.11.dsc
-sha256 bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151 debianutils_4.11.tar.xz
 # Locally calculated
-sha256 3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567 debian/copyright
+sha256  76ba936451d9ea23a397d60d93ffc1a39544534f17a1f5b816cdaf4bb7a57486  debianutils-debian-5.7-0.2.tar.bz2
+# Locally calculated from https://snapshot.debian.org/archive/debian/20220501T215056Z/pool/main/d/debianutils/debianutils_5.7-0.2.debian.tar.xz
+sha256  3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567  debian/copyright
diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk
index d2c41130fb..05ef43135d 100644
--- a/package/debianutils/debianutils.mk
+++ b/package/debianutils/debianutils.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-DEBIANUTILS_VERSION = 4.11
-DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz
-DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils
+DEBIANUTILS_VERSION = 5.7-0.2
+DEBIANUTILS_SOURCE = debianutils-debian-$(DEBIANUTILS_VERSION).tar.bz2
+DEBIANUTILS_SITE = https://salsa.debian.org/debian/debianutils/-/archive/debian/$(DEBIANUTILS_VERSION)
+DEBIANUTILS_AUTORECONF = YES
 DEBIANUTILS_CONF_OPTS = --exec-prefix=/
 DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog)
 DEBIANUTILS_LICENSE_FILES = debian/copyright
-- 
2.36.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Thomas Petazzoni via buildroot]

Hello Petr,

On Tue, 26 Jul 2022 21:38:10 +0200
Petr Vorel <pevik@seznam.cz> wrote:

> From: Petr Vorel <petr.vorel@gmail.com>
> 
> debian/copyright has been moved to a different tarball
> (debianutils_5.7-0.2.debian.tar.xz) which does not contain the source
> code, thus build from salsa git instead of tarball from
> https://snapshot.debian.org/.
> 
> Add patch to disable po4a (unnecessary dependency just to get
> translations).
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
>  package/debianutils/0001-Disable-po4a.patch | 25 +++++++++++++++++++++
>  package/debianutils/debianutils.hash        |  6 ++---
>  package/debianutils/debianutils.mk          |  7 +++---
>  3 files changed, 32 insertions(+), 6 deletions(-)
>  create mode 100644 package/debianutils/0001-Disable-po4a.patch
> 
> diff --git a/package/debianutils/0001-Disable-po4a.patch b/package/debianutils/0001-Disable-po4a.patch
> new file mode 100644
> index 0000000000..2af9a93279
> --- /dev/null
> +++ b/package/debianutils/0001-Disable-po4a.patch
> @@ -0,0 +1,25 @@
> +From 7134952f97ad5afb208e270571afbfe12670cc14 Mon Sep 17 00:00:00 2001
> +From: Petr Vorel <petr.vorel@gmail.com>
> +Date: Mon, 25 Jul 2022 12:59:45 +0200
> +Subject: [PATCH] Disable po4a
> +
> +Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> +---
> + Makefile.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 86ac499..7c61896 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -1,6 +1,6 @@
> + AUTOMAKE_OPTIONS = foreign
> + 
> +-SUBDIRS = po4a
> ++# SUBDIRS = po4a

We already have a po4a directory in the current version of debianutils.
Why suddenly do we have to remove this?

I'm also a bit annoyed by patches like this that we cannot upstream
(and therefore have to keep forever), and that require AUTORECONF :-/

Do we have a better solution?

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

Re: [Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Petr Vorel]

[-- Attachment #1.1: Type: text/plain, Size: 1523 bytes --]

Hi Thomas,

...

> > ++++ b/Makefile.am
> > +@@ -1,6 +1,6 @@
> > + AUTOMAKE_OPTIONS = foreign
> > +
> > +-SUBDIRS = po4a
> > ++# SUBDIRS = po4a
>
> We already have a po4a directory in the current version of debianutils.
> Why suddenly do we have to remove this?
>
There is a build dependency on po4a binary [1] [2] (the same name as the
directory with translations)
just to get translations, which buildroot does not use it:

$ make
Making all in po4a
make[1]: Entering directory 'debianutils.git/po4a'
Making all in de
make[2]: Entering directory 'debianutils.git/po4a/de'
po4a-translate not installed, failing to rebuild changed man page
translation
make[2]: *** [Makefile:491: add-shell.8] Error 1
make[2]: Leaving directory 'debianutils.git/po4a/de'
make[1]: *** [Makefile:310: all-recursive] Error 1
make[1]: Leaving directory 'debianutils.git/po4a'
make: *** [Makefile:655: all-recursive] Error 1

I'm also a bit annoyed by patches like this that we cannot upstream
> (and therefore have to keep forever), and that require AUTORECONF :-/
>
Understand, I'm sorry. I can either add  po4a as host package to have it in
build or
discuss with Debian maintainer how to make translations (po4a
non-mandatory).
What do you prefer? Hope I'm now clear about the goal.

Do we have a better solution?
>
> Kind regards,
Petr

[1] https://po4a.org/
[2] https://packages.debian.org/bullseye/po4a

Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
>

[-- Attachment #1.2: Type: text/html, Size: 2636 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Thomas Petazzoni via buildroot]

Hello Petr,

On Fri, 29 Jul 2022 20:36:09 +0200
Petr Vorel <petr.vorel@gmail.com> wrote:

> I'm also a bit annoyed by patches like this that we cannot upstream
> > (and therefore have to keep forever), and that require AUTORECONF :-/
> >  
> Understand, I'm sorry. I can either add  po4a as host package to have it in
> build or discuss with Debian maintainer how to make translations (po4a
> non-mandatory).
> What do you prefer? Hope I'm now clear about the goal.

I would prefer to make translations not mandatory. Actually, there is
already some partial logic for it, but not used properly. The following
patch is probably a useful start:

diff --git a/Makefile.am b/Makefile.am
index 86ac499..d433444 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
+if TRANSLATE_DOCS
 SUBDIRS = po4a
+endif
 
 EXTRA_DIST = CHANGELOG CONTRIBUTING .gitlab-ci.yml
 
diff --git a/po4a/de/Makefile.am b/po4a/de/Makefile.am
index 11f0094..d14e297 100644
--- a/po4a/de/Makefile.am
+++ b/po4a/de/Makefile.am
@@ -3,11 +3,7 @@ AUTOMAKE_OPTIONS=foreign
 l = de
 addendum = -a $(top_srcdir)/po4a/$(l)/translator_german.add
 
-if TRANSLATE_DOCS
-  TRANSLATE = po4a-translate -k 0 -f man $(addendum) -p $(top_srcdir)/po4a/po/$(l).po
-else
-  TRANSLATE = @echo po4a-translate not installed, failing to rebuild changed man page translation; exit 1;
-endif
+TRANSLATE = po4a-translate -k 0 -f man $(addendum) -p $(top_srcdir)/po4a/po/$(l).po
 
 EXTRA_DIST = translator_german.add

TRANSLATE_DOCS is already provided by configure.ac, depending on
whether po4a is available or not.

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

Re: [Buildroot] [PATCH 1/1] package/debianutils: bump version to 5.7-0.2

[Petr Vorel]

[-- Attachment #1.1: Type: text/plain, Size: 846 bytes --]

Hi Thomas,

On Wed, 3 Aug 2022 at 23:57, Thomas Petazzoni <thomas.petazzoni@bootlin.com>
wrote:

> Hello Petr,
>
> On Fri, 29 Jul 2022 20:36:09 +0200
> Petr Vorel <petr.vorel@gmail.com> wrote:
>
> > I'm also a bit annoyed by patches like this that we cannot upstream
> > > (and therefore have to keep forever), and that require AUTORECONF :-/
> > >
> > Understand, I'm sorry. I can either add  po4a as host package to have it
> in
> > build or discuss with Debian maintainer how to make translations (po4a
> > non-mandatory).
> > What do you prefer? Hope I'm now clear about the goal.
>
> I would prefer to make translations not mandatory.

Thanks for info. Understand, makes sense.


> Actually, there is
> already some partial logic for it, but not used properly. The following
> patch is probably a useful start:
>
Thanks!

Kind regards,
Petr

[-- Attachment #1.2: Type: text/html, Size: 1495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot