Date: Wed, 5 Nov 2014 07:14:22 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372177 - head/Mk/Scripts Message-ID: <201411050714.sA57EMPG095548@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Nov 5 07:14:21 2014 New Revision: 372177 URL: https://svnweb.freebsd.org/changeset/ports/372177 QAT: https://qat.redports.org/buildarchive/r372177/ Log: - During makeplist, emit only empty directories inside prefix and directories outside prefix - Whitelisting orphan directories not starting with / is no longer necessary - Adjust missing directories check to use a list of all directories instead of the dirs from make-plist Differential Revision: https://reviews.freebsd.org/D1101 Reviewed by: bapt With hat: portmgr Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Tue Nov 4 23:10:31 2014 (r372176) +++ head/Mk/Scripts/check-stagedir.sh Wed Nov 5 07:14:21 2014 (r372177) @@ -255,8 +255,12 @@ generate_plist() { ### HANDLE DIRS cat ${WRKDIR}/.plist-dirs-unsorted ${WRKDIR}/.mtree \ | sort -u >${WRKDIR}/.traced-dirs - find -sd ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" \ + find ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" | sort \ + >${WRKDIR}/.staged-dirrms-sorted + find -sd ${STAGEDIR}${PREFIX} -type d -empty | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ >${WRKDIR}/.staged-dirs-dfs + find -sd ${STAGEDIR} -type d ! -path "${STAGEDIR}${PREFIX}/*" | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ + >>${WRKDIR}/.staged-dirs-dfs sort ${WRKDIR}/.staged-dirs-dfs >${WRKDIR}/.staged-dirs-sorted awk '{print FNR, $0}' ${WRKDIR}/.staged-dirs-dfs \ >${WRKDIR}/.staged-dirs-dfs-sorted @@ -274,7 +278,6 @@ check_orphans_from_plist() { # Handle whitelisting while read path; do case "${path}" in - *'@dir '[^/]*) ;; *.bak) ;; *.orig) ;; */.DS_Store) ;; @@ -324,7 +327,7 @@ check_missing_plist_items() { rm -rf ${WRKDIR}/.missing-dirs > /dev/null 2>&1 || : mkdir ${WRKDIR}/.missing-dirs comm -23 ${WRKDIR}/.plist-dirs-sorted-no-comments \ - ${WRKDIR}/.staged-dirs-sorted > ${WRKDIR}/.missing-plist-dirs + ${WRKDIR}/.staged-dirrms-sorted > ${WRKDIR}/.missing-plist-dirs # Creates the dirs in WRKDIR/.missing-dirs and ensure spaces are # quoted. sed -e "s,^,${WRKDIR}/.missing-dirs," \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411050714.sA57EMPG095548>