Date: Fri, 4 Oct 2013 15:45:05 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329329 - head/emulators/linux_base-f10 Message-ID: <201310041545.r94Fj5uL057854@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Oct 4 15:45:04 2013 New Revision: 329329 URL: http://svnweb.freebsd.org/changeset/ports/329329 Log: - Add staging support [1] - Remove some default assignments Submitted by: bapt [1] (partially) Modified: head/emulators/linux_base-f10/Makefile head/emulators/linux_base-f10/pkg-plist Modified: head/emulators/linux_base-f10/Makefile ============================================================================== --- head/emulators/linux_base-f10/Makefile Fri Oct 4 15:38:17 2013 (r329328) +++ head/emulators/linux_base-f10/Makefile Fri Oct 4 15:45:04 2013 (r329329) @@ -111,11 +111,7 @@ DISTINFO_FILE?= ${MASTERDIR}/distinfo.$ PLIST_SUB= GLIBCVER="2.9" EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${TAR} -EXTRACT_BEFORE_ARGS?= -xf -EXTRACT_AFTER_ARGS?= -NO_STAGE= yes .include <bsd.port.pre.mk> .if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) ) @@ -199,39 +195,21 @@ do-build: do-install: # -# Handle the loading of the linux loadable kernel module if required. -# - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -# # Do install without using linux rpm system # - @cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \; - @cd ${WRKSRC} && ${FIND} * ! -type d \ - | ${CPIO} -pm -R root:wheel ${PREFIX} - - @${LN} -sf /var/tmp ${PREFIX}/usr/tmp - @${LN} -sf ../usr/bin/[ ${PREFIX}/bin/[ - @${LN} -sf ../usr/bin/expr ${PREFIX}/bin/expr - @${LN} -sf ../usr/bin/test ${PREFIX}/bin/test - @${LN} -sf ../usr/bin/uuidgen ${PREFIX}/bin/uuidgen - @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail - @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail + @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} + + @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp + @${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[ + @${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr + @${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test + @${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen + @${CHMOD} 755 ${STAGEDIR}${PREFIX}/var/lock ${STAGEDIR}${PREFIX}/var/spool/mail # # Let some linux applications (e.g. print/acroread8) print with default settings # - @${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin - -post-install: -# -# Handle mounting linux procfs if exists at /etc/fstab and -# installing etc/nsswitch.conf, etc/yp.conf if so far they don't exist -# - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# -# And finally show the pkg-message -# - @${ECHO} '' - @${CAT} ${PKGMESSAGE} - @${ECHO} '' + @${INSTALL_SCRIPT} ${FILESDIR}/lp ${STAGEDIR}${PREFIX}/usr/bin .include <bsd.port.post.mk> Modified: head/emulators/linux_base-f10/pkg-plist ============================================================================== --- head/emulators/linux_base-f10/pkg-plist Fri Oct 4 15:38:17 2013 (r329328) +++ head/emulators/linux_base-f10/pkg-plist Fri Oct 4 15:45:04 2013 (r329329) @@ -1995,7 +1995,7 @@ usr/share/man/man8/setserial.8.gz usr/share/man/man8/tune2fs.8.gz usr/tmp var/mail -var/cache/ldconfig/aux-cache +@unexec rm -f %D/var/cache/ldconfig/aux-cache @comment empty directory listing @exec /bin/mkdir -p %D/var/yp @exec /bin/mkdir -p %D/var/spool/mail
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041545.r94Fj5uL057854>