Move to pkgsrc 24.4.1

nshalman · nshalman · commit 0e39ce121e35 · 2025-05-01T17:50:57.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@
 pipeline {
 
     agent {
-        label joyCommonLabels(image_ver: '21.4.0', pi:'20210826T002459Z')
+        label joyCommonLabels(image_ver: '24.4.1', pi: '20240111T002438Z')
     }
 
     options {
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ include ./deps/eng/tools/mk/Makefile.rust.defs
 
 export STAMP
 
-BUILD_PLATFORM = 20210826T002459Z
+BUILD_PLATFORM :=	20240111T002438Z
 RELEASE_TARBALL :=	$(NAME)-pkg-$(STAMP).tar.gz
 RELSTAGEDIR :=		/tmp/$(NAME)-$(STAMP)
 
@@ -35,7 +35,7 @@ JS_FILES ?= $(wildcard $(TOP)/ui/assets/*.js)
 .PHONY: nodejs
 ifeq ($(shell uname -s),SunOS)
 nodejs:
-	pkgin -y in npm
+	pkgin -y in "nodejs>14"
 else
 # On other OSes, assume you have a new enough Node
 nodejs:
diff --git a/deps/eng b/deps/eng
@@ -1 +1 @@
-Subproject commit 34cbcb436d57ba17538b34592d121c856e03c736
+Subproject commit e797c515c97f27cea09248247fb2f00e79abdec8

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`pipeline {`
`14`	`14`
`15`	`15`	`agent {`
`16`		`- label joyCommonLabels(image_ver: '21.4.0', pi:'20210826T002459Z')`
	`16`	`+ label joyCommonLabels(image_ver: '24.4.1', pi: '20240111T002438Z')`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`options {`