diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-05-20 19:45:22 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-05-20 19:45:22 +0000 |
| commit | 697b271da935866850692f7e0cb76434c4e26b13 (patch) | |
| tree | 4754958410696f1e42706a851a857732d1c2c0c9 /release | |
| parent | 66b415fb8f9a7bd9f01d063ecebc2c74cfcb10be (diff) | |
| download | src-697b271da935866850692f7e0cb76434c4e26b13.tar.gz src-697b271da935866850692f7e0cb76434c4e26b13.zip | |
pkgbase: use -dev,-dbg instead of -development,-debug
-development is long and awkward, and is also inconsistent with prior art
from the Linux world, which uses -dev (Debian) or -devel (Red Hat). Follow
the Debian convention, and similarly for debug info packages.
Also remove redundant pkgbase development tag from includes. We already tag
include files with package=runtime,dev; there is no need to separately tag
them as dev.
Discussed with: bapt
Reviewed by: manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D24139
Notes
Notes:
svn path=/head/; revision=361290
Diffstat (limited to 'release')
| -rwxr-xr-x | release/packages/generate-ucl.sh | 16 | ||||
| -rw-r--r-- | release/scripts/mtree-to-plist.awk | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 644eeefd36d5..99bf150b3276 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -61,13 +61,13 @@ main() { pkgdeps="runtime" _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" ;; - *_lib32_development) - outname="${outname%%_lib32_development}" + *_lib32_dev) + outname="${outname%%_lib32_dev}" _descr="32-bit Libraries, Development Files" pkgdeps="${outname}" ;; - *_lib32_debug) - outname="${outname%%_lib32_debug}" + *_lib32_dbg) + outname="${outname%%_lib32_dbg}" _descr="32-bit Libraries, Debugging Symbols" pkgdeps="${outname}" ;; @@ -76,13 +76,13 @@ main() { _descr="32-bit Libraries" pkgdeps="${outname}" ;; - *_development) - outname="${outname%%_development}" + *_dev) + outname="${outname%%_dev}" _descr="Development Files" pkgdeps="${outname}" ;; - *_debug) - outname="${outname%%_debug}" + *_dbg) + outname="${outname%%_dbg}" _descr="Debugging Symbols" pkgdeps="${outname}" ;; diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk index eec21ef84657..7fcac9b92a81 100644 --- a/release/scripts/mtree-to-plist.awk +++ b/release/scripts/mtree-to-plist.awk @@ -70,7 +70,7 @@ output=output"."_kernconf } if ($1 ~ /^\/usr\/lib\/debug\/boot/) { - output=output"-debug.plist" + output=output"-dbg.plist" } else { output=output".plist" } |