Date: Fri, 12 May 2017 18:37:09 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r318249 - stable/11/release/packages Message-ID: <201705121837.v4CIb9GS069800@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri May 12 18:37:08 2017 New Revision: 318249 URL: https://svnweb.freebsd.org/changeset/base/318249 Log: MFC r308945: 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. Sponsored by: The FreeBSD Foundation Added: stable/11/release/packages/jail-debug.ucl - copied unchanged from r308945, head/release/packages/jail-debug.ucl stable/11/release/packages/jail-development.ucl - copied unchanged from r308945, head/release/packages/jail-development.ucl stable/11/release/packages/jail-lib32-debug.ucl - copied unchanged from r308945, head/release/packages/jail-lib32-debug.ucl stable/11/release/packages/jail-lib32-development.ucl - copied unchanged from r308945, head/release/packages/jail-lib32-development.ucl stable/11/release/packages/jail-lib32-profile.ucl - copied unchanged from r308945, head/release/packages/jail-lib32-profile.ucl stable/11/release/packages/jail-lib32.ucl - copied unchanged from r308945, head/release/packages/jail-lib32.ucl stable/11/release/packages/jail-profile.ucl - copied unchanged from r308945, head/release/packages/jail-profile.ucl Modified: stable/11/release/packages/Makefile.package stable/11/release/packages/generate-ucl.sh stable/11/release/packages/jail.ucl stable/11/release/packages/runtime.ucl Directory Properties: stable/11/ (props changed) Modified: stable/11/release/packages/Makefile.package ============================================================================== --- stable/11/release/packages/Makefile.package Fri May 12 18:10:30 2017 (r318248) +++ stable/11/release/packages/Makefile.package Fri May 12 18:37:08 2017 (r318249) @@ -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: stable/11/release/packages/generate-ucl.sh ============================================================================== --- stable/11/release/packages/generate-ucl.sh Fri May 12 18:10:30 2017 (r318248) +++ stable/11/release/packages/generate-ucl.sh Fri May 12 18:37:08 2017 (r318249) @@ -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" Copied: stable/11/release/packages/jail-debug.ucl (from r308945, head/release/packages/jail-debug.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-debug.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-development.ucl (from r308945, head/release/packages/jail-development.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-development.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-lib32-debug.ucl (from r308945, head/release/packages/jail-lib32-debug.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-lib32-debug.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-lib32-development.ucl (from r308945, head/release/packages/jail-lib32-development.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-lib32-development.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-lib32-profile.ucl (from r308945, head/release/packages/jail-lib32-profile.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-lib32-profile.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-lib32.ucl (from r308945, head/release/packages/jail-lib32.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-lib32.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Copied: stable/11/release/packages/jail-profile.ucl (from r308945, head/release/packages/jail-profile.ucl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/release/packages/jail-profile.ucl Fri May 12 18:37:08 2017 (r318249, copy of r308945, head/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%" + } +} + Modified: stable/11/release/packages/jail.ucl ============================================================================== --- stable/11/release/packages/jail.ucl Fri May 12 18:10:30 2017 (r318248) +++ stable/11/release/packages/jail.ucl Fri May 12 18:37:08 2017 (r318249) @@ -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: stable/11/release/packages/runtime.ucl ============================================================================== --- stable/11/release/packages/runtime.ucl Fri May 12 18:10:30 2017 (r318248) +++ stable/11/release/packages/runtime.ucl Fri May 12 18:37:08 2017 (r318249) @@ -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?201705121837.v4CIb9GS069800>