Page MenuHomeFreeBSD
Files F152925218

D53161.id164396.diff
No OneTemporary
Actions

D53161.id164396.diff
View Options

diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile
--- a/libexec/flua/Makefile
+++ b/libexec/flua/Makefile
@@ -1,5 +1,7 @@
.include <src.lua.mk>
+PACKAGE= flua
+
# New flua modules should be added here rather than to SUBDIR so that we can do
# the right thing for both bootstrap flua and target flua. The former does not
# do any shared libs, so we just build them all straight into flua itself rather
diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc
--- a/libexec/flua/Makefile.inc
+++ b/libexec/flua/Makefile.inc
@@ -1,3 +1,5 @@
+PACKAGE= flua
+
SHLIBDIR?= ${LIBDIR}/flua
CFLAGS+= \
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/bsdinstall.ucl
@@ -21,4 +21,9 @@
"runtime" {
version = "${VERSION}"
},
+
+ # the pkgbase script requires flua
+ "flua" {
+ version = "${VERSION}"
+ },
}
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/flua-all.ucl
copy from release/packages/ucl/bsdinstall.ucl
copy to release/packages/ucl/flua-all.ucl
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/flua-all.ucl
@@ -16,9 +16,17 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-deps {
- # bsdinstall is written in shell script, so it needs /bin/sh
- "runtime" {
- version = "${VERSION}"
- },
+comment = "Private Lua implementation"
+
+desc = <<EOD
+flua(1) is an implementation of Lua for use by the base system. This facility
+is not intended for general use, and may be modified or removed at any time
+without notice.
+
+Supported versions of Lua for general use are available in the FreeBSD Ports
+Collection.
+EOD
+
+annotations {
+ set = "optional,optional-jail"
}
diff --git a/release/packages/ucl/nuageinit-all.ucl b/release/packages/ucl/nuageinit-all.ucl
--- a/release/packages/ucl/nuageinit-all.ucl
+++ b/release/packages/ucl/nuageinit-all.ucl
@@ -27,6 +27,13 @@
nuageinit implements the cloud-init (https://cloud-init.io/) specification.
EOD
+deps {
+ # nuageinit is written in Lua
+ "flua" {
+ version = "${VERSION}"
+ },
+}
+
annotations {
set = minimal
}
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/tests.ucl
copy from release/packages/ucl/bsdinstall.ucl
copy to release/packages/ucl/tests.ucl
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/tests.ucl
@@ -16,9 +16,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+
deps {
- # bsdinstall is written in shell script, so it needs /bin/sh
- "runtime" {
+ # Quite a few tests require flua.
+ "flua" {
version = "${VERSION}"
},
}
+
+

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 2:43 AM (17 m, 59 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31743022
Default Alt Text
D53161.id164396.diff (2 KB)

Event Timeline