Date: Mon, 21 Nov 2016 23:29:28 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308945 - head/release/packages Message-ID: <201611212329.uALNTSY9013641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Nov 21 23:29:28 2016 New Revision: 308945 URL: https://svnweb.freebsd.org/changeset/base/308945 Log: 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 Added: head/release/packages/jail-debug.ucl (contents, props changed) head/release/packages/jail-development.ucl (contents, props changed) head/release/packages/jail-lib32-debug.ucl (contents, props changed) head/release/packages/jail-lib32-development.ucl (contents, props changed) head/release/packages/jail-lib32-profile.ucl (contents, props changed) head/release/packages/jail-lib32.ucl (contents, props changed) head/release/packages/jail-profile.ucl (contents, props changed) Modified: head/release/packages/Makefile.package head/release/packages/generate-ucl.sh head/release/packages/jail.ucl head/release/packages/runtime.ucl Modified: head/release/packages/Makefile.package ============================================================================== --- head/release/packages/Makefile.package Mon Nov 21 21:07:43 2016 (r308944) +++ head/release/packages/Makefile.package Mon Nov 21 23:29:28 2016 (r308945) @@ -40,6 +40,13 @@ hast_COMMENT= Highly Available Storage 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 Modified: head/release/packages/generate-ucl.sh ============================================================================== --- head/release/packages/generate-ucl.sh Mon Nov 21 21:07:43 2016 (r308944) +++ head/release/packages/generate-ucl.sh Mon Nov 21 23:29:28 2016 (r308945) @@ -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" Added: head/release/packages/jail-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-debug.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-development.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-development.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-lib32-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-lib32-debug.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-lib32-development.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-lib32-development.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-lib32-profile.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-lib32-profile.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-lib32.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-lib32.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Added: head/release/packages/jail-profile.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/packages/jail-profile.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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%" + } +} + Modified: head/release/packages/jail.ucl ============================================================================== --- head/release/packages/jail.ucl Mon Nov 21 21:07:43 2016 (r308944) +++ head/release/packages/jail.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -10,6 +10,7 @@ categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" prefix = "/" +vital = true licenselogic = "single" licenses = [ BSD2CLAUSE ] desc = <<EOD Modified: head/release/packages/runtime.ucl ============================================================================== --- head/release/packages/runtime.ucl Mon Nov 21 21:07:43 2016 (r308944) +++ head/release/packages/runtime.ucl Mon Nov 21 23:29:28 2016 (r308945) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611212329.uALNTSY9013641>