aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* libs/git: Commit only if any blobs were removedAndrew Robbins2019-03-271-1/+24
| | | | | | git_diff_check() was added for future use since it's complementary to git_diff_staged_check(). It could be used to check for a dirty worktree, for example.
* libs/git: Fail if patching failsAndrew Robbins2019-03-271-6/+6
| | | | | | | | | | | | | | The recursive call in git_project_patch_recursive() is now performed last so that if a patching attempt fails, the calling functions won't attempt to apply more patches. The consequence of this change is that patches are applied in (nearly) opposite order from before. git_project_prepare_patch() is now called after git_project_prepare_blobs() so that if patching fails and the user chooses to perform additional project actions anyway, such as building, the project is already deblobbed and not a risk to their freedom. I had mistakenly reordered these function calls in a prior commit.
* libs/project: Execute project action in subshellAndrew Robbins2019-03-261-13/+9
| | | | | | | | Executing the project action within its own subshell makes it easy to abort the action with a simple "exit" while still allowing for the printing of the footer describing failure/success. Prevously, if "exit" were called in a project action the footer would not print.
* Merge branch 'libs-git' of and_who/libreboot into masterSwift Geek2019-03-241-160/+76
|\
| * libs/git: Remove unnecessary env invocationAndrew Robbins2019-03-231-2/+2
| | | | | | | | | | LC_ALL is already set to "C.UTF-8" and exported if libfaketime path is given in libreboot.conf
| * libs/git: Remove some unused variable definitionsAndrew Robbins2019-03-231-8/+0
| |
| * libs/git: Avoid checking exit codes indirectlyAndrew Robbins2019-03-231-35/+5
| |
| * libs/git: Simplify logic for operating on branchesAndrew Robbins2019-03-231-122/+76
|/ | | | | | | Previous patches made certain tests unnecessary due to the setting of $BRANCH_PREFIX in $branch. By adding the branch prefix right before it's actually needed we can retain the usefulness of those conditional tests.
* Merge branch 'paraluks' of swiftgeek/libreboot into masterAndrew Robbins2019-03-221-1/+1
|\
| * parabola: Update cryptsetup lineSebastian 'Swift Geek' Grzywna2019-03-191-1/+1
| | | | | | | | | | Cryptsetup is now using LUKS2 by default. https://gitlab.com/cryptsetup/cryptsetup/commit/ae90497762bc4e3f04064e0ebbbde8c64bf27c4a
* | Libreboot workshop at LibrePlanet 2019Leah Rowe2019-03-192-0/+84
|/
* Merge branch 'patch' of and_who/libreboot into masterSwift Geek2019-03-193-24/+60
|\
| * libs/git: Avoid some redundancies in git_patch()Andrew Robbins2019-03-181-19/+29
| | | | | | | | | | | | | | | | | | The subshell, changing directory, and checking out was unecessary considering all of these are done within the functions called by git_patch() git_am() was added in order to mirror the same wrapper style as used by git_apply() and git_commit()
| * libs/git: Move patching method logic to git_patch()Andrew Robbins2019-03-181-8/+13
| | | | | | | | | | | | | | | | | | | | | | This simplifies git_project_patch_recursive() and provides a unified method for patching, regardless of the patch format (mailbox or diff). Logic is included for dealing with patching failures due to git_apply_check() not being enough to catch certain edge cases, such as 'git apply --check' returning 0 but a subsequent 'git apply' failing.
| * libs/git: Add git_apply() and git_apply_check()Andrew Robbins2019-03-181-1/+33
| | | | | | | | | | | | | | | | | | | | Since changes from an applied diff need to be added to the index and committed (vs. mailbox files with the git_patch function) new functions were necessary to account for this difference. This also fixes a bug where diffs were applied but not committed, at minimum dirtying the work tree and potentially causing problems for any later patches.
| * Rename and refactor diff_patch_file()Andrew Robbins2019-03-183-17/+6
|/ | | | | | The previous function, diff_patch_file, was more error-prone and fragile and did not take into consideration patching of more than one file at a time(!).
* Merge branch 'libs-git' of and_who/libreboot into masterSwift Geek2019-03-141-37/+23
|\
| * libs/git: Apply patches before removing blobsAndrew Robbins2019-03-131-1/+1
| | | | | | | | | | | | | | | | | | Patching before removing blobs is cleaner since patches are applied against a freshly created and checked out branch at the specified revision. Applying patches first also seems to reduce the likelihood of failed patching attempts due to a nebulous error about files not matching the git index (but doesn't eliminate it). More debugging required.
| * libs/git: Actually patch recursivelyAndrew Robbins2019-03-131-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the only way patching would work is if for every target there existed a corresponding directory under $project/$PATCHES, e.g: "./libreboot update coreboot x200 8MiB corebootfb grub" would require the "grub" directory and its parents: "projects/coreboot/patches/x200/8MiB/corebootfb/grub" Now you only need target-specific patch directories if you need them; I believe this was the intended behavior. Superfluous quotes were removed for readability.
| * libs/git: Create branch name based on argument listAndrew Robbins2019-03-121-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug where only $project was used as the branch name due to some faulty logic which checked for the existence of a revision file before setting the variables "prepare_branch" and "prepare_path". The bug in this case was that prepare_branch would be set to the value of $branch in only the first iteration of the for loop since in almost all cases there is only one revision file that exists for a given project, regardless of the arguments provided. Explained another way, in order for the proper branch name to be used a revision file would have had to exist in every target directory. This was an issue because only one branch was ever operated on (named $project), meaning if actions were performed on many targets then only the last to run would be represented in the project's repository--making tracking down some bugs a bit harder. With this fixed we now create a branch for every possible project or tool configuration and leaves us with a log for each.
| * libs/git: Prefix branch names with "libreboot-"Andrew Robbins2019-03-121-7/+8
| | | | | | | | | | | | | | This is a slight mitigation against branch name collisions. More robust handling should be added in the future but this is simple enough and provides some clear indication which branches have been created by the build system.
| * libs/git: Clean up after patch fails to applyAndrew Robbins2019-03-111-1/+2
|/ | | | | A patch failing to apply shouldn't leave the repository in such a state where manual intervention is necessary to reset it.
* Merge branch 'qemu' of and_who/libreboot into masterSwift Geek2019-03-0944-109/+218
|\
| * Create 8MiB target for qemu_i440fx_piix4Andrew Robbins2019-03-0911-0/+21
| | | | | | | | | | | | | | | | | | The 16MiB ROM is non-functional at the moment so an 8MiB target has been added in order to avoid losing QEMU support while the bug is identified and fixed. Files were copied from the 16MiB directory with the exception of the config file located at 8MiB/config which is new.
| * Add GRUB/SeaBIOS targets to qemu_i440fx_piix4Andrew Robbins2019-03-096-0/+8
| |
| * Create corebootfb/textmode targets for qemu_i440fx_piix4Andrew Robbins2019-03-093-0/+8
| | | | | | | | | | | | | | | | The config for text mode doesn't actually have to be there (since text mode is the default in the base config) but, as in other cases, this configuration snippet is included for the sake of documenting what part of the base config is related to the target ("textmode" in this case).
| * Create 16MiB flash size target for qemu_i440fx_piix4Andrew Robbins2019-03-092-0/+6
| | | | | | | | | | 16MiB is the largest flash size for most of our supported boards so any emulated boards should stick with that upper limit.
| * Create 8MiB target for qemu_q35_ich9Andrew Robbins2019-03-0911-0/+21
| | | | | | | | | | | | | | | | | | The 16MiB ROM is non-functional at the moment so an 8MiB target has been added in order to avoid losing QEMU support while the bug is identified and fixed. Files were copied from the 16MiB directory with the exception of the config file located at 8MiB/config which is new.
| * Add GRUB/SeaBIOS targets to qemu_q35_ich9Andrew Robbins2019-03-086-0/+8
| |
| * Create corebootfb/textmode targets for qemu_q35_ich9Andrew Robbins2019-03-083-0/+8
| | | | | | | | | | | | | | | | The config for text mode doesn't actually have to be there (since text mode is the default in the base config) but, as in other cases, this configuration snippet is included for the sake of documenting what part of the base config is related to the target ("textmode" in this case).
| * Create 16MiB flash size target for qemu_q35_ich9Andrew Robbins2019-03-082-0/+6
| | | | | | | | | | 16MiB is the largest flash size for most of our supported boards so any emulated boards should stick with that upper limit.
| * Update coreboot config for qemu_q35_ich9Andrew Robbins2019-03-081-57/+70
| | | | | | | | | | | | | | | | | | | | Updated with the "oldconfig" make target. New configurations: * USE_OPTION_TABLE=y * STATIC_OPTION_TABLE=y * COMPRESS_SECONDARY_PAYLOAD=y
| * Update coreboot config for qemu_i440fx_piix4Andrew Robbins2019-03-081-52/+62
|/ | | | | | | | Updated with the "oldconfig" make target. New configurations: * COMPRESS_SECONDARY_PAYLOAD=y
* Merge branch 'unit-prefix-3' of and_who/libreboot into masterSwift Geek2019-03-07115-12/+12
|\
| * Veyron Mickey: use proper binary prefix for flash sizeAndrew Robbins2019-03-056-1/+1
| |
| * Veyron Minnie: use proper binary prefix for flash sizeAndrew Robbins2019-03-0511-2/+2
| |
| * Veyron Speedy: use proper binary prefix for flash sizeAndrew Robbins2019-03-0511-2/+2
| |
| * X200: use proper binary prefix for flash sizeAndrew Robbins2019-03-0543-3/+3
| |
| * X60: use proper binary prefix for flash sizeAndrew Robbins2019-03-0529-2/+2
| |
| * Z61t: use proper binary prefix for flash sizeAndrew Robbins2019-03-0515-2/+2
| |
* | Merge branch 'unit-prefix-2' of and_who/libreboot into masterSwift Geek2019-03-07134-13/+13
|\ \
| * | Macbook2,1: use proper binary prefix for flash sizeAndrew Robbins2019-03-0529-2/+2
| | |
| * | Nyan Big: use proper binary prefix for flash sizeAndrew Robbins2019-03-0511-2/+2
| | |
| * | Nyan Blaze: use proper binary prefix for flash sizeAndrew Robbins2019-03-0511-2/+2
| | |
| * | T400: use proper binary prefix for flash sizeAndrew Robbins2019-03-0543-3/+3
| | |
| * | T60: use proper binary prefix for flash sizeAndrew Robbins2019-03-0529-2/+2
| | |
| * | Veyron Jerry: use proper binary prefix for flash sizeAndrew Robbins2019-03-0511-2/+2
| |/
* | Merge branch 'unit-prefix-1' of and_who/libreboot into masterSwift Geek2019-03-07123-13/+13
|\ \ | |/ |/|
| * D945GCLF: use proper binary prefix for flash sizeAndrew Robbins2019-03-0520-3/+3
| |
| * D510MO: use proper binary prefix for flash sizeAndrew Robbins2019-03-0515-2/+2
| |