ports/182615: [patch] ports-mgmt/tinderbox add stage support
ohauer at FreeBSD.org
ohauer at FreeBSD.org
Thu Oct 3 22:20:00 UTC 2013
>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 <bsd.port.options.mk>
.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 <bsd.port.mk>
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
- at dirrm tinderbox/scripts/contrib/hooks
- at dirrm tinderbox/scripts/contrib
- at dirrm tinderbox/scripts
+ at dirrmtry tinderbox/scripts/contrib/hooks
+ at dirrmtry tinderbox/scripts/contrib
+ at 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 <bsd.port.options.mk>
.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 <bsd.port.mk>
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
- at dirrm tinderbox/scripts/contrib/hooks
- at dirrm tinderbox/scripts/contrib
- at dirrm tinderbox/scripts
+ at dirrmtry tinderbox/scripts/contrib/hooks
+ at dirrmtry tinderbox/scripts/contrib
+ at dirrmtry tinderbox/scripts
@dirrmtry tinderbox
--- stage_tinderbox.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list