pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove old bulk build code. Use pbulk.
details: https://anonhg.NetBSD.org/pkgsrc/rev/20e08f07bb44
branches: trunk
changeset: 635289:20e08f07bb44
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jun 02 10:24:05 2014 +0000
description:
Remove old bulk build code. Use pbulk.
diffstat:
Makefile | 5 +-
mk/bsd.pkg.mk | 15 +-
mk/bulk/TODO | 3 -
mk/bulk/bsd.bulk-pkg.mk | 583 ------------------------------------
mk/bulk/build | 505 -------------------------------
mk/bulk/build.conf-example | 106 ------
mk/bulk/do-sandbox-build | 14 -
mk/bulk/do-sandbox-upload | 14 -
mk/bulk/environment.txt | 105 ------
mk/bulk/parallel.txt | 207 ------------
mk/bulk/post-build | 722 ---------------------------------------------
mk/bulk/post-build-conf | 203 ------------
mk/bulk/pre-build | 287 -----------------
mk/bulk/printdepends | 164 ----------
mk/bulk/printindex | 202 ------------
mk/bulk/printindex.1 | 104 ------
mk/bulk/sort-packages | 83 -----
mk/bulk/tflat | 121 -------
mk/bulk/upload | 356 ----------------------
mk/misc/toplevel.mk | 9 +-
20 files changed, 3 insertions(+), 3805 deletions(-)
diffs (truncated from 3925 to 300 lines):
diff -r a7a470347189 -r 20e08f07bb44 Makefile
--- a/Makefile Mon Jun 02 10:22:17 2014 +0000
+++ b/Makefile Mon Jun 02 10:24:05 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2009/05/16 07:21:05 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2014/06/02 10:24:05 wiz Exp $
#
# This is the top-level Makefile of pkgsrc. It contains a list of the
# categories of packages, as well as some targets that operate on the
@@ -32,9 +32,6 @@
# additional tools used by bsd.pkg.subdir.mk
USE_TOOLS+= basename touch
-# additional tools used by bsd.bulk-pkg.mk
-USE_TOOLS+= egrep find ls sh tee true tsort
-
PKGSRCTOP= yes
.include "mk/bsd.prefs.mk"
diff -r a7a470347189 -r 20e08f07bb44 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon Jun 02 10:22:17 2014 +0000
+++ b/mk/bsd.pkg.mk Mon Jun 02 10:24:05 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1999 2014/05/06 14:48:06 jperkin Exp $
+# $NetBSD: bsd.pkg.mk,v 1.2000 2014/06/02 10:24:05 wiz Exp $
#
# This file is in the public domain.
#
@@ -386,11 +386,6 @@
# bsd.wrapper.mk
USE_TOOLS+= expr
-# bsd.bulk-pkg.mk uses certain tools
-.if defined(BATCH)
-USE_TOOLS+= tee tsort
-.endif
-
# scripts/shlib-type
.if ${_OPSYS_SHLIB_TYPE} == "ELF/a.out"
USE_TOOLS+= file
@@ -747,14 +742,6 @@
.include "subst.mk"
-#
-# For bulk build targets (bulk-install, bulk-package), the
-# BATCH variable must be set in /etc/mk.conf:
-#
-.if defined(BATCH)
-. include "bulk/bsd.bulk-pkg.mk"
-.endif
-
# README generation code.
.include "bsd.pkg.readme.mk"
diff -r a7a470347189 -r 20e08f07bb44 mk/bulk/TODO
--- a/mk/bulk/TODO Mon Jun 02 10:22:17 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
- * integrate pkgtools/libkver
- * Generate list of packages that were "Successfully packaged"
- * allow parallel builds (see parallel.txt)
diff -r a7a470347189 -r 20e08f07bb44 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk Mon Jun 02 10:22:17 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,583 +0,0 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.152 2011/09/08 20:17:15 abs Exp $
-
-#
-# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Hubert Feyrer for
-# the NetBSD Project.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-##
-## For this to work, put
-## DEPENDS_TARGET= bulk-install
-## BATCH= yes
-## into your /etc/mk.conf, then cd /usr/pkgsrc; make bulk-package
-##
-## bulk-install will only compile pkgs if necessary, and install binary
-## pkgs if possible/available.
-## bulk-package will build binary packages, and remove them (together with
-## any depending packages) immediately after that, leaving only the
-## binary package back. Broken packages are marked (``.broken'').
-##
-
-LS?= ls
-TEE?= tee
-WC?= wc
-TO_HTML?= ${SED} -e 's,&,\&,g' -e 's,<,\<,g' -e 's,>,\>,g'
-
-# This variable is set to 'yes' by the pkgsrc/mk/bulk/build script. It enables
-# the use of several cache files (DEPENDSTREEFILE, DEPENDSFILE, SUPPORTSFILE,
-# and INDEXFILE) for speeding up the processing of dependencies. If we're not
-# actively in the middle of a bulk build, however, we don't know that these files
-# exist or are up to date and they take quite a while to rebuild. So unless
-# they're known to exist and be up to date, don't use them.
-USE_BULK_CACHE?= no
-
-# If set to 'yes', avoids inflating the 'breaks' column of the final report
-# by not counting dependent packages that are broken all by themselves.
-# If set to 'no', may speed up building on some platforms where fork() is slow.
-# (Only takes effect if USE_BULK_CACHE=yes.)
-USE_BULK_BROKEN_CHECK?= yes
-
-# This variable may be set to 'no' to avoid automatic rebuilding of dependent
-# packages based solely on timestamps of the package's pkgsrc files and/or
-# its dependency binary packages. This will cause rebuilding only when the
-# full version number of the package changes (e.g., via PKGREVISION bump).
-USE_BULK_TIMESTAMPS?= yes
-
-# Shall we remove any packages which are installed, but not required
-# to build this package
-PRECLEAN?= yes
-
-# Sometimes it's useful to not only keep the build logs from broken
-# packages, but also the ones from packages that worked.
-# This feature is still experimental.
-KEEP_BUILDLOGS?= no
-
-# If OBJHOSTNAME is set, use first component of hostname in cache and log files
-# If OBJMACHINE is set, use ${MACHINE_ARCH} in the cache and log files
-.if defined(OBJHOSTNAME)
-. if !defined(_HOSTNAME)
-_HOSTNAME!= ${UNAME} -n
-. endif
-BULK_ID?= .${_HOSTNAME:C|\..*||}
-.elif defined(OBJMACHINE)
-BULK_ID?= .${MACHINE_ARCH}
-.else
-BULK_ID?=
-.endif
-
-.if ${_USE_DESTDIR} != "no"
-_PACKAGE_TARGET= package package-install
-.else
-_PACKAGE_TARGET= package
-.endif
-#
-# Package-specific files
-#
-
-# If the package has been built successfully, and if KEEP_BUILDLOGS is
-# set to "yes", the build log is saved in this file.
-BUILD_SUCCEEDED_FILE?= .build_succeeded${BULK_ID}
-
-# This file exists to mark a package as broken
-BROKENFILE?= .broken${BULK_ID}.html
-
-# When this file exists for a package, it has been marked as not to be
-# available on this platform.
-NOT_AVAILABLE_FILE?= .bulk-not_available
-
-# This file is the work log for a broken package
-BROKENWRKLOG?= .broken${BULK_ID}.work.txt
-
-# This file is human-created to force a package to show up as broken
-# (it is never cleaned by the bulk build, and contains the broken reason)
-FORCEBROKENFILE?= .forcebroken
-
-# This file is where the log of the build goes
-BUILDLOG?= .make${BULK_ID}
-
-#
-# Top level databases and log files
-#
-
-# This is the directory in which all temporary files and log files from the
-# bulk build are kept.
-# It defaults to ${PKGSRCDIR}, but may be better suited to another directory
-# if pkgsrc is on a remote (e.g., nfs) filesystem.
-BULKFILESDIR?= ${PKGSRCDIR}
-
-# This is a top level file which lists the entire pkgsrc depends tree in the
-# format:
-# foo/bar devel/libfoo
-# meaning 'foo/bar' is requied to build 'devel/libfoo'
-# this is in the format needed by tsort(1)
-DEPENDSTREEFILE?= ${BULKFILESDIR}/.dependstree${BULK_ID}
-
-# This is a top level file which lists the entire pkgsrc depends tree in the
-# format:
-# foo/bar depends on: devel/libfoo devel/libbar devel/baz .....
-# ie, to build foo/bar we need devel/libfoo devel/libbar devel/baz ... installed
-DEPENDSFILE?= ${BULKFILESDIR}/.depends${BULK_ID}
-
-# This is a top level file which lists the entire pkgsrc depends tree in the
-# format:
-# devel/libfoo is depended upon by: foo/bar graphics/gtkfoo ...
-# ie, to build foo/bar we need devel/libfoo to be installed.
-# to build graphics/gtkfoo we need devel/libfoo to be installed
-SUPPORTSFILE?= ${BULKFILESDIR}/.supports${BULK_ID}
-
-# This is a top level file which cross-references each package name and pkg
-# directory in the format:
-# devel/libfoo libfoo-1.3
-INDEXFILE?= ${BULKFILESDIR}/.index${BULK_ID}
-
-# File containing a list of all the packages in the correct order for a bulk
-# build. The correct order is one where packages that are required by others
-# are built before the packages which require them.
-ORDERFILE?= ${BULKFILESDIR}/.order${BULK_ID}
-
-# File which is used as a timestamp for when the build started. This is used
-# eventually for looking for leftover files (files not properly deinstalled)
-STARTFILE?= ${BULKFILESDIR}/.start${BULK_ID}
-
-# This top level file saves the bulk build ID. As it most often has a time
-# stamp, it is only generated once and later retrieved from this file.
-BULK_BUILD_ID_FILE?= ${BULKFILESDIR}/.bulk_build_id${BULK_ID}
-
-# File created and used by lintpkgsrc(8) to cache package metadata for
-# pruning and bulk-upload exclusions.
-LINTPKGSRC_DB?= ${BULKFILESDIR}/.lintpkgsrc.db${BULK_ID}
-
-# File which is used as a database for bulk builds in which SPECIFIC_PKGS is
-# defined. This database is used to hold all the dependency and index
-# information for the specific packages as well as their dependencies. In a
-# SPECIFIC_PKGS bulk build, this file is created and then used to create the
-# INDEXFILE and DEPENDSTREEFILE.
-BULK_DBFILE?= ${BULKFILESDIR}/.bulk_db${BULK_ID}
-
-# A list of pkgs which we should _never_ delete during a build. The primary
-# use is for digest and also for xpkgwedge. Add pkgtools/xpkgwedge in
-# /etc/mk.conf to do an xpkgwedged bulk build.
-BULK_PREREQ+= pkgtools/digest
-
-# Commands for printing informational messages from the bulk build.
-# BULK_MSG_CONT is used for continuing a message started with BULK_MSG
-BULK_MSG?= ${ECHO_MSG} "BULK>"
-BULK_MSG_CONT?= ${ECHO_MSG} " "
-
-#
-# Private variables
-#
-
-# If this is "yes", the working directory will not be cleaned after building
-# the package. It can also be set to "pack-if-failed" to save a .tar.gz
-# file of the working directory in BULKFILESDIR instead of keeping the files,
-# but only if the package failed to build.
-_PRESERVE_WRKDIR?= no
-
-# create an escaped version of PKGPATH. We do this because
-# in several places we want to be able to use something like
-# foo/bar.baz++ in a regular expression but have it be interpreted
-# literally. So, turn it into foo\/bar\.baz\+\+
-_ESCPKGPATH= ${PKGPATH:C@\/@\\/@g:C@\+@\\+@g:C@\.@\\.@g:Q}
-
-# The directory where package-specific log files are saved.
-_BULK_PKGLOGDIR= ${BULKFILESDIR}/${PKGPATH}
-
-# Package-specific log files.
-_BROKENFILE= ${_BULK_PKGLOGDIR}/${BROKENFILE}
-_BROKENWRKLOG= ${_BULK_PKGLOGDIR}/${BROKENWRKLOG}
-_BUILDLOG= ${_BULK_PKGLOGDIR}/${BUILDLOG}
-_FORCEBROKENFILE= ${_BULK_PKGLOGDIR}/${FORCEBROKENFILE}
-_BUILD_SUCCEEDED_FILE= ${_BULK_PKGLOGDIR}/${BUILD_SUCCEEDED_FILE}
-
-# Only create directories if ${PKGSRCDIR} != ${BULKFILESDIR}
-.if ${PKGSRCDIR} != ${BULKFILESDIR}
-_BULK_MKDIR= ${MKDIR}
-.else
-_BULK_MKDIR= ${DO_NADA}
-.endif
-
-#
-# Sanity checks
-#
-
-# Allow FORCEBROKENFILE files to be created in either PKGSRCDIR or BULKFILESDIR.
-.if exists(${FORCEBROKENFILE})
-PKG_FAIL_REASON+= "${PKGNAME} is marked as broken by the bulk build administrator: `cat ${FORCEBROKENFILE:Q:Q}`"
-.elif exists(${_FORCEBROKENFILE})
-PKG_FAIL_REASON+= "${PKGNAME} is marked as broken by the bulk build administrator: `cat ${_FORCEBROKENFILE:Q:Q}`"
-.endif
-
Home |
Main Index |
Thread Index |
Old Index