d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgbase: use -dev,-dbg instead of -development,-debug

Browse Source 
-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
This commit is contained in:
Ed Maste 2020-05-20 19:45:22 +00:00
parent 66b415fb8f
commit 697b271da9
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -1889,7 +1889,7 @@ create-world-package-${pkgname}: .PHONY
_default_flavor= -default _default_flavor= -default
.if make(*package*) && exists(${KSTAGEDIR}/kernel.meta) .if make(*package*) && exists(${KSTAGEDIR}/kernel.meta)
. if ${MK_DEBUG_FILES} != "no" . if ${MK_DEBUG_FILES} != "no"
_debug=-debug _debug=-dbg
. endif . endif
create-kernel-packages: .PHONY create-kernel-packages: .PHONY
. for flavor in "" ${_debug} . for flavor in "" ${_debug}
@ -1923,7 +1923,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
. for _kernel in ${BUILDKERNELS:[2..-1]} . for _kernel in ${BUILDKERNELS:[2..-1]}
. if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) . if exists(${KSTAGEDIR}/kernel.${_kernel}.meta)
. if ${MK_DEBUG_FILES} != "no" . if ${MK_DEBUG_FILES} != "no"
_debug=-debug _debug=-dbg
. endif . endif
. for flavor in "" ${_debug} . for flavor in "" ${_debug}
create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel} create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}

16
release/packages/generate-ucl.sh
View File

@ -61,13 +61,13 @@ main() {
pkgdeps="runtime" pkgdeps="runtime"
_descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
;; ;;
*_lib32_development) *_lib32_dev)
outname="${outname%%_lib32_development}" outname="${outname%%_lib32_dev}"
_descr="32-bit Libraries, Development Files" _descr="32-bit Libraries, Development Files"
pkgdeps="${outname}" pkgdeps="${outname}"
;; ;;
*_lib32_debug) *_lib32_dbg)
outname="${outname%%_lib32_debug}" outname="${outname%%_lib32_dbg}"
_descr="32-bit Libraries, Debugging Symbols" _descr="32-bit Libraries, Debugging Symbols"
pkgdeps="${outname}" pkgdeps="${outname}"
;; ;;
@ -76,13 +76,13 @@ main() {
_descr="32-bit Libraries" _descr="32-bit Libraries"
pkgdeps="${outname}" pkgdeps="${outname}"
;; ;;
*_development) *_dev)
outname="${outname%%_development}" outname="${outname%%_dev}"
_descr="Development Files" _descr="Development Files"
pkgdeps="${outname}" pkgdeps="${outname}"
;; ;;
*_debug) *_dbg)
outname="${outname%%_debug}" outname="${outname%%_dbg}"
_descr="Debugging Symbols" _descr="Debugging Symbols"
pkgdeps="${outname}" pkgdeps="${outname}"
;; ;;

2
release/scripts/mtree-to-plist.awk
View File

@ -70,7 +70,7 @@
output=output"."_kernconf output=output"."_kernconf
} }
if ($1 ~ /^\/usr\/lib\/debug\/boot/) { if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
output=output"-debug.plist" output=output"-dbg.plist"
} else { } else {
output=output".plist" output=output".plist"
} }

8
share/mk/bsd.incs.mk
View File

