Skip to contentSkip to conversation

Use bzip2 for X11 PFC font compression

PATCH RESEND Superseded Aaron Sierra 3 participants 11 messages Jul 13, 2020 – Jul 21, 2020

lore
Share & tools
lore
#0 lore raw

cover Use bzip2 for X11 PFC font compression

Gzip has been used as the default compressor for PCF fonts, but this series changes the default compressor to bzip2 for a few reasons:

1. Even with the latest gzip, these seemingly synonymous pipelines produce different output, but this issue does not exist with bzip2:

  $ cat /path/to/file | gzip > /path/to/file.gz
  $ gzip < /path/to/file > /path/to/file.gz

2. Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

* cat /path/to/file | gzip > /path/to/file.gz

3. The BR2_USE_WCHAR dependency of the gzip package tarnishes the appeal of using host-gzip to provide reproducible output.

After building all PCF fonts under package/x11r7, the bzipped output is slightly smaller:

gzip - 42392 KB
bzip2 - 40500 KB

This change does not affect encodings, which will continue to be gzipped. The upstream sources don't support bzip2 compression and their compression pipeline happens to be reproducible before gzip 1.10:

* gzip < /path/to/file > /path/to/file.gz

-Aaron

Aaron Sierra (2):
package/x11r7/xapp_mkfontscale: support bzip2 package/x11r7/xfont_font-*: make outputs reproducible

 package/x11r7/xapp_mkfontscale/Config.in                    | 1 +
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk          | 6 ++++--
 .../xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk      | 1 +
 .../x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk  | 1 +
 .../xfont_font-adobe-utopia-100dpi.mk                       | 1 +
 .../xfont_font-adobe-utopia-75dpi.mk                        | 1 +
 .../x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk  | 1 +
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk  | 1 +
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk    | 1 +
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                | 1 +
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                 | 1 +
 .../xfont_font-bitstream-100dpi.mk                          | 1 +
 .../xfont_font-bitstream-75dpi.mk                           | 1 +
 .../xfont_font-cronyx-cyrillic.mk                           | 1 +
 .../x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk  | 1 +
 .../x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk  | 1 +
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk    | 1 +
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk  | 1 +
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk    | 1 +
 .../x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk    | 1 +
 .../xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk    | 1 +
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk  | 1 +
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk  | 1 +
 .../xfont_font-schumacher-misc.mk                           | 1 +
 .../xfont_font-screen-cyrillic.mk                           | 1 +
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk  | 1 +
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk    | 1 +
 .../xfont_font-winitzki-cyrillic.mk                         | 1 +
 28 files changed, 31 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH RESEND 1/2 package/x11r7/xapp_mkfontscale: support bzip2

Support bzip2 compression for PCF fonts, since gzip is not reproducible due to its use of -N/--name by default.

---
 package/x11r7/xapp_mkfontscale/Config.in           | 1 +
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
package/x11r7/xapp_mkfontscale/Config.in +1 -0
index d0a9d89658..02eff4f9f1 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAPP_MKFONTSCALE
 	bool "mkfontscale"
+	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBFONTENC
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +4 -2
index 11d9cc952f..96cde6b942 100644
@@ -9,9 +9,11 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_LICENSE = MIT
 XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
-XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto
+XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2
+XAPP_MKFONTSCALE_DEPENDENCIES = bzip2 zlib freetype xlib_libfontenc xorgproto
+HOST_XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2
 HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \
-	host-zlib host-freetype host-xlib_libfontenc host-xorgproto
+	host-bzip2 host-zlib host-freetype host-xlib_libfontenc host-xorgproto
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.17.1
#2 lore raw

PATCH RESEND 1/2 package/x11r7/xapp_mkfontscale: support bzip2

Quoted 16 lines · On Mon, 13 Jul 2020 13:47:50 -0500 Aaron Sierra <[email protected]> wrote:
package/x11r7/xapp_mkfontscale/Config.in +1 -0
index d0a9d89658..02eff4f9f1 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAPP_MKFONTSCALE
 	bool "mkfontscale"
+	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBFONTENC
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +0 -0
index 11d9cc952f..96cde6b942 100644

package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 · line 16

Quoted 10 lines
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +4 -2
@@ -9,9 +9,11 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_LICENSE = MIT
 XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
-XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto
+XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2
+XAPP_MKFONTSCALE_DEPENDENCIES = bzip2 zlib freetype xlib_libfontenc xorgproto
+HOST_XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2
 HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \
-	host-zlib host-freetype host-xlib_libfontenc host-xorgproto
+	host-bzip2 host-zlib host-freetype host-xlib_libfontenc host-xorgproto

Can we drop the zlib/host-zlib dependencies then, after PATCH 2/2 ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH RESEND 2/2 package/x11r7/xfont_font-*: make outputs reproducible

In reply to Aaron Sierra

The default gzip compression of Portable Compiled Format fonts makes the output of these packages non-reproducible. This is because gzip defaults to using the -N option, which embeds the timestamp of the original file within the compressed copy.

The other options, compress (.Z); bzip2; and none, are all reproducible.

This makes bzip2 the default compression for PCF fonts.

---
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 1 +
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk   | 1 +
 .../xfont_font-adobe-utopia-100dpi.mk                            | 1 +
 .../xfont_font-adobe-utopia-75dpi.mk                             | 1 +
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk   | 1 +
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk       | 1 +
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk         | 1 +
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                     | 1 +
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                      | 1 +
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk   | 1 +
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk     | 1 +
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk     | 1 +
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk   | 1 +
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk   | 1 +
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk         | 1 +
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk       | 1 +
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk         | 1 +
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk     | 1 +
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk   | 1 +
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk       | 1 +
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk       | 1 +
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk     | 1 +
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk     | 1 +
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk       | 1 +
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk         | 1 +
 .../xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 1 +
 26 files changed, 26 insertions(+)
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1 -0
index bc05a2165c..544ff87922 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/f
 XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_ADOBE_100DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1 -0
index f77c1706cd..b17b5dd721 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_ADOBE_75DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1 -0
index 1c157dd4cf..51c7c292c0 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/indiv
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_ADOBE_UTOPIA_100DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1 -0
index cd60b34fce..0c6d57e470 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/indivi
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_ADOBE_UTOPIA_75DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1 -0
index e8f6f3d2e6..66b822c4d7 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_ARABIC_MISC_LICENSE = MIT
 XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_ARABIC_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1 -0
index d1176d54e5..fa9cf94a6d 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BH_100DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1 -0
index 5b05f5f797..8e09c70ea3 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BH_75DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1 -0
index 4afec6ce69..d54486ee88 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/release
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1 -0
index 7a36c11053..1518be3a57 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1 -0
index 9812ddc1b7..3db1f2d2f7 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individu
 XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BITSTREAM_100DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1 -0
index 91dfeb2ac8..0528a7a725 100644
@@ -10,6 +10,7 @@ XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
 
+XFONT_FONT_BITSTREAM_75DPI_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1 -0
index 28329a36bb..d13e9e6a38 100644
@@ -10,6 +10,7 @@ XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
 
+XFONT_FONT_CRONYX_CYRILLIC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1 -0
index 9e8852aeee..76e34f6224 100644
@@ -10,6 +10,7 @@ XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
 XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_CURSOR_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1 -0
index f591b8b80b..07d190af65 100644
@@ -9,6 +9,7 @@ XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSIO
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_DAEWOO_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1 -0
index 10d24c6c57..2f61e3af86 100644
@@ -10,6 +10,7 @@ XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DEC_MISC_LICENSE = MIT
 XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_DEC_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1 -0
index 721f93d80f..402762094b 100644
@@ -10,6 +10,7 @@ XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ISAS_MISC_LICENSE = MIT
 XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_ISAS_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1 -0
index 1736aed179..e4e532de17 100644
@@ -9,6 +9,7 @@ XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_JIS_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1 -0
index 60105427df..f99ffbeb5f 100644
@@ -10,6 +10,7 @@ XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fon
 XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
 XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_MICRO_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1 -0
index 2263972084..070727807b 100644
@@ -10,6 +10,7 @@ XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/
 XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
 XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
 
+XFONT_FONT_MISC_CYRILLIC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1 -0
index dd62f05026..92b5f9e865 100644
@@ -10,6 +10,7 @@ XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_MISC_LICENSE = Public Domain
 XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_MISC_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1 -0
