diff options
| -rw-r--r-- | sub/skarnet.org/Makefile | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 9421b41..6966f56 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -1,47 +1,50 @@ -SKALIBS_VERSION=6d35cf64e8a40b1d6d5073ba91593078065762ea -# SKALIBS_VERSION=v2.14.2.0 +SKALIBS_VERSION := 4dcf9fa0521a1c4243c28fb2f657d8029317e55e +# SKALIBS_VERSION := v2.14.2.0 -# NSSS_VERSION := b773c2e7bda84ccc98f6826edcde7bab8741830e +# NSSS_VERSION := f682481f7b44352871fe52809c0924bd09e94758 NSSS_VERSION := v0.2.0.4 -# UTMPS_VERSION := d5c9e14276ccda11cb01dff110623075f0f330a5 +# UTMPS_VERSION := 81ca09312ff77b9cedfb58ef25ab9b09160d6700 UTMPS_VERSION := v0.1.2.2 -# EXECLINE_VERSION=813a7ae859c0563f87c2afef79d346b853c20e36 -EXECLINE_VERSION := v2.9.5.1 +EXECLINE_VERSION := 9983edf33b1eb4d91bf1187f8e4b7c0c3d288e53 +# EXECLINE_VERSION := v2.9.6.0 -S6_VERSION=b827410052a640f65650d1b72d5f63d9ada28933 -# S6_VERSION=v2.12.0.5 +S6_VERSION := 9778ca30e4415698dbb1f736cf5fe132a7cec04d +# S6_VERSION := v2.13.0.0 -S6_RC_VERSION=1d7cff92374a0f8f4a914d2e81de23088cf1fbd9 +S6_RC_VERSION := f3a8a60eb872096084c98ccaabf65656df349998 # S6_RC_VERSION := v0.5.4.3 -# S6_LINUX_INIT_VERSION=421ff132dee36124fd6fe4eaaffe3576179c3812 +# S6_LINUX_INIT_VERSION := 28787fc0512f8df17809c1a0507da2bfed552082 S6_LINUX_INIT_VERSION := v1.1.2.0 -# S6_PORTABLE_UTILS_VERSION=aed143be3f5deace8e7b57ed48151fc17265cd9b +# S6_PORTABLE_UTILS_VERSION := 00ad09ecf7ad44e32c3cc54819bbf50e944fd4f9 S6_PORTABLE_UTILS_VERSION := v2.3.0.3 -# S6_LINUX_UTILS_VERSION=d492e79229d1f5f96c5c618cbd5504ffb32e2d72 -S6_LINUX_UTILS_VERSION=v2.6.2.0 +# S6_LINUX_UTILS_VERSION := 4ac235b523cd1b50bd681e31c8241a2b8bdd3060 +S6_LINUX_UTILS_VERSION := v2.6.2.0 -S6_DNS_VERSION=33e4b9d9137b5dbb02a087956f1558ef30647aea -# S6_DNS_VERSION=v2.3.7.2 +S6_DNS_VERSION := 33e4b9d9137b5dbb02a087956f1558ef30647aea +# S6_DNS_VERSION := v2.3.7.2 -S6_NETWORKING_VERSION=45079bf5ed511a3260aedc905bca3c1f15488986 -# S6_NETWORKING_VERSION=v2.7.0.3 +S6_NETWORKING_VERSION := 42cb4c7b043964874caea0268b6c814e68a6e7a5 +# S6_NETWORKING_VERSION := v2.7.0.3 -MDEVD_VERSION := 5f93d0e7f6cf53a39184e36d47ca30251c5d38ac +MDEVD_VERSION := 937ddb0570d2460120f557a6596e31a739344413 # MDEVD_VERSION := v0.1.6.4 -# BCNM_VERSION := 4de021fc19b521b73178c0e90cd0d9efec679d95 -BCNM_VERSION := v0.0.1.7 - TIPIDEE_VERSION := e57d75a58a486e797c574a7a8358d161f9a28f76 # TIPIDEE_VERSION := v0.0.5.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 +SHIBARI_VERSION := eafeae3861b5fc875c3f9c6aab48fcd7e882da8c +# SHIBARI_VERSION := v0.0.1.1 + +# BCNM_VERSION := 3d9b9a04a3d1acc82be9c27bb2346473c1fe7f3f +BCNM_VERSION := v0.0.1.7 + +SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD TIPIDEE SHIBARI BCNM SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS SKALIBS_DEPENDENCIES := @@ -56,8 +59,9 @@ S6_LINUX_UTILS_DEPENDENCIES := SKALIBS NSSS S6_DNS_DEPENDENCIES := SKALIBS S6_NETWORKING_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_DNS MDEVD_DEPENDENCIES := SKALIBS NSSS -BCNM_DEPENDENCIES := SKALIBS TIPIDEE_DEPENDENCIES := SKALIBS +SHIBARI_DEPENDENCIES := SKALIBS S6_DNS +BCNM_DEPENDENCIES := SKALIBS SKALIBS_CATEGORY := prog NSSS_CATEGORY := admin @@ -71,8 +75,9 @@ S6_LINUX_UTILS_CATEGORY := admin S6_DNS_CATEGORY := web S6_NETWORKING_CATEGORY := net MDEVD_CATEGORY := admin -BCNM_CATEGORY := admin TIPIDEE_CATEGORY := web +SHIBARI_CATEGORY := web +BCNM_CATEGORY := admin SKALIBS_TOKEN := libskarnet.a.xyzzy NSSS_TOKEN := nsssd-unix @@ -86,8 +91,9 @@ S6_LINUX_UTILS_TOKEN := s6-ps S6_DNS_TOKEN := s6-dnsip S6_NETWORKING_TOKEN := s6-tlsd-io MDEVD_TOKEN := mdevd -BCNM_TOKEN := bcnm-waitif TIPIDEE_TOKEN := tipideed +SHIBARI_TOKEN := shibari-server-udp +BCNM_TOKEN := bcnm-waitif 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) @@ -104,8 +110,9 @@ S6_LINUX_UTILS_OPTIONS := --enable-multicall S6_DNS_OPTIONS := S6_NETWORKING_OPTIONS := --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl MDEVD_OPTIONS := -BCNM_OPTIONS := TIPIDEE_OPTIONS := +SHIBARI_OPTIONS := +BCNM_OPTIONS := $(OUTPUT)/build-$(TRIPLE)/s6-networking-$(S6_NETWORKING_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed |