aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* www/index.sh: Fix OpenBSD touch(1) incompatibility, take #2Michael Reed2017-07-103-3/+8
| | | | | | | | | | | | | | | | | | | | | When running index.sh on OpenBSD, the following error happens for each item in the news/ directory (output is from "bash -x"): + touch -d '4 Jun 2017' news/andrew-robbins-new-maintainer.md touch: out of range or illegal time specification: YYYY-MM-DDThh:mm:ss[.frac][Z] This is because OpenBSD's touch(1) requires that the "d" flag's argument be in ISO 8601 format, that is, "YYYY-MM-DDThh:mm:ss[.frac][Z]". This could have been dealt with by converting the article date (determined by "sed -n 3p $f | sed -e 's/^..//g'") to ISO 8601 format, then passing the date to touch(1). That would have required even more code, so was discarded as a possible solution. Instead, we solve this by keeping a MANIFEST file under news/, which is read to determine (a) which articles should be added to news/index.md, and (b) in which order. This avoids the need for touch(1) altogether, finally making the whole libreboot website build properly on OpenBSD. This also allows a minor simplification in the Makefile.
* Revert last commit (it caused issues. no PR needed; mreed permits the revert)Leah Rowe2017-07-116-1/+2
| | | | This reverts commit bfc86546849e15dd98362852e76fa9feac2fba77.
* Merge branch 'fix-touch' of mreed/libreboot into masterLeah Rowe2017-07-116-2/+1
|\
| * www/index.sh: Fix OpenBSD touch(1) incompatibilityMichael Reed2017-07-106-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | When running index.sh on OpenBSD, the following error happens for each item in the news/ directory (output is from "bash -x"): + touch -d '4 Jun 2017' news/andrew-robbins-new-maintainer.md touch: out of range or illegal time specification: YYYY-MM-DDThh:mm:ss[.frac][Z] This is because OpenBSD's touch(1) requires that the "d" flag's argument be in ISO 8601 format, that is, "YYYY-MM-DDThh:mm:ss[.frac][Z]". This could have been dealt with by converting the article date (determined by "sed -n 3p $f | sed -e 's/^..//g'") to ISO 8601 format, then passing the date to touch(1). That would have required even more code, so was discarded as a possible solution. Instead, this has been solved by prepending the ISO 8601 date to the names of all news items. This has the benefit of avoiding the need for touch(1) altogether, as a lexicographic sorting of ISO 8601 dates is the same as a date-based sorting. In other words, "ls news/*.md" will give a list of articles sorted by date, which we can then append to news/index.md in that order. One downside of this solution is that it introduces the possibility that the date in the filename (ISO 8601 format) of a news article does not match the date inside the article (e.g., 1 May 2017). I have not dealt with this as it remains to be seen whether it will be a problem in practice.
* Merge branch 'libs/project-cruft' of kragle/libreboot into masterLeah Rowe2017-07-101-25/+23
|\
| * Fix action text in './libreboot usage <project>'Andrew Robbins2017-07-091-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the name used in a 'for /name/ ...' loop rebinds any local variables (with the same name) with whatever /name/ is bound to in a way that persists even after the loop returns. The crux of the issue here is that a function's children can rebind the parent(s)' local variables just by using the same name as the variable in a for loop, which is surprising--and apparently undocumented--behavior. Use of a subshell group for encapsulating the for loops (See: project_usage_actions) mitigates the aforementioned issue. Closes issue: #244
* | Merge branch 'tar-no-warning-nul' of kragle/libreboot into masterLeah Rowe2017-07-101-0/+2
|\ \
| * | Suppress GNU tar's warning on filenames w/ nuls.Andrew Robbins2017-07-091-0/+2
| |/
* | Merge branch 'fix-index-sh-openbsd' of mreed/libreboot into masterLeah Rowe2017-07-101-1/+1
|\ \
| * | docs/index.sh: Fix sed(1) invocation on OpenBSDMichael Reed2017-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same idea as 497a49162f7c8b5c1d7c653087b0ac6c8e5765f9. Without this patch, the following errors occur when running index.sh: sed: 1: "news/new-mailing-lists. ...: extra characters at the end of n command sed: 1: "news/andrew-robbins-new ...: extra characters at the end of n command sed: 1: "news/formalised-structu ...: extra characters at the end of n command sed: 1: "news/proposal-rejoin-gn ...: extra characters at the end of n command sed: 1: "news/unity.bare.html": extra characters at the end of n command
* | | Merge branch 'incremental-build' of mreed/libreboot into masterLeah Rowe2017-07-105-25/+64
|\ \ \ | |_|/ |/| |
| * | www/publish.sh: Fix conditionals for file matchingMichael Reed2017-07-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the Makefile, publish.sh was executed on markdown source files using find(1), which happened like this: ./publish.sh ./index.md Now that we have a Makefile, this happens instead: ./publish.sh index.md Note that the file argument "index.md" in the first and second case both refer to the same file, yet they are different strings. This is important because publish.sh gives index.md (among other files) special treatment, and it does this by string comparison. Unfortunately, only the argument in the first case ("./index.md") will cause publish.sh to give special treatment, while the argumnent in the second case ("index.md") will not. To fix this, make it so that both "./index.md" and "index.md" trigger publish.sh's special handling. This commit also fixes the same issue for "docs/fdl-1.3.md" and "conduct.md".
| * | Build website incrementally (and faster if you have the CPU cores)Michael Reed2017-07-094-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by replacing www/generate.sh with a Makefile. Benefits: - Makes builds incremental, meaning that only the minimum number of markdown files will be converted to HTML during a build. The previous scheme always generated a new HTML file for every markdown file, which is a big waste of time if only 1 or 2 markdown files have been changed. - Allows for much faster builds through concurrent jobs (e.g., via "make -j4"). On my 4-core machine, my average build time for the website with generate.sh was just over 26 seconds; with "make -j4", it was 13 seconds. - Avoids portability issues with find(1) in generate.sh, which I was encountering on OpenBSD. A note on portability: unlike GNU Make, OpenBSD's Make does not have the "$(shell [commands])" construct, so we don't use that. Instead we use "!= [commands]", which is supported by both.
| * | www/publish.sh: Make safe to run multiple instances concurrentlyMichael Reed2017-07-092-10/+14
| |/ | | | | | | | | | | Instead of always using the same file (temp.md), use a unique temporary file so that multiple instances of publish.sh do not clobber each other's work.
* | Merge branch 'libs/project-cruft' of kragle/libreboot into masterLeah Rowe2017-07-072-117/+60
|\ \ | |/ |/|
| * Removed cruft & redundancy in project_action*()Andrew Robbins2017-07-072-117/+60
|/
* Merge branch 'gitignore' of mreed/libreboot into masterLeah Rowe2017-07-071-0/+2
|\
| * gitignore: Ignore /www/feed.xml and /www/news/feed.xmlMichael Reed2017-07-071-0/+2
|/ | | | They are generated files, so should probably not be tracked.
* Merge branch 'fix-publish-sh-openbsd' of mreed/libreboot into masterAndrew Robbins2017-07-071-5/+5
|\
| * docs/publish.sh: Fix sed(1) invocation on OpenBSDMichael Reed2017-07-051-5/+5
|/ | | | | | | | | | | | | | | | | | | On OpenBSD, publish.sh errors out at the following call to sed(1) (from "bash -x publish.sh"): + sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g' sed: 1: "temp.md": undefined label 'emp.md' It seems that "temp.md" is being parsed by sed as a sed command, not as a named file. This is likely due to OpenBSD's strict usage requirements for sed: usage: sed [-aEnru] [-i[extension]] command [file ...] sed [-aEnru] [-e command] [-f command_file] [-i[extension]] [file ...] As shown above, the sed command must always come before any named files. This commit does that, which fixes publish.sh with OpenBSD's sed. This is also tested and working with GNU sed v4.2.2
* Merge branch 'optipng' of mreed/libreboot into masterAndrew Robbins2017-07-049-0/+0
|\
| * Reduce image size with optipngMichael Reed2017-07-039-0/+0
|/ | | | | | | OptiPNG losslessly optimizes .png files; in other words, the images in question should (and do, by my testing) look the same. In short, we save some bytes for free.
* Merge branch 'cmdline-markup' of mreed/libreboot into masterLeah Rowe2017-07-032-12/+12
|\
| * Fix documentation markupMichael Reed2017-07-032-12/+12
| | | | | | | | | | Be consistent with marking up commands as such, so the documentation is less surprising.
* | Merge branch 'openbsd' of mreed/libreboot into masterLeah Rowe2017-07-031-14/+15
|\ \ | |/ |/|
| * OpenBSD docs: Add grub.conf caveat for GPT usersMichael Reed2017-07-021-0/+3
| | | | | | | | | | The openbsd1 partition is only present for users with an MBR installation of OpenBSD, which not everyone has.
| * OpenBSD docs: cleanup "prepare USB drive" sectionMichael Reed2017-07-021-6/+4
| | | | | | | | Avoid jargon, add markup where applicable, rewrite for brevity, etc.
| * OpenBSD docs: update references from 6.0 to 6.1Michael Reed2017-07-021-4/+4
| | | | | | | | Because why not?
| * OpenBSD docs: mark up "dd" as a commandMichael Reed2017-07-021-3/+3
| | | | | | | | | | Other command lines are marked up similarly in openbsd.md, so "dd" should be as well.
| * OpenBSD docs: Fix grammarMichael Reed2017-07-021-2/+2
|/
* Merge branch 'openbsd' of mreed/libreboot into masterLeah Rowe2017-07-022-4/+10
|\
| * Fix NetBSD's grub.conf instructionsMichael Reed2017-07-011-2/+5
| | | | | | | | | | The grub.conf mentioned here has the same errors that the OpenBSD one had.
| * Fix OpenBSD grub.conf formattingMichael Reed2017-07-011-1/+1
| | | | | | | | | | There were some weird special characters which messed things up. Replacing them with spaces fixes the problem.
| * Fix OpenBSD grub.conf docsMichael Reed2017-07-011-1/+4
|/ | | | | Previously, Libreboot's GRUB payload would fail to detect the OpenBSD menuentry. Now it does.
* Merge branch 'memtest86plus-merge' of kragle/libreboot into masterLeah Rowe2017-06-305-0/+139
|\
| * Merged MemTest86+ into the new build system.Andrew Robbins2017-06-305-0/+139
|/
* Merge branch 'source-tarball-support' of kragle/libreboot into masterLeah Rowe2017-06-281-1/+1
|\
| * Function call wget_wrapper wasn't renamed. Fixed.Andrew Robbins2017-06-281-1/+1
|/
* Merge branch 'source-tarball-support' of kragle/libreboot into masterLeah Rowe2017-06-283-4/+83
|\
| * Fixed bug in diff_patch_file() filename parsing.Andrew Robbins2017-06-281-3/+4
| |
| * Added functions for downloading/patching archivesAndrew Robbins2017-06-283-1/+79
|/ | | | i.e., source tarballs are (partially) supported
* Merge branch 'renaming-vars' of kragle/libreboot into masterLeah Rowe2017-06-256-31/+31
|\
| * Vars TAR_XZ,ASC,SHA256SUM renamed for generality.Andrew Robbins2017-06-256-31/+31
|/ | | | | Will help facilitate sane code when handling: archive formats, checksum file extensions, signature formats.
* Merge branch 'docs/fix-backslashes-on-gm45-page' of libreboot/libreboot into ↵Swift Geek2017-06-251-6/+6
|\ | | | | | | master
| * fix erroneous backslashes on ICH9 utils pageLeah Rowe2017-06-251-6/+6
|/
* Merge branch 'www/fix-dd-command-on-gm45-page' of libreboot/libreboot into ↵Swift Geek2017-06-251-17/+8
|\ | | | | | | master
| * fix commands on ICH9 utils page in the documentationLeah Rowe2017-06-251-17/+8
|/
* Merge branch 'portable-shebangs' of kragle/libreboot into masterLeah Rowe2017-06-23100-100/+100
|\
| * Replaced '#!/bin/bash' w/ '#!/usr/bin/env bash'Andrew Robbins2017-06-23100-100/+100
|/ | | | | This is mainly useful for being able to run these scripts on BSDs. And for users who use a Bash not installed to /bin.
* Merge branch 'master' of esmith1412/libreboot into masterLeah Rowe2017-06-231-1/+1
|\