index 475fc68b2a..c3fffede0f 100644
@@ -10,6 +10,7 @@ XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MUTT_MISC_LICENSE = MIT
 XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_MUTT_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1 -0
index b50ed57688..bffe842921 100644
@@ -10,6 +10,7 @@ XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
 XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_SCHUMACHER_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1 -0
index dd444594ed..ed4d77c58a 100644
@@ -10,6 +10,7 @@ XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
 
+XFONT_FONT_SCREEN_CYRILLIC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1 -0
index ae4444e597..0ad1140c3f 100644
@@ -10,6 +10,7 @@ XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SONY_MISC_LICENSE = MIT
 XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_SONY_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1 -0
index c1e2dac72e..1c9d217f22 100644
@@ -10,6 +10,7 @@ XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SUN_MISC_LICENSE = MIT
 XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
 
+XFONT_FONT_SUN_MISC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1 -0
index 8e83d44665..22f5fdf02d 100644
@@ -10,6 +10,7 @@ XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individ
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
 
+XFONT_FONT_WINITZKI_CYRILLIC_CONF_OPTS = --with-compression=bzip2
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
Signature · 1 line
2.17.1
#4 lore raw

cover Use bzip2 for X11 PFC font compression

In reply to Aaron Sierra

Hello Aaron,

Thanks for this work!

Quoted 9 lines · On Mon, 13 Jul 2020 13:47:49 -0500 Aaron Sierra <[email protected]> wrote:

Gzip has been used as the default compressor for PCF fonts, but this series changes the default compressor to bzip2 for a few reasons:

1. Even with the latest gzip, these seemingly synonymous pipelines produce different output, but this issue does not exist with bzip2:

  $ cat /path/to/file | gzip > /path/to/file.gz
  $ gzip < /path/to/file > /path/to/file.gz
Quoted 7 lines

2. Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

* cat /path/to/file | gzip > /path/to/file.gz

3. The BR2_USE_WCHAR dependency of the gzip package tarnishes the appeal of using host-gzip to provide reproducible output.

This argument seems pretty weird. The fact that gzip needs BR2_USE_WCHAR on the target doesn't at all prevent from building host-gzip. We have plenty of host packages that need wchar packages, and we simply assume the host system as wide char support available.

So this third argument is a bit "moot", especially since host-xapp-mkfontscale already has a dependency on host-gzip, which builds a gzip 1.10, so it shouldn't be affected by the problem you describe.

So that leaves us with just argument (1), correct ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

cover Use bzip2 for X11 PFC font compression

Quoted 2 lines · On Mon, 13 Jul 2020 21:32:25 +0200 Thomas Petazzoni…

So this third argument is a bit "moot", especially since host-xapp-mkfontscale already has a dependency on host-gzip, which

Sorry, host-xapp-mkfontscale has a dependency on host-zlib, but adding a dependency on host-gzip should not cause any problem.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

cover Use bzip2 for X11 PFC font compression

In reply to Thomas Petazzoni

----- Original Message -----

Quoted 2 lines

From: "Thomas Petazzoni" <[email protected]>
Sent: Monday, July 13, 2020 2:32:25 PM

Hi Thomas,

Thanks for your review.

Quoted 29 lines

Hello Aaron,

Thanks for this work!

Quoted 9 lines · On Mon, 13 Jul 2020 13:47:49 -0500 Aaron Sierra <[email protected]> wrote:

Gzip has been used as the default compressor for PCF fonts, but this series changes the default compressor to bzip2 for a few reasons:

1. Even with the latest gzip, these seemingly synonymous pipelines produce different output, but this issue does not exist with bzip2:

  $ cat /path/to/file | gzip > /path/to/file.gz
  $ gzip < /path/to/file > /path/to/file.gz
Quoted 7 lines

2. Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

* cat /path/to/file | gzip > /path/to/file.gz

3. The BR2_USE_WCHAR dependency of the gzip package tarnishes the appeal of using host-gzip to provide reproducible output.

This argument seems pretty weird. The fact that gzip needs BR2_USE_WCHAR on the target doesn't at all prevent from building host-gzip. We have plenty of host packages that need wchar packages, and we simply assume the host system as wide char support available.

Quoted 4 lines

