From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 3 22:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C1BB687B for ; Thu, 3 Oct 2013 22:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E5C7235E for ; Thu, 3 Oct 2013 22:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r93MK0QG029845 for ; Thu, 3 Oct 2013 22:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r93MK0N4029844; Thu, 3 Oct 2013 22:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 3 Oct 2013 22:20:00 GMT Resent-Message-Id: <201310032220.r93MK0N4029844@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, ohauer@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EC18C74F for ; Thu, 3 Oct 2013 22:14:28 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D75C22337 for ; Thu, 3 Oct 2013 22:14:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r93MESmD029691 for ; Thu, 3 Oct 2013 22:14:28 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r93MESke029690; Thu, 3 Oct 2013 22:14:28 GMT (envelope-from ohauer) Message-Id: <201310032214.r93MESke029690@freefall.freebsd.org> Date: Thu, 3 Oct 2013 22:14:28 GMT From: ohauer@FreeBSD.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/182615: [patch] ports-mgmt/tinderbox add stage support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2013 22:20:00 -0000 >Number: 182615 >Category: ports >Synopsis: [patch] ports-mgmt/tinderbox add stage support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 03 22:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: ohauer >Release: FreeBSD 8.4-RELEASE-p4 amd64 >Organization: >Environment: >Description: - add stage support to tinderbox / tinderbox-devel - sync OPTIONS - preserve use hooks / scrips by using dirrmtry - remove ' from DESC (don't break vim sytax) patch: http://people.freebsd.org/~ohauer/diffs/stage/stage_tinderbox.diff >How-To-Repeat: >Fix: --- stage_tinderbox.diff begins here --- Index: tinderbox/Makefile =================================================================== --- tinderbox/Makefile (revision 329232) +++ tinderbox/Makefile (working copy) @@ -24,7 +24,7 @@ CHECK_ROOT_DESC= Check if ./tc is run by uid 0 EMAILS_DESC= Support for build failure/completion emails LSOF_DESC= For killMountProcesses() when using nullfs -LOG_COMPRESS_DESC= Support bzip'ing the logs +LOG_COMPRESS_DESC= Support bzip log compression HIAWATHA_DESC= Hiawatha server NGINX_DESC= Nginx server @@ -35,10 +35,6 @@ WANT_PERL= yes SUB_FILES= pkg-message -MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \ - tc-configJail.1 tc-configTinderd.1 tc-init.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MNGINX} @@ -50,7 +46,6 @@ USE_PHP= session PLIST_SUB+= WEBUI="" .else -EXTRACT_BEFORE_ARGS= --exclude webui -xf PLIST_SUB+= WEBUI="@comment " .endif @@ -104,20 +99,12 @@ ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ ${WRKSRC}/tc .endif - @cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \; + @(cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;) do-install: - @${MKDIR} ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "Installing man pages ..." - cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ - cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man - @${ECHO_CMD} "Installing rc script ..." - ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME} - @${ECHO_CMD} "Installing tinderbox ..." - ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "All Done" + ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC} -cf - . | tar --exclude man -xf - --unlink -C ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC}/man/man1 -cf - . | tar -xf - --unlink -C ${STAGEDIR}${MAN1PREFIX}/man/man1 -post-install: - @${CAT} ${PKGMESSAGE} - .include Index: tinderbox/pkg-plist =================================================================== --- tinderbox/pkg-plist (revision 329232) +++ tinderbox/pkg-plist (working copy) @@ -1,4 +1,11 @@ etc/rc.d/tinderbox +man/man1/tc-configCcache.1.gz +man/man1/tc-configDistfile.1.gz +man/man1/tc-configGet.1.gz +man/man1/tc-configJail.1.gz +man/man1/tc-configTinderd.1.gz +man/man1/tc-init.1.gz +tinderbox/scripts/.version tinderbox/scripts/README tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh @@ -9,8 +16,8 @@ tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh +tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh -tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt tinderbox/scripts/ds.ph.dist tinderbox/scripts/etc/env/.keep_me tinderbox/scripts/etc/rc.d/tinderd @@ -61,10 +68,10 @@ tinderbox/scripts/upgrade/config.map tinderbox/scripts/upgrade/hooks.map tinderbox/scripts/upgrade/jails.map +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql -tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql +tinderbox/scripts/upgrade/order.lst tinderbox/scripts/upgrade/user_permissions.map -tinderbox/scripts/upgrade/order.lst %%WEBUI%%tinderbox/scripts/webui/core/Build.php %%WEBUI%%tinderbox/scripts/webui/core/BuildGroups.php %%WEBUI%%tinderbox/scripts/webui/core/BuildPortsQueue.php @@ -158,7 +165,7 @@ @dirrm tinderbox/scripts/contrib/hooks/kse-fix @dirrm tinderbox/scripts/contrib/hooks/create-pkgng-repo @dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir -@dirrm tinderbox/scripts/contrib/hooks -@dirrm tinderbox/scripts/contrib -@dirrm tinderbox/scripts +@dirrmtry tinderbox/scripts/contrib/hooks +@dirrmtry tinderbox/scripts/contrib +@dirrmtry tinderbox/scripts @dirrmtry tinderbox Index: tinderbox-devel/Makefile =================================================================== --- tinderbox-devel/Makefile (revision 329233) +++ tinderbox-devel/Makefile (working copy) @@ -22,19 +22,19 @@ OPTIONS_RADIO= WEB OPTIONS_RADIO_WEB= APACHE HIAWATHA LIGHTTPD NGINX -OPTIONS_DEFINE= CHECK_FOR_ROOT EMAILS LSOF LOG_COMPRESS PARALLEL \ - TMPFS +OPTIONS_DEFINE= CHECK_ROOT EMAILS LSOF LOG_COMPRESS \ + PARALLEL TMPFS -CHECK_FOR_ROOT_DESC= Check if ./tc is run by uid 0 +CHECK_ROOT_DESC= Check if ./tc is run by uid 0 EMAILS_DESC= Support for build failure/completion emails LSOF_DESC= For killMountProcesses() when using nullfs -LOG_COMPRESS_DESC= Support bzip'ing the logs +LOG_COMPRESS_DESC= Support bzip log compression PARALLEL_DESC= Apply PARALLEL extra patch TMPFS_DESC= Apply TMPFS extra patch HIAWATHA_DESC= Hiawatha server NGINX_DESC= Nginx server -OPTIONS_DEFAULT= MYSQL APACHE CHECK_FOR_ROOT EMAILS LSOF \ +OPTIONS_DEFAULT= MYSQL APACHE CHECK_ROOT EMAILS LSOF \ LOG_COMPRESS PARALLEL NO_BUILD= yes @@ -44,10 +44,6 @@ #SNAP= .r3-20120404 #SNAP= -20110101 # 22:28:07 UTC -MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \ - tc-configJail.1 tc-configTinderd.1 tc-init.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MNGINX} @@ -115,30 +111,17 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-parallel.patch .endif -.if ! defined(WEBUI) -post-extract: - @${RM} -R ${WRKSRC}/webui -.endif - post-patch: -.if ! ${PORT_OPTIONS:MCHECK_FOR_ROOT} +.if ! ${PORT_OPTIONS:MCHECK_ROOT} ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ ${WRKSRC}/tc .endif - @cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \; + @(cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;) do-install: - @${MKDIR} ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "Installing man pages ..." - cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ - cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man - @${ECHO_CMD} "Installing rc script ..." - ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME} - @${ECHO_CMD} "Installing tinderbox ..." - ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "All Done" + ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC} -cf - . | tar --exclude man -xf - --unlink -C ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC}/man/man1 -cf - . | tar -xf - --unlink -C ${STAGEDIR}${MAN1PREFIX}/man/man1 -post-install: - @${CAT} ${PKGMESSAGE} - .include Index: tinderbox-devel/pkg-plist =================================================================== --- tinderbox-devel/pkg-plist (revision 329233) +++ tinderbox-devel/pkg-plist (working copy) @@ -1,4 +1,11 @@ etc/rc.d/tinderbox +man/man1/tc-configCcache.1.gz +man/man1/tc-configDistfile.1.gz +man/man1/tc-configGet.1.gz +man/man1/tc-configJail.1.gz +man/man1/tc-configTinderd.1.gz +man/man1/tc-init.1.gz +tinderbox/scripts/.version tinderbox/scripts/README tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh @@ -9,8 +16,8 @@ tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh +tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh -tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt tinderbox/scripts/ds.ph.dist tinderbox/scripts/etc/env/.keep_me tinderbox/scripts/etc/rc.d/tinderd @@ -61,10 +68,10 @@ tinderbox/scripts/upgrade/config.map tinderbox/scripts/upgrade/hooks.map tinderbox/scripts/upgrade/jails.map +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql -tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql +tinderbox/scripts/upgrade/order.lst tinderbox/scripts/upgrade/user_permissions.map -tinderbox/scripts/upgrade/order.lst %%WEBUI%%tinderbox/scripts/webui/core/Build.php %%WEBUI%%tinderbox/scripts/webui/core/BuildGroups.php %%WEBUI%%tinderbox/scripts/webui/core/BuildPortsQueue.php @@ -158,7 +165,7 @@ @dirrm tinderbox/scripts/contrib/hooks/kse-fix @dirrm tinderbox/scripts/contrib/hooks/create-pkgng-repo @dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir -@dirrm tinderbox/scripts/contrib/hooks -@dirrm tinderbox/scripts/contrib -@dirrm tinderbox/scripts +@dirrmtry tinderbox/scripts/contrib/hooks +@dirrmtry tinderbox/scripts/contrib +@dirrmtry tinderbox/scripts @dirrmtry tinderbox --- stage_tinderbox.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: