Date: Tue, 8 Mar 2016 18:31:26 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r296531 - in projects/release-pkg/release: packages scripts Message-ID: <201603081831.u28IVQt7073929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Mar 8 18:31:26 2016 New Revision: 296531 URL: https://svnweb.freebsd.org/changeset/base/296531 Log: Prefix lib32, profile, debug, and development packages with 'runtime-' for consistency with other packages. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/runtime-debug.ucl (contents, props changed) projects/release-pkg/release/packages/runtime-development.ucl (contents, props changed) projects/release-pkg/release/packages/runtime-lib32.ucl (contents, props changed) projects/release-pkg/release/packages/runtime-profile.ucl (contents, props changed) Deleted: projects/release-pkg/release/packages/debug.ucl projects/release-pkg/release/packages/development.ucl projects/release-pkg/release/packages/lib32.ucl projects/release-pkg/release/packages/profile.ucl Modified: projects/release-pkg/release/packages/Makefile.package projects/release-pkg/release/packages/generate-ucl.sh projects/release-pkg/release/scripts/mtree-to-plist.awk Modified: projects/release-pkg/release/packages/Makefile.package ============================================================================== --- projects/release-pkg/release/packages/Makefile.package Tue Mar 8 18:28:24 2016 (r296530) +++ projects/release-pkg/release/packages/Makefile.package Tue Mar 8 18:31:26 2016 (r296531) @@ -26,10 +26,6 @@ clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries -debug_COMMENT= FreeBSD Base System (Debugging Symbols) -debug_DESC= FreeBSD Base System (Debugging Symbols) -development_COMMENT= FreeBSD Base System (Development Files) -development_DESC= FreeBSD Base System (Development Files) dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation @@ -46,18 +42,21 @@ jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel -lib32_COMMENT= FreeBSD Base System (32-bit Libraries) -lib32_DESC= FreeBSD Base System (32-bit Libraries) manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages -profile_COMMENT= FreeBSD Base System (Profiling Libraries) -profile_DESC= FreeBSD Base System (Profiling Libraries) rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System +runtime-debug_DESCR= Debugging Symbols +runtime-development_DESCR=Development Files +runtime-profile_DESCR= Profiling Libraries +runtime-lib32_DESCR= 32-bit Libraries +runtime-lib32-debug_DESCR=32-bit Debugging Symbols +runtime-lib32-development_DESCR=32-bit Development Files +runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities Modified: projects/release-pkg/release/packages/generate-ucl.sh ============================================================================== --- projects/release-pkg/release/packages/generate-ucl.sh Tue Mar 8 18:28:24 2016 (r296530) +++ projects/release-pkg/release/packages/generate-ucl.sh Tue Mar 8 18:31:26 2016 (r296531) @@ -34,6 +34,20 @@ main() { outname="$(echo ${outname} | tr '-' '_')" case "${outname}" in + runtime) + outname="runtime" + uclfile="${uclfile}" + ;; + runtime_manuals) + outname="${origname}" + pkgdeps="runtime" + ;; + runtime_*) + 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" @@ -69,20 +83,9 @@ main() { _descr="Debugging Symbols" pkgdeps="${outname}" ;; - *_manuals) - outname="${origname}" - pkgdeps="runtime" - ;; - runtime) - outname="runtime" - uclfile="${uclfile}" - ;; ${origname}) pkgdeps="runtime" ;; - debug|development|lib32|profile) - uclfile="${outname##*}${uclfile}" - ;; *) uclfile="${outname##*}${origname}" outname="${outname##*}${origname}" Added: projects/release-pkg/release/packages/runtime-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime-debug.ucl Tue Mar 8 18:31:26 2016 (r296531) @@ -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: projects/release-pkg/release/packages/runtime-development.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime-development.ucl Tue Mar 8 18:31:26 2016 (r296531) @@ -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: projects/release-pkg/release/packages/runtime-lib32.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime-lib32.ucl Tue Mar 8 18:31:26 2016 (r296531) @@ -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: projects/release-pkg/release/packages/runtime-profile.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime-profile.ucl Tue Mar 8 18:31:26 2016 (r296531) @@ -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: projects/release-pkg/release/scripts/mtree-to-plist.awk ============================================================================== --- projects/release-pkg/release/scripts/mtree-to-plist.awk Tue Mar 8 18:28:24 2016 (r296530) +++ projects/release-pkg/release/scripts/mtree-to-plist.awk Tue Mar 8 18:31:26 2016 (r296531) @@ -39,7 +39,7 @@ gsub(/package=/, "", pkgname) } else if (a[i] == "config") { type="config" - } else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") { + } else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug" || a[i] == "docs") { pkgend=a[i] } else { if (ext != "") @@ -49,14 +49,10 @@ } } if (ext != "") { - if (pkgname == "runtime") { - pkgname=ext - } else { - pkgname=pkgname"-"ext - } + pkgname=pkgname"-"ext } if (pkgend != "") { - if (pkgname == "runtime") { + if (pkgend == "docs") { pkgname=pkgend } else { pkgname=pkgname"-"pkgend
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081831.u28IVQt7073929>