Various skarnet.org updates and new tipidee package
v2 cover Various skarnet.org updates and new tipidee package
---
Changes in v2:
- Add missing Signed-off-by tags
- Update license file hashes where necessary
- Link to v1: https://lore.kernel.org/r/[email protected]
---
J. Neuschäfer (8):
skalibs: bump to version 2.14.2.0
s6: bump to version 2.13.0.1
execline: bump to version 2.9.6.0
s6-networking: bump to version 2.7.0.3
s6-rc: bump to version 0.5.4.3
mdevd: bump to version 0.1.6.4
s6-dns: bump to version 2.3.7.2
tipidee: new packagepackage/Config.in | 1 + package/Config.in.host | 1 + package/execline/execline.hash | 2 +- package/execline/execline.mk | 2 +- package/mdevd/mdevd.hash | 4 +- package/mdevd/mdevd.mk | 2 +- package/s6-dns/s6-dns.hash | 4 +- package/s6-dns/s6-dns.mk | 2 +- package/s6-networking/s6-networking.hash | 2 +- package/s6-networking/s6-networking.mk | 2 +- package/s6-rc/s6-rc.hash | 4 +- package/s6-rc/s6-rc.mk | 2 +- package/s6/s6.hash | 2 +- package/s6/s6.mk | 2 +- package/skalibs/skalibs.hash | 2 +- package/skalibs/skalibs.mk | 2 +- package/tipidee/Config.in | 37 ++++++++++++++++ package/tipidee/Config.in.host | 8 ++++ package/tipidee/tipidee.hash | 3 ++ package/tipidee/tipidee.mk | 72 ++++++++++++++++++++++++++++++++ 20 files changed, 139 insertions(+), 17 deletions(-)
---
base-commit: 3ebc7c69d56430c34eba4c869d1d4fe4d1e8de55
change-id: 20240704-tipidee-ee20ac10c7fa
Best regards,
--
J. Neuschäfer <[email protected]>
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/8 skalibs: bump to version 2.14.2.0
--- package/skalibs/skalibs.hash | 2 +- package/skalibs/skalibs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/skalibs/skalibs.hash +1 -1
@@ -1,3 +1,3 @@ # Locally generated -sha256 b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3 skalibs-2.14.1.1.tar.gz +sha256 ddfec5730e5b2f19d0381ecf7f796b39a6e473236bda0ad8d3776a3fe7b07e43 skalibs-2.14.2.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING
package/skalibs/skalibs.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -SKALIBS_VERSION = 2.14.1.1 +SKALIBS_VERSION = 2.14.2.0 SKALIBS_SITE = https://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/8 s6: bump to version 2.13.0.1
In reply to J. Neuschäfer via buildroot--- package/s6/s6.hash | 2 +- package/s6/s6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/s6/s6.hash +1 -1
@@ -1,3 +1,3 @@ # Locally generated -sha256 c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b s6-2.12.0.4.tar.gz +sha256 7e46f8f55d80bb0e2025a64d5d649af4a4ac21e348020caaadde30ba5e5b4830 s6-2.13.0.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING
package/s6/s6.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.12.0.4 +S6_VERSION = 2.13.0.0 S6_SITE = https://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 2/8] s6: bump to version 2.13.0.1
Hello J,
Quoted 5 lines · On Tue, 09 Jul 2024 00:45:33 +0200 J. Neuschäfer via buildroot…
Signed-off-by J. Neuschäfer <[email protected]>--- package/s6/s6.hash | 2 +- package/s6/s6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
I don't know for sure if it's related to the version bump, but our s6 runtime test is failing. See:
https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793195
[BRTEST# s6-test -p testpipe
-sh: s6-test: not found
Could you have a look perhaps ?
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 2/8] s6: bump to version 2.13.0.1
Quoted 14 lines · Thomas Petazzoni
Hello J,
Quoted 5 lines · On Tue, 09 Jul 2024 00:45:33 +0200 J. Neuschäfer via buildroot…
Signed-off-by J. Neuschäfer <[email protected]>--- package/s6/s6.hash | 2 +- package/s6/s6.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)I don't know for sure if it's related to the version bump, but our s6 runtime test is failing. See:
Quoted 6 lines
https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793195
[BRTEST# s6-test -p testpipe
-sh: s6-test: not foundCould you have a look perhaps ?
Thanks for the heads-up, I'll have a look later (in a few days probably).
-- jn
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/8 execline: bump to version 2.9.6.0
In reply to J. Neuschäfer via buildroot--- package/execline/execline.hash | 2 +- package/execline/execline.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/execline/execline.hash +1 -1
@@ -1,3 +1,3 @@ # Locally generated -sha256 df750035d0fb21c7265bffb7ed7e1b661de1e842944a2252bdcddc32d0d97217 execline-2.9.5.1.tar.gz +sha256 ba2a27e97c5eb6bd7ca6a0987a8925e44465a5be996daa0d18f8feca37d7571a execline-2.9.6.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING
package/execline/execline.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.9.5.1 +EXECLINE_VERSION = 2.9.6.0 EXECLINE_SITE = https://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/8 s6-networking: bump to version 2.7.0.3
In reply to J. Neuschäfer via buildroot--- package/s6-networking/s6-networking.hash | 2 +- package/s6-networking/s6-networking.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/s6-networking/s6-networking.hash +1 -1
@@ -1,3 +1,3 @@ # Locally generated -sha256 c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1 s6-networking-2.7.0.2.tar.gz +sha256 db411c54371a17ed7d4543dd86cf9530ce25fcf624bef83ae2b579520e5e70bf s6-networking-2.7.0.3.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING
package/s6-networking/s6-networking.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.7.0.2 +S6_NETWORKING_VERSION = 2.7.0.3 S6_NETWORKING_SITE = https://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/8 s6-rc: bump to version 0.5.4.3
In reply to J. Neuschäfer via buildrootThe COPYING hash changed because the copyright year was updated.
--- package/s6-rc/s6-rc.hash | 4 ++-- package/s6-rc/s6-rc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/s6-rc/s6-rc.hash +2 -2
@@ -1,3 +1,3 @@ # Locally generated -sha256 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 s6-rc-0.5.4.2.tar.gz -sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING +sha256 e3272796a947904de37ab34ec10430e26107b8ef05210d81059c8b36203e6a9f s6-rc-0.5.4.3.tar.gz +sha256 75b0b50d7bcb9b2fc174d01442536bce03333da1814df3e61cd6ef8f663548f1 COPYING
package/s6-rc/s6-rc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.5.4.2 +S6_RC_VERSION = 0.5.4.3 S6_RC_SITE = https://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 6/8 mdevd: bump to version 0.1.6.4
In reply to J. Neuschäfer via buildrootThe COPYING hash changed because the copyright year was updated.
--- package/mdevd/mdevd.hash | 4 ++-- package/mdevd/mdevd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/mdevd/mdevd.hash +2 -2
@@ -1,3 +1,3 @@ # Locally generated -sha256 f6ecf0ef7cd48d04efc75acb2dad967d850bc8815bdb0098f1c9ef043394d430 mdevd-0.1.6.3.tar.gz -sha256 b2edd59a202a710440522f05dcbf418b0493540120efcb407876772ee42d2c7c COPYING +sha256 7358ce530b6b9befb715e48190981e9b69a12cca858519e6d2e4b46eab7e2470 mdevd-0.1.6.4.tar.gz +sha256 701e0e7d93a5da6421f69bed2136d4c64fd4bc17f35221297838a3ad9ba6050e COPYING
package/mdevd/mdevd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.6.3 +MDEVD_VERSION = 0.1.6.4 MDEVD_SITE = https://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 7/8 s6-dns: bump to version 2.3.7.2
In reply to J. Neuschäfer via buildrootThe COPYING hash changed because the copyright year was updated.
--- package/s6-dns/s6-dns.hash | 4 ++-- package/s6-dns/s6-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/s6-dns/s6-dns.hash +2 -2
@@ -1,3 +1,3 @@ # Locally generated -sha256 cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d s6-dns-2.3.7.1.tar.gz -sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING +sha256 6aee32bb68d01f5109f71e31a283213c668cd3c0e79fb9e469e6cabb58079f2b s6-dns-2.3.7.2.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING
package/s6-dns/s6-dns.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.7.1 +S6_DNS_VERSION = 2.3.7.2 S6_DNS_SITE = https://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 8/8 tipidee: new package
In reply to J. Neuschäfer via buildroot--- package/Config.in | 1 + package/Config.in.host | 1 + package/tipidee/Config.in | 37 ++++++++++++++++++++++ package/tipidee/Config.in.host | 8 +++++ package/tipidee/tipidee.hash | 3 ++ package/tipidee/tipidee.mk | 72 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 122 insertions(+)
package/Config.in +1 -0
@@ -2595,6 +2595,7 @@ endif source "package/tinc/Config.in" source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" + source "package/tipidee/Config.in" source "package/tor/Config.in" source "package/traceroute/Config.in" source "package/transmission/Config.in"
package/Config.in.host +1 -0
@@ -112,6 +112,7 @@ menu "Host utilities" source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" + source "package/tipidee/Config.in.host" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/utp_com/Config.in.host"
package/tipidee/Config.in new file +37 -0
@@ -0,0 +1,37 @@ +config BR2_PACKAGE_TIPIDEE + bool "tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + tipidee is a web server. It supports HTTP 1.0 and 1.1. It aims + to be compliant with RFC 9112: while it only implements a very + limited subset of the optional functionality in HTTP 1.1, it + implements all the mandatory parts. It is usable with both + HTTP and HTTPS. + + It runs under a super-server, e.g. inetd, s6-tcpserver, or + s6-tlsserver (for HTTPS). Traditionally, inetd-mode web + servers aren't considered performant, but tipidee aims to eke + out every single drop of performance that is attainable with + its programming model. + + https://skarnet.org/software/tipidee/ + +if BR2_PACKAGE_TIPIDEE + +config BR2_PACKAGE_TIPIDEE_CONFIGURATION + bool "install a configuration file to /etc/tipidee.conf.cdb" + select BR2_PACKAGE_HOST_TIPIDEE + help + Build a tipidee configuration and install it to the target. + +config BR2_PACKAGE_TIPIDEE_CONFIGURATION_FILE + string "configuration source file" + default "$(CONFIG_DIR)/tipidee.conf" + depends on BR2_PACKAGE_TIPIDEE_CONFIGURATION + help + The configuration file in source (text) format, documented at: + + https://skarnet.org/software/tipidee/tipidee.conf.html + +endif
package/tipidee/Config.in.host new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_HOST_PACKAGE_TIPIDEE + bool "host tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + This package builds the tipidee-config tool for the host. + + https://skarnet.org/software/tipidee/
package/tipidee/tipidee.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally generated +sha256 d9e91fc719879a43d54329b99b02c6649c54e428e77bc96a0573506b52bf1422 tipidee-0.0.5.0.tar.gz +sha256 8feb7933c6e6506a7f20fbfc03fd37df3caff4becdf3b7a0ffad5016277e441e COPYING
package/tipidee/tipidee.mk new file +72 -0
72 lines not on this page · raw message
--
2.43.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 8/8] tipidee: new package
Quoted 1 line · J. Neuschäfer via buildroot
Signed-off-by J. Neuschäfer <[email protected]>
Applied series to master, thanks. The rest went in unchanged, but in this one,
I made quite a few changes:
- Remove BR2_PACKAGE_TIPIDEE_CONFIGURATION, use empty value of BR2_PACKAGE_TIPIDEE_CONFIG_FILE to flag false.
- Rename BR2_PACKAGE_TIPIDEE_CONFIGURATION_FILE to BR2_PACKAGE_TIPIDEE_CONFIG_FILE.
- Default BR2_PACKAGE_TIPIDEE_CONFIG_FILE to empty.
- Fix spelling of BR2_PACKAGE_HOST_TIPIDEE.
- Add J. to DEVELOPERS.
- Install in /usr instead of /.
You're welcome to add yourself to DEVELOPERS for other packages that you're
interested in (e.g. the skarnet series) as well.
Regards,
Arnout
Quoted 181 lines
--- package/Config.in | 1 + package/Config.in.host | 1 + package/tipidee/Config.in | 37 ++++++++++++++++++++++ package/tipidee/Config.in.host | 8 +++++ package/tipidee/tipidee.hash | 3 ++ package/tipidee/tipidee.mk | 72 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 122 insertions(+)package/Config.in +1
-0@@ -2595,6 +2595,7 @@ endif source "package/tinc/Config.in" source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" + source "package/tipidee/Config.in" source "package/tor/Config.in" source "package/traceroute/Config.in" source "package/transmission/Config.in"package/Config.in.host +1
-0@@ -112,6 +112,7 @@ menu "Host utilities" source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" + source "package/tipidee/Config.in.host" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/utp_com/Config.in.host"package/tipidee/Config.in new file +37
-0@@ -0,0 +1,37 @@ +config BR2_PACKAGE_TIPIDEE + bool "tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + tipidee is a web server. It supports HTTP 1.0 and 1.1. It aims + to be compliant with RFC 9112: while it only implements a very + limited subset of the optional functionality in HTTP 1.1, it + implements all the mandatory parts. It is usable with both + HTTP and HTTPS. + + It runs under a super-server, e.g. inetd, s6-tcpserver, or + s6-tlsserver (for HTTPS). Traditionally, inetd-mode web + servers aren't considered performant, but tipidee aims to eke + out every single drop of performance that is attainable with + its programming model. + + https://skarnet.org/software/tipidee/ + +if BR2_PACKAGE_TIPIDEE + +config BR2_PACKAGE_TIPIDEE_CONFIGURATION + bool "install a configuration file to /etc/tipidee.conf.cdb" + select BR2_PACKAGE_HOST_TIPIDEE + help + Build a tipidee configuration and install it to the target. + +config BR2_PACKAGE_TIPIDEE_CONFIGURATION_FILE + string "configuration source file" + default "$(CONFIG_DIR)/tipidee.conf" + depends on BR2_PACKAGE_TIPIDEE_CONFIGURATION + help + The configuration file in source (text) format, documented at: + + https://skarnet.org/software/tipidee/tipidee.conf.html + +endifpackage/tipidee/Config.in.host new file +8
-0@@ -0,0 +1,8 @@ +config BR2_HOST_PACKAGE_TIPIDEE + bool "host tipidee" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + This package builds the tipidee-config tool for the host. + + https://skarnet.org/software/tipidee/package/tipidee/tipidee.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally generated +sha256 d9e91fc719879a43d54329b99b02c6649c54e428e77bc96a0573506b52bf1422 tipidee-0.0.5.0.tar.gz +sha256 8feb7933c6e6506a7f20fbfc03fd37df3caff4becdf3b7a0ffad5016277e441e COPYINGpackage/tipidee/tipidee.mk new file +72
-1@@ -0,0 +1,72 @@ +################################################################################ +# +# tipidee +# +################################################################################ + +TIPIDEE_VERSION = 0.0.5.0 +TIPIDEE_SITE = https://skarnet.org/software/tipidee +TIPIDEE_LICENSE = ISC +TIPIDEE_LICENSE_FILES = COPYING +TIPIDEE_INSTALL_STAGING = YES +TIPIDEE_DEPENDENCIES = skalibs + +TIPIDEE_CONF_OPTS = \ + --prefix=/ \ + --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/include \ + --with-dynlib=$(STAGING_DIR)/lib \ + --with-lib=$(STAGING_DIR)/lib/skalibs \ + $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(SHARED_STATIC_LIBS_OPTS) + +define TIPIDEE_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(TIPIDEE_CONF_OPTS)) +endef + +define TIPIDEE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define TIPIDEE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + rm -f $(TARGET_DIR)/bin/tipidee-config + rm -f $(TARGET_DIR)/libexec/tipidee-config-preprocess +endef + +ifeq ($(BR2_PACKAGE_TIPIDEE_CONFIGURATION),y) +TIPIDEE_DEPENDENCIES += host-tipidee + +define TIPIDEE_INSTALL_CONFIG + $(HOST_DIR)/bin/tipidee-config -i $(BR2_PACKAGE_TIPIDEE_CONFIGURATION_FILE) \ + -o $(TARGET_DIR)/etc/tipidee.conf.cdb +endef +TIPIDEE_POST_INSTALL_TARGET_HOOKS += TIPIDEE_INSTALL_CONFIG + +endif + +HOST_TIPIDEE_DEPENDENCIES = host-skalibs + +HOST_TIPIDEE_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \ + --with-include=$(HOST_DIR)/include \ + --with-dynlib=$(HOST_DIR)/lib \ + --disable-static \ + --enable-shared \ + --disable-allstatic + +define HOST_TIPIDEE_CONFIGURE_CMDS + (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_TIPIDEE_CONF_OPTS)) +endef + +define HOST_TIPIDEE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_TIPIDEE_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install-dynlib install-bin install-libexec +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) --2.43.0
Quoted 4 lines
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 8/8] tipidee: new package
Quoted 5 lines · Arnout Vandecappelle
Quoted 1 line · J. Neuschäfer via buildroot
Signed-off-by J. Neuschäfer <[email protected]>
Quoted 8 lines
Applied series to master, thanks. The rest went in unchanged, but in this
one, I made quite a few changes:- Remove
BR2_PACKAGE_TIPIDEE_CONFIGURATION, use empty value ofBR2_PACKAGE_TIPIDEE_CONFIG_FILEto flag false.
- RenameBR2_PACKAGE_TIPIDEE_CONFIGURATION_FILEtoBR2_PACKAGE_TIPIDEE_CONFIG_FILE.
- DefaultBR2_PACKAGE_TIPIDEE_CONFIG_FILEto empty.
Unfortunately, this approach causes autobuild failures because tipidee-config cannot work without a file:
http://autobuild.buildroot.org/?reason=tipidee-0.0.5.0
What's a good way to fix this?
-- jn
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 8/8] tipidee: new package
Quoted 15 lines · J. Neuschäfer
Quoted 5 lines · Arnout Vandecappelle
Quoted 1 line · J. Neuschäfer via buildroot
Signed-off-by J. Neuschäfer <[email protected]>Quoted 8 lines
Applied series to master, thanks. The rest went in unchanged, but in this
one, I made quite a few changes:- Remove
BR2_PACKAGE_TIPIDEE_CONFIGURATION, use empty value ofBR2_PACKAGE_TIPIDEE_CONFIG_FILEto flag false.
- RenameBR2_PACKAGE_TIPIDEE_CONFIGURATION_FILEtoBR2_PACKAGE_TIPIDEE_CONFIG_FILE.
- DefaultBR2_PACKAGE_TIPIDEE_CONFIG_FILEto empty.
Quoted 6 lines
Unfortunately, this approach causes autobuild failures because tipidee-config cannot work without a file:
http://autobuild.buildroot.org/?reason=tipidee-0.0.5.0What's a good way to fix this?
Oops, that's my bad, I should have qstrip'ed before the condition. I directly
pushed the fix below.
Regards,
Arnout
commit 27e7b0bf14cf2321e2aae64e490671f5cfa2281d (HEAD -> master)
Author: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Date: Fri Jul 19 20:03:53 2024
package/tipidee: fix install without config file
When the tipidee package was added in commit
17deaf60f66fc08a796233920a104e5233b501e0, the committer refactored it so
no separate boolean option is required to enable the config file.
However, in doing so, the case where the config file is empty was not
correctly handled: BR2_PACKAGE_TIPIDEE_CONFIG_FILE is never empty
because even with the empty string it contains "".
Fox by qstrip'ing before checking for empty.
Signed-off-by: Arnout Vandecappelle <[email protected]>
diff --git a/package/tipidee/tipidee.mk b/package/tipidee/tipidee.mk
index 1e15782aa4..915b4f84bd 100644
--- a/package/tipidee/tipidee.mk
+++ b/package/tipidee/tipidee.mk
@@ -33,12 +33,13 @@ define TIPIDEE_INSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/libexec/tipidee-config-preprocess
endef
-ifneq ($(BR2_PACKAGE_TIPIDEE_CONFIG_FILE),)
+TIPIDEE_CONFIG_FILE = $(call qstrip, $(BR2_PACKAGE_TIPIDEE_CONFIG_FILE))
+ifneq ($(TIPIDEE_CONFIG_FILE),)
TIPIDEE_DEPENDENCIES += host-tipidee
define TIPIDEE_INSTALL_CONFIG
$(HOST_DIR)/bin/tipidee-config \
- -i $(call qstrip, $(BR2_PACKAGE_TIPIDEE_CONFIG_FILE)) \
+ -i "$(TIPIDEE_CONFIG_FILE)" \
-o $(TARGET_DIR)/etc/tipidee.conf.cdb
endef
TIPIDEE_POST_INSTALL_TARGET_HOOKS += TIPIDEE_INSTALL_CONFIG_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot