diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-10-30 12:44:42 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-10-30 12:44:42 +0000 |
| commit | 0c0bc46ac9285aefc06d01ec2972012a21af5da5 (patch) | |
| tree | d7fbcc1b495e4d75b87c76f26db74c548e1ff8c8 | |
| parent | 0820a99c400eb6549c11e365197fe5130ca70979 (diff) | |
| download | lh-bootstrap-0c0bc46ac9285aefc06d01ec2972012a21af5da5.tar.xz | |
Input new versions for testing
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | lh-config.dist | 2 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 62 |
2 files changed, 48 insertions, 16 deletions
diff --git a/lh-config.dist b/lh-config.dist index 0767627..4b84318 100644 --- a/lh-config.dist +++ b/lh-config.dist @@ -1,6 +1,6 @@ # Set to the output directory. # By default, it's a subdirectory named "output" in lh-bootstrap's base directory. -OUTPUT= +# OUTPUT= # Set to a non-privileged user on your system. # Most of the build will be performed as that user. diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 8fad0ab..b30226f 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -1,20 +1,48 @@ -SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD BCNM -SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS -SKALIBS_VERSION := v2.13.1.0 -NSSS_VERSION := v0.2.0.3 -UTMPS_VERSION := v0.1.2.1 -EXECLINE_VERSION := v2.9.2.1 -S6_VERSION := v2.11.3.0 -S6_RC_VERSION := v0.5.4.1 -S6_LINUX_INIT_VERSION := v1.1.0.0 -S6_PORTABLE_UTILS_VERSION := v2.3.0.1 -S6_LINUX_UTILS_VERSION := v2.6.1.2 -S6_DNS_VERSION := v2.3.5.5 -S6_NETWORKING_VERSION := v2.5.1.3 -MDEVD_VERSION := v0.1.6.2 -BCNM_VERSION := v0.0.1.6 +SKALIBS_VERSION=50da02706335d2f7a45a97ba3b6bdbe223e214a8 +# SKALIBS_VERSION := v2.14.0.0 + +NSSS_VERSION := b773c2e7bda84ccc98f6826edcde7bab8741830e +# NSSS_VERSION := v0.2.0.4 + +UTMPS_VERSION := d5c9e14276ccda11cb01dff110623075f0f330a5 +# UTMPS_VERSION := v0.1.2.2 + +EXECLINE_VERSION=813ab6fe79edab2af685bcb7e025966f163da672 +# EXECLINE_VERSION := v2.9.4.0 + +S6_VERSION=0c3cf16e675a65a15b9167c45179cf5c66b826e7 +# S6_VERSION := v2.12.0.0 + +S6_RC_VERSION=940e4bb20f7927a54c9ee92bcea1c54f8b60666d +# S6_RC_VERSION := v0.5.4.2 + +S6_LINUX_INIT_VERSION=421ff132dee36124fd6fe4eaaffe3576179c3812 +# S6_LINUX_INIT_VERSION := v1.1.2.0 + +S6_PORTABLE_UTILS_VERSION=5be24a3642c294e4fcec465c9c6f19d66cf2220d +# S6_PORTABLE_UTILS_VERSION := v2.3.0.3 +S6_LINUX_UTILS_VERSION=7b5f71fd0128ff3f848841b28ce53b0eb9bf3e5e +# S6_LINUX_UTILS_VERSION=v2.6.2.0 + +S6_DNS_VERSION=2ac33222d297ad53bfdc15aa10563cf2c7eea042 +# S6_DNS_VERSION=v2.3.6.0 + +S6_NETWORKING_VERSION=6342cffb3485d64340563b9e86d54a667b7148ce +# S6_NETWORKING_VERSION=v2.6.0.0 + +MDEVD_VERSION := 83b89bedea1bf97e5b103ad2a0cb2fcaeaa41de1 +# MDEVD_VERSION := v0.1.6.3 + +BCNM_VERSION := 4de021fc19b521b73178c0e90cd0d9efec679d95 +# BCNM_VERSION := v0.0.1.7 + +TIPIDEE_VERSION := 4de021fc19b521b73178c0e90cd0d9efec679d95 +# TIPIDEE_VERSION := v0.0.1.0 + +SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD BCNM TIPIDEE +SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS SKALIBS_DEPENDENCIES := NSSS_DEPENDENCIES := SKALIBS @@ -29,6 +57,7 @@ S6_DNS_DEPENDENCIES := SKALIBS S6_NETWORKING_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_DNS MDEVD_DEPENDENCIES := SKALIBS NSSS BCNM_DEPENDENCIES := SKALIBS +TIPIDEE_DEPENDENCIES := SKALIBS SKALIBS_CATEGORY := prog NSSS_CATEGORY := admin @@ -43,6 +72,7 @@ S6_DNS_CATEGORY := web S6_NETWORKING_CATEGORY := net MDEVD_CATEGORY := admin BCNM_CATEGORY := admin +TIPIDEE_CATEGORY := web SKALIBS_TOKEN := libskarnet.a.xyzzy NSSS_TOKEN := nsssd-unix @@ -57,6 +87,7 @@ S6_DNS_TOKEN := s6-dnsip4 S6_NETWORKING_TOKEN := s6-tlsd-io MDEVD_TOKEN := mdevd BCNM_TOKEN := bcnm-waitif +TIPIDEE_TOKEN := tipideed SKAWARE_ENV := $(if $(filter true,$(TARGET_STATIC)),,env LDFLAGS=-Wl,-rpath-link,$(OUTPUT)/rootfs/library.so) SKAWARE_OPTIONS := --enable-slashpackage --enable-nsss $(if $(filter true,$(TARGET_STATIC)),--enable-static-libc --disable-shared,--enable-shared --disable-allstatic) @@ -74,6 +105,7 @@ S6_DNS_OPTIONS := S6_NETWORKING_OPTIONS := --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl MDEVD_OPTIONS := BCNM_OPTIONS := +TIPIDEE_OPTIONS := $(OUTPUT)/build-$(TRIPLE)/s6-networking-$(S6_NETWORKING_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed |