summaryrefslogtreecommitdiff
path: root/mk/bulk
AgeCommit message (Collapse)AuthorFilesLines
2005-11-20Put literal strings into .Ql quotes.rillig1-3/+5
2005-11-20Added "" quotes to all arguments to echo(1).rillig1-17/+17
2005-11-20Moved the "export BROKENF" command from the top of the program to therillig1-2/+2
point where it is actually used, which is when mk/bulk/pre-build.local is executed for allowing user-specific modifications before the build begins. That way it's easier to see why this command is necessary at all.
2005-11-20- If the BULKFILESDIR differs from PKGSRCDIR, create it before trying torillig1-1/+16
create log files in it. - Fail early if the ORDERFILE does not exist. (As this program is not in "set -e" mode, it had continued without error checking, which resulted in _many_ error messages.)
2005-11-20Despite having ALLOW_VULNERABLE_PACKAGES in my /etc/mk.conf, I foundagc1-2/+2
that the bulk builds would only work properly with the audit-packages package installed at all times. I am obviously hideously mistaken in this. By popular request, revert the change to add audit-packages, since I am told this is the incorrect way of doing this.
2005-11-20Macro usage fixes, use more macros, grammar improvement.wiz1-10/+12
2005-11-19Allow the bulk builds to work by adding security/audit-packages as aagc1-2/+2
BULK_PREREQ package.
2005-11-19Indentation fix.rillig1-3/+2
2005-11-19Fixed the documentation in the DIAGNOSTICS section.rillig1-4/+6
2005-11-19Made the diagnostics for invalid characters in BULK_PREREQ and therillig1-6/+8
package list more useful by only showing the invalid characters, not the complete variable value.
2005-11-19- Moved the "man page" comment into a real man page.rillig2-18/+119
- Added more sanity checks.
2005-11-19The toplevel database files are referenced in the report, so they must notrillig1-3/+1
be unlinked. Not even in a comment.
2005-11-19Replaced ${ECHO_MSG} with ${ECHO} where appropriate. While there, quotedrillig1-19/+19
the filename of the toplevel BROKENFILE correctly.
2005-11-19To check if the pkg_install tools are up to date, the bulk build scriptagc1-2/+2
cd's into pkgtools/pkglint and does a "make fetch". Since the audit-packages check was introduced to bsd.pkg.mk, this "make fetch" will fail with an error message which looks like: ===> do-fetch [pkglint-4.42.1] ===> Checking for vulnerabilities in pkglint-4.42.1 ===> check-vulnerable [pkglint-4.42.1] ===> *** The audit-packages package must be at least version 1.40 ===> check-vulnerable [pkglint-4.42.1] ===> *** Please install the security/audit-packages package and run ===> check-vulnerable [pkglint-4.42.1] ===> *** '/usr/pkg/sbin/download-vulnerability-list'. *** Error code 1 since there is no audit-packages package installed at this point (we are still doing the pre-installation checks). So call "make fetch" with an additional SKIP_AUDIT_PACKAGES=yes argument at this point.
2005-11-18The "Building packages" section has been split up into "Building therillig1-7/+11
packages" and "Generating the report".
2005-11-18Added a new section called "Generating the report". Moved the FTP*rillig1-9/+11
variables into that section, since they have nothing to do with uploading the binary packages.
2005-11-18Revert the change in 1.77, which does not work correctly.agc1-15/+11
However, this does not help people who are doing bulk builds in sandboxes via read-only nullfs mounts. A correct, long-term solution to this needs to be found.
2005-11-18- The text/plain report is generated using printf() instead ofrillig1-34/+33
formline(). This prevents long package names from being trimmed. - Removed the "-p e" command line option from the pax(1) command line. This makes it possible to run mk/bulk/post-build as different user from the one who did the actual build.
2005-11-18Code cleanup, bugfixes and separation of PKGSRCDIR and BULKFILESDIR.rillig1-24/+88
- Added section headings to make reading the code more efficient. - Added bp_die() for uniform error messages. - Added sanity checks: - $BULK_BUILD_CONF must be a regular file. - Protect against spurious output from the bulk.conf file. - Check that configuration variables are defined, non-empty and do not contain newlines. - Properly extract MAKECONF from the bulk.conf file when getting the mk.conf variables. - Protect against spurious output from BMAKE show-vars. - Fixed the use of undefined values ($startdate). - Changed some calls to my_system() to a more secure form. - Check if the calls to chdir() actually work. - Look for the BROKENFILEs in BULKFILESDIR instead of USR_PKGSRC. - Changed postfix conditions to prefix conditions. Example: do_foo() if $bar; ==> if ($bar) { do_foo(); }
2005-11-18If the bulk build is taking place in a sandbox, then typically read-onlyagc1-11/+15
nullfs mounts are used (on NetBSD). Only attempt to install new pkg_install tools if the bulk build is not taking place in a sandbox. This is a quick and dirty hack to allow sandboxed bulk builds (the majority of cases, I suspect) to operate properly once again.
2005-11-18Corrected the comment above BULKFILESDIR. It is not only used for therillig1-2/+3
global log files but also for the package-specific ones.
2005-11-18Properly indented preprocessing directives.rillig1-3/+3
2005-11-18Allow FORCEBROKENFILE files to be created in either PKGSRCDIR orrillig1-3/+6
BULKFILESDIR.
2005-11-16Changes for separation of BULKFILESDIR and PKGSRCDIR.rillig1-26/+53
- Added a bunch of internal variables that determine the correct places for the build log files of the current package. - Added section headings. - Moved a sanity check out of the configuration section to not confuse the reader. - mk/bulk/print{depends,index} are called with two arguments, which allows separation of BULKFILESDIR and PKGSRCDIR. - Replaced uses of BUILDLOG, BROKENFILE and BROKENWRKLOG with their internal counterparts, which use ${BULKFILESDIR} instead of ${PKGSRCDIR}.
2005-11-16Changes for enabling separate BULKFILESDIR and PKGSRCDIR.rillig1-6/+13
- The main .make file is stored in ${BULKFILESDIR} instead of ${PKGSRCDIR}. - The PKGLIST variable from the configuration file is passed to the bulk-cache command in the environment. There are very few variables left that have to be exported via export_config_vars(). Maybe that function can be avoided alltogether.
2005-11-16Made printdepends very similar to printindex, as both iterate over allrillig1-53/+114
pkgsrc packages, collecting different information. - BMAKE is taken from the environment instead of querying `uname -s`. - package-specific log files can be saved in a directory tree different from PKGSRCDIR. - Added sanity checks for BMAKE, bulkfilesdir and brokenfile. - The .pkglist cache is saved in ${BULKFILESDIR} instead of ${PKGSRCDIR}. - Reformatted the diagnostics.
2005-11-16As I'm not sure for what things ${BULKFILESDIR}/${BROKENFILE} is used,rillig1-2/+2
error messages from failed "cd" commands simply go to stderr.
2005-11-16Another rewrite:rillig1-21/+65
- Changed the implementation how package-specific log files are generated. No user-visible changes. - Stricter preconditions: - bulkfilesdir must be an absolute path. - brokenfile must not contain slashes. - The .pkglist file is taken from BULKFILESDIR, not from PKGSRCDIR. - Error messages use the prefix "[printindex]" instead of "===>", as the latter is already reserved for pkgsrc. Everything else would be confusing. - If a "cd" into a package directory fails, an error message is written to ${BULKFILESDIR}/${BROKENFILE}.
2005-11-16- Improved the "man page" comment a little.rillig1-17/+14
- Renamed the second parameter from "brokenbasedir" to "bulkfilesdir". The latter name is already used in bsd.bulk-pkg.mk for the same purpose. - Renamed "cwd" to "pkgsrcdir" for the same reason.
2005-11-16Interix cannot use the generic mksandbox procedure. Exit with error.tv1-1/+6
(A future Interix-specific mksandbox procedure is in work.)
2005-11-14Fixed singleton variable which had been left over by one of the lastrillig1-2/+2
changes.
2005-11-14Removed the code for printing progress information again, as printindexrillig1-17/+1
is mostly used in batch mode. Impatient users should count the number of lines in the output file if they can't wait.
2005-11-12Fix a typo that in some cases prevented a BROKENFILE from beingkristerw1-2/+2
created.
2005-11-12Please, really only export MAKECONF if it is set.seb1-2/+5
2005-11-11Remove some redundant printing of messages when we are cleaningkristerw1-6/+2
before/after building the package.
2005-11-11- A warning is printed if there is no PKGNAME matching for a PKGPATH in therillig1-10/+14
.index file. - Condensed the code for printing to another package's .broken file in case of failure. (Added a variable pkg_brokenfile.)
2005-11-11Indentation fix.rillig1-3/+3
2005-11-11Removed the "BULK>" prefix from a message, as that prefix is reserved forrillig1-2/+2
bsd.bulk-pkg.mk.
2005-11-11Added two variables BULK_MSG and BULK_MSG_CONT that are used for printingrillig1-45/+54
messages. Replaced all instances of ${ECHO_MSG} "BULK> " with ${BULK_MSG}.
2005-11-11Properly handle package directories containing shell special charactersrillig1-2/+11
like [], ?, *. They _really_ should not exist, but you never know. While here, added a rationale for the not-so-obvious :detect_duplicates: delimiter.
2005-11-10Export MAKECONF again.rillig1-2/+2
2005-11-10Fixed the remaining instances of code relying on trailing white-space inrillig2-4/+4
the INDEXFILE.
2005-11-10Replaced another instance of grep|awk with a simple awk. A warning isrillig1-3/+3
printed if no package name could be found for a package directory.
2005-11-10Don't rely on the INDEXFILE having trailing white-space in each line.rillig1-2/+2
Whoever had written such unusual code should have left a note in the printindex script that the trailing white-space was required. It is such an uncommon assumption that I treated it as a typo and removed it. Now it's fixed. I also replaced the use of grep|awk with a simple awk, as grep would have interpreted regular expressions in the package name. In general, please think more about _appropriate_ ways to handle data. grep(1) is not a tool for searching strings. It's a tool for searching regular expressions.
2005-11-09Before extracting the pkgsrc variables (which takes some time), print arillig1-1/+3
line announcing that.
2005-11-09PRUNEDISTFILES and PRUNEPACKAGES may be left undefined in build.conf, asrillig1-5/+9
they get useful default values in the pre-build script. Thanks to kristerw for pointing that out.
2005-11-08- Improved error handling.rillig1-8/+7
- Changed "foo; if [ $? -eg 0 ]; then" to "if foo; then" in three places.
2005-11-08- Removed the redundant check on USR_PKGSRC.rillig1-8/+3
- Removed the singleton variable pkg_install_dir.
2005-11-08Fixed computation of the .broken file, which had been "./dev/null" when therillig1-4/+4
program was invoked without arguments.
2005-11-07Clarified the libkver item.rillig1-1/+1