aboutsummaryrefslogtreecommitdiff
path: root/release/packages
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-11-21 23:29:28 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-11-21 23:29:28 +0000
commit9fc3c7f733e93a624a5a4ffb8793b8ee0ef96d0d (patch)
tree9fa5dbd278dcb8257720f6b6e6d2f9de14964330 /release/packages
parent005cecb30a3025f69750936f26e37b10412f45bb (diff)
downloadsrc-9fc3c7f733e93a624a5a4ffb8793b8ee0ef96d0d.tar.gz
src-9fc3c7f733e93a624a5a4ffb8793b8ee0ef96d0d.zip
Set the 'vital' flag on the runtime and jail packages.
The default pkg(8) from pkg.freebsd.org requires libjail.so, so mark the jail package as vital along with the runtime package to avoid errors when libjail.so is removed. This is a no-op for systems with WITHOUT_JAIL in src.conf(5) and pkg(8) built from the Ports Collection. In order to make this work without marking packages such as the jail-lib32, for example, the jail.ucl file needed to be split out into separate files similarly to the runtime-*.ucl files. Glanced at by: brd MFC after: 5 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=308945
Diffstat (limited to 'release/packages')
-rw-r--r--release/packages/Makefile.package7
-rwxr-xr-xrelease/packages/generate-ucl.sh6
-rw-r--r--release/packages/jail-debug.ucl24
-rw-r--r--release/packages/jail-development.ucl24
-rw-r--r--release/packages/jail-lib32-debug.ucl24
-rw-r--r--release/packages/jail-lib32-development.ucl24
-rw-r--r--release/packages/jail-lib32-profile.ucl24
-rw-r--r--release/packages/jail-lib32.ucl24
-rw-r--r--release/packages/jail-profile.ucl24
-rw-r--r--release/packages/jail.ucl1
-rw-r--r--release/packages/runtime.ucl2
11 files changed, 183 insertions, 1 deletions
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 40faed84ea03..c027141f4a7e 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -40,6 +40,13 @@ hast_COMMENT= Highly Available Storage daemon
hast_DESC= Highly Available Storage daemon
jail_COMMENT= Jail Utilities
jail_DESC= Jail Utilities
+jail-debug_DESCR= Debugging Symbols
+jail-development_DESCR=Development Files
+jail-profile_DESCR= Profiling Libraries
+jail-lib32_DESCR= 32-bit Libraries
+jail-lib32-debug_DESCR=32-bit Debugging Symbols
+jail-lib32-development_DESCR=32-bit Development Files
+jail-lib32-profile_DESCR=32-bit Profiling Libraries
kernel_COMMENT= FreeBSD Kernel
kernel_DESC= FreeBSD Kernel
manuals_COMMENT= Manual Pages
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 9a963f00125b..5d7e7f6fb116 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -48,6 +48,12 @@ main() {
pkgdeps="runtime"
_descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
;;
+ jail_*)
+ outname="${origname}"
+ uclfile="${outname##*}${uclfile}"
+ pkgdeps="runtime"
+ _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
+ ;;
*_lib32_development)
outname="${outname%%_lib32_development}"
_descr="32-bit Libraries, Development Files"
diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-debug.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-development.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-lib32-debug.ucl b/release/packages/jail-lib32-debug.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-lib32-debug.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-lib32-development.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-lib32-profile.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-lib32.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl
new file mode 100644
index 000000000000..753c26bc5021
--- /dev/null
+++ b/release/packages/jail-profile.ucl
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+ FreeBSD-%PKGDEPS%: {
+ origin: "base",
+ version: "%VERSION%"
+ }
+}
+
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
index 753c26bc5021..53abd14b8521 100644
--- a/release/packages/jail.ucl
+++ b/release/packages/jail.ucl
@@ -10,6 +10,7 @@ categories = [ base ]
maintainer = "re@FreeBSD.org"
www = "https://www.FreeBSD.org"
prefix = "/"
+vital = true
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
desc = <<EOD
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 796ff212b352..d34575bd9970 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -10,7 +10,7 @@ categories = [ base ]
maintainer = "re@FreeBSD.org"
www = "https://www.FreeBSD.org"
prefix = "/"
-#vital = true
+vital = true
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
desc = <<EOD