Date: Wed, 2 Oct 2013 22:58:26 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329126 - head/Mk Message-ID: <201310022258.r92MwQ4g046273@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Oct 2 22:58:26 2013 New Revision: 329126 URL: http://svnweb.freebsd.org/changeset/ports/329126 Log: Allow staging linux rpms Modified: head/Mk/bsd.linux-rpm.mk Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Wed Oct 2 22:57:09 2013 (r329125) +++ head/Mk/bsd.linux-rpm.mk Wed Oct 2 22:58:26 2013 (r329126) @@ -153,8 +153,8 @@ pre-install: linux-rpm-generate-plist . if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: @cd ${WRKSRC} && \ - ${FIND} * ! -type d | ${SORT} > ${PLIST} && \ - ${FIND} * -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs + ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \ + ${FIND} * -path ./stage -prune -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 -exec ${MKDIR} "${PREFIX}/{}" \; - cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX} + cd ${WRKSRC} && ${FIND} * -path ./stage -prune -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} . endif . if !target(new-plist) new-plist: build @${RM} -f ${PLIST}.new @cd ${WRKSRC} && \ - ${FIND} * ! -type d | ${SORT} > ${PLIST}.new; \ - ${FIND} -d * -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ + ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST}.new; \ + ${FIND} -d * -path ./stage -prune -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ done . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310022258.r92MwQ4g046273>