Date: Sun, 6 Oct 2013 09:08: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: r329540 - in head: Mk dns/linux-f10-libasyncns emulators/linux_base-f10 Message-ID: <201310060908.r9698MPm021439@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Oct 6 09:08:22 2013 New Revision: 329540 URL: http://svnweb.freebsd.org/changeset/ports/329540 Log: Rework linux rpm plist generation/installation Convert linux-f10-libasyncns to STAGEDIR (only user of AUTOMATIC_PLIST) Approved by: portmgr (bapt) Modified: head/Mk/bsd.linux-rpm.mk head/dns/linux-f10-libasyncns/Makefile head/emulators/linux_base-f10/Makefile Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Sun Oct 6 09:07:31 2013 (r329539) +++ head/Mk/bsd.linux-rpm.mk Sun Oct 6 09:08:22 2013 (r329540) @@ -153,8 +153,8 @@ pre-install: linux-rpm-generate-plist . if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: cd ${WRKSRC} && \ - ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \ - ${FIND} * | ${GREP} -v "^stage" | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs + ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \ + ${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} . endif @@ -170,16 +170,16 @@ do-install: . if ${BRANDELF_FILES} @cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES} . endif - cd ${WRKSRC} && ${FIND} * -type d | ${GREP} -v "^stage" | ${PAX} -rw ${STAGEDIR}/${PREFIX} - cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} + cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} . endif . if !target(new-plist) new-plist: build @${RM} -f ${PLIST}.new @cd ${WRKSRC} && \ - ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST}.new; \ - ${FIND} -d * -path ./stage -prune -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ + ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}.new; \ + ${FIND} -d * ! -path "stage*" -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ done . endif Modified: head/dns/linux-f10-libasyncns/Makefile ============================================================================== --- head/dns/linux-f10-libasyncns/Makefile Sun Oct 6 09:07:31 2013 (r329539) +++ head/dns/linux-f10-libasyncns/Makefile Sun Oct 6 09:08:22 2013 (r329540) @@ -16,5 +16,4 @@ RPMVERSION= 1.fc10 USE_LDCONFIG= yes AUTOMATIC_PLIST=yes -NO_STAGE= yes .include <bsd.port.mk> Modified: head/emulators/linux_base-f10/Makefile ============================================================================== --- head/emulators/linux_base-f10/Makefile Sun Oct 6 09:07:31 2013 (r329539) +++ head/emulators/linux_base-f10/Makefile Sun Oct 6 09:08:22 2013 (r329540) @@ -197,8 +197,8 @@ do-install: # # Do install without using linux rpm system # - @cd ${WRKSRC} && ${FIND} * -type d | ${GREP} -v "^stage" | ${PAX} -rw ${STAGEDIR}${PREFIX} - @cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d \ + @cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + @cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d \ | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310060908.r9698MPm021439>