@ -60,7 +60,7 @@ stage_includes: stage_as.${header:T}
installincludes: _${group}INS_${header:T} installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header} _${group}INS_${header:T}: ${header}
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN_${.ALLSRC:T}} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \ ${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@ -75,10 +75,10 @@ stage_includes: stage_files.${group}
installincludes: _${group}INS installincludes: _${group}INS
_${group}INS: ${_${group}INCS} _${group}INS: ${_${group}INCS}
.if defined(${group}NAME) .if defined(${group}NAME)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
.else .else
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/ ${.ALLSRC} ${DESTDIR}${${group}DIR}/
.endif .endif
.endif .endif
@ -89,7 +89,7 @@ _${group}INS: ${_${group}INCS}
.if defined(INCSLINKS) && !empty(INCSLINKS) .if defined(INCSLINKS) && !empty(INCSLINKS)
installincludes: installincludes:
.for s t in ${INCSLINKS} .for s t in ${INCSLINKS}
${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${s} ${DESTDIR}${t} ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${s} ${DESTDIR}${t}
.endfor .endfor
.endif .endif
.endif # !target(installincludes) .endif # !target(installincludes)

20
share/mk/bsd.lib.mk
View File

@ -316,7 +316,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME} @${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${SHLIB_NAME} ${SHLIB_LINK} @rm -f ${SHLIB_NAME} ${SHLIB_LINK}
.if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) && ${MK_DEBUG_FILES} == "no" .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) && ${MK_DEBUG_FILES} == "no"
@${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${SHLIB_LINK} @${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${SHLIB_LINK}
.endif .endif
${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \ -o ${.TARGET} -Wl,-soname,${SONAME} \
@ -332,7 +332,7 @@ ${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.debug
${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.debug \ ${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.debug \
${SHLIB_NAME_FULL} ${.TARGET} ${SHLIB_NAME_FULL} ${.TARGET}
.if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld) .if defined(SHLIB_LINK) && !commands(${SHLIB_LINK:R}.ld)
@${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${SHLIB_LINK} @${INSTALL_LIBSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${SHLIB_LINK}
.endif .endif
${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL}
@ -428,11 +428,11 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall .ORDER: beforeinstall _libinstall
_libinstall: _libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/
.endif .endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
.endif .endif
.if defined(SHLIB_NAME) .if defined(SHLIB_NAME)
@ -441,15 +441,15 @@ _libinstall:
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
.if ${MK_DEBUG_FILES} != "no" .if ${MK_DEBUG_FILES} != "no"
.if defined(DEBUGMKDIR) .if defined(DEBUGMKDIR)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -d ${DESTDIR}${DEBUGFILEDIR}/
.endif .endif
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -o ${LIBOWN} -g ${LIBGRP} -m ${DEBUGMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -o ${LIBOWN} -g ${LIBGRP} -m ${DEBUGMODE} \
${_INSTALLFLAGS} \ ${_INSTALLFLAGS} \
${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR}/ ${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR}/
.endif .endif
.if defined(SHLIB_LINK) .if defined(SHLIB_LINK)
.if commands(${SHLIB_LINK:R}.ld) .if commands(${SHLIB_LINK:R}.ld)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \ ${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS} .for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS}
@ -458,14 +458,14 @@ _libinstall:
.else .else
.if ${_SHLIBDIR} == ${_LIBDIR} .if ${_SHLIBDIR} == ${_LIBDIR}
.if ${SHLIB_LINK:Mlib*} .if ${SHLIB_LINK:Mlib*}
${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.else .else
${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.endif .endif
.else .else
.if ${SHLIB_LINK:Mlib*} .if ${SHLIB_LINK:Mlib*}
${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.else .else
${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \
@ -480,7 +480,7 @@ _libinstall:
.endif # SHLIB_LINK .endif # SHLIB_LINK
.endif # SHIB_NAME .endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/
.endif .endif
.endif # !defined(INTERNALLIB) .endif # !defined(INTERNALLIB)

4
share/mk/bsd.prog.mk
View File

@ -270,9 +270,9 @@ _proginstall:
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
.if ${MK_DEBUG_FILES} != "no" .if ${MK_DEBUG_FILES} != "no"
.if defined(DEBUGMKDIR) .if defined(DEBUGMKDIR)
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -d ${DESTDIR}${DEBUGFILEDIR}/
.endif .endif
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dbg} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \
${PROGNAME}.debug ${DESTDIR}${DEBUGFILEDIR}/${PROGNAME}.debug ${PROGNAME}.debug ${DESTDIR}${DEBUGFILEDIR}/${PROGNAME}.debug
.endif .endif
.endif .endif

2
sys/conf/kmod.mk
View File

@ -338,7 +338,7 @@ _kmodinstall: .PHONY
${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/
.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" .if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
${INSTALL} -T debug -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${INSTALL} -T dbg -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG}.debug ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/ ${_INSTALLFLAGS} ${PROG}.debug ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/
.endif .endif