So this third argument is a bit "moot", especially since host-xapp-mkfontscale already has a dependency on host-gzip, which builds a gzip 1.10, so it shouldn't be affected by the problem you describe.

OK, then maybe adding a host-gzip dependency would be the better solution. I've found some evidence that this patchset isn't complete with respect to X itself using bzip-compressed fonts :(

Quoted 1 line

So that leaves us with just argument (1), correct ?

Well, I think that (2) or (3) would be needed as the real justification for switching compression mechanisms. Let me investigate the host-gzip path now that I know that isn't a compatibility problem.

-Aaron

Quoted 5 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#7 lore raw

cover Use bzip2 for X11 PFC font compression

Quoted 28 lines · On Mon, 13 Jul 2020 14:55:10 -0500 (CDT) Aaron Sierra <[email protected]>…
Quoted 19 lines
Quoted 6 lines

1. Even with the latest gzip, these seemingly synonymous pipelines produce different output, but this issue does not exist with bzip2:

  $ cat /path/to/file | gzip > /path/to/file.gz
  $ gzip < /path/to/file > /path/to/file.gz
Quoted 7 lines

2. Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

* cat /path/to/file | gzip > /path/to/file.gz

3. The BR2_USE_WCHAR dependency of the gzip package tarnishes the appeal of using host-gzip to provide reproducible output.

This argument seems pretty weird. The fact that gzip needs BR2_USE_WCHAR on the target doesn't at all prevent from building host-gzip. We have plenty of host packages that need wchar packages, and we simply assume the host system as wide char support available.

Quoted 4 lines

So this third argument is a bit "moot", especially since host-xapp-mkfontscale already has a dependency on host-gzip, which builds a gzip 1.10, so it shouldn't be affected by the problem you describe.

OK, then maybe adding a host-gzip dependency would be the better solution. I've found some evidence that this patchset isn't complete with respect to X itself using bzip-compressed fonts :(

Quoted 5 lines
Quoted 1 line

So that leaves us with just argument (1), correct ?

Well, I think that (2) or (3) would be needed as the real justification for switching compression mechanisms. Let me investigate the host-gzip path now that I know that isn't a compatibility problem.

OK, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH v2 1/1 package/x11r7/xfont_font-*: make outputs reproducible

In reply to Aaron Sierra

Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

  $ cat /path/to/file | gzip > /path/to/file.gz

This updates Portable Compiled Format font packages to have a host-gzip dependency, so gzip version 1.10 or newer will reliably be used.

This change does not affect encodings, which use a seemingly synonymous compression pipeline that happens to be reproducible with gzip versions at least as old as version 1.3.13:

  $ gzip < /path/to/file > /path/to/file.gz

---
Changes v1 -> v2:
- Use host-gzip instead of converting to bzip2 for reproducibility

 .../xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk     | 7 ++++++-
 .../x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 7 ++++++-
 .../xfont_font-adobe-utopia-100dpi.mk                      | 7 ++++++-
 .../xfont_font-adobe-utopia-75dpi.mk                       | 7 ++++++-
 .../x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 7 ++++++-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 7 ++++++-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk   | 7 ++++++-
 .../xfont_font-bh-lucidatypewriter-100dpi.mk               | 7 ++++++-
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                | 7 ++++++-
 .../xfont_font-bitstream-100dpi.mk                         | 7 ++++++-
 .../xfont_font-bitstream-75dpi.mk                          | 7 ++++++-
 .../xfont_font-cronyx-cyrillic.mk                          | 7 ++++++-
 .../x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 7 ++++++-
 .../x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 7 ++++++-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk   | 7 ++++++-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 7 ++++++-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk   | 7 ++++++-
 .../x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk   | 7 ++++++-
 .../xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk   | 7 ++++++-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 7 ++++++-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 7 ++++++-
 .../xfont_font-schumacher-misc.mk                          | 7 ++++++-
 .../xfont_font-screen-cyrillic.mk                          | 7 ++++++-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 7 ++++++-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk   | 7 ++++++-
 .../xfont_font-winitzki-cyrillic.mk                        | 7 ++++++-
 26 files changed, 156 insertions(+), 26 deletions(-)
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +6 -1
index bc05a2165c..2418769808 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +6 -1
index f77c1706cd..90e94d27cb 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +6 -1
index 1c157dd4cf..83157f5c67 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +6 -1
index cd60b34fce..ac3bf2e230 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +6 -1
index e8f6f3d2e6..c867a60233 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ARABIC_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +6 -1
index d1176d54e5..cc15738692 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BH_100DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +6 -1
index 5b05f5f797..788a76a2b9 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BH_75DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +6 -1
index 4afec6ce69..2f055ddab9 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +6 -1
index 7a36c11053..4166b2d741 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +6 -1
index 9812ddc1b7..90d9e5bbb4 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +6 -1
index 91dfeb2ac8..deb99aa596 100644
@@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +6 -1
index 28329a36bb..caca639c25 100644
@@ -12,6 +12,11 @@ XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +6 -1
index 9e8852aeee..e752803086 100644
@@ -12,6 +12,11 @@ XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_CURSOR_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +6 -1
index f591b8b80b..f5bd941383 100644
@@ -11,6 +11,11 @@ XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +6 -1
index 10d24c6c57..1642b41352 100644
@@ -12,6 +12,11 @@ XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_DEC_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +6 -1
index 721f93d80f..1393d67eae 100644
@@ -12,6 +12,11 @@ XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_ISAS_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +6 -1
index 1736aed179..78a5bbbf8e 100644
@@ -11,6 +11,11 @@ XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_JIS_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +6 -1
index 60105427df..b5da83f398 100644
@@ -12,6 +12,11 @@ XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_MICRO_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +6 -1
index 2263972084..8fa30ea314 100644
@@ -12,6 +12,11 @@ XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +6 -1
index dd62f05026..e03da6f1b5 100644
@@ -12,6 +12,11 @@ XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_MISC_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +6 -1
index 475fc68b2a..6fcaa5dadc 100644
@@ -12,6 +12,11 @@ XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_MUTT_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +6 -1
index b50ed57688..e07569d4b4 100644
@@ -12,6 +12,11 @@ XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +6 -1
index dd444594ed..a254d4a756 100644
@@ -12,6 +12,11 @@ XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +6 -1
index ae4444e597..6e580fd922 100644
@@ -12,6 +12,11 @@ XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_SONY_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +6 -1
index c1e2dac72e..737cfb5c9b 100644
@@ -12,6 +12,11 @@ XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_SUN_MISC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +6 -1
index 8e83d44665..e43cd1150f 100644
@@ -12,6 +12,11 @@ XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
-XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf
+XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = \
+	xfont_font-util \
+	host-xfont_font-util \
+	host-xapp_mkfontscale \
+	host-xapp_bdftopcf \
+	host-gzip
 
 $(eval $(autotools-package))
Signature · 1 line
2.17.1
#9 lore raw

PATCH v2 1/1 package/x11r7/xfont_font-*: make outputs reproducible

Quoted 12 lines · On Mon, 13 Jul 2020 20:24:59 -0500 Aaron Sierra <[email protected]> wrote:

Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

  $ cat /path/to/file | gzip > /path/to/file.gz

This updates Portable Compiled Format font packages to have a host-gzip dependency, so gzip version 1.10 or newer will reliably be used.

This change does not affect encodings, which use a seemingly synonymous compression pipeline that happens to be reproducible with gzip versions at least as old as version 1.3.13:

Quoted 7 lines
  $ gzip < /path/to/file > /path/to/file.gz

---
Changes v1 -> v2:
- Use host-gzip instead of converting to bzip2 for reproducibility

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH v2 1/1 package/x11r7/xfont_font-*: make outputs reproducible

In reply to Aaron Sierra
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Aaron" == Aaron Sierra <[email protected]> writes:

Prior to gzip 1.10, the compression pipeline used with PCF fonts was not reproducible due to the implicit -N/--name injecting a timestamp:

  $ cat /path/to/file | gzip > /path/to/file.gz

This updates Portable Compiled Format font packages to have a host-gzip dependency, so gzip version 1.10 or newer will reliably be used.

This change does not affect encodings, which use a seemingly synonymous compression pipeline that happens to be reproducible with gzip versions at least as old as version 1.3.13:

Quoted 7 lines
  $ gzip < /path/to/file > /path/to/file.gz

---
Changes v1 -> v2:
- Use host-gzip instead of converting to bzip2 for reproducibility

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard