(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=cla 2020-05-04T20:40:13+00:00 2020-05-04T20:40:13+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-04T15:12:45+00:00 urn:sha1:d7883ec32b2bb907fce17fb759c08c5cd9851fc3 the design choice from when EFI support was introduced was to change `--bootloader` to `--bootloaders`, with users specifying their selection of BIOS and EFI bootloaders together. at this time there were not even any decent validation checks being performed, and invalid combinations could cause some chaos. since then proper validation was put in place, including checking that only a single instance of each of BIOS and EFI bootloaders exists in the selection. here we tweak things such that we stick with the same option, but we split the selection up such that we store the BIOS and EFI selections separately within the saved config file, and offer it up to scripts to help simplify those scripts. we must however retain support for splitting from the combined option, both because we still use it in the combined option, and for backwards compatibility with older saved configs. Gbp-Dch: Short 2020-05-04T16:38:53+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-04T16:38:53+00:00 urn:sha1:7ad96bd64418951ab48e6e1c522c501e57b6b9d9 "grub" presumably was what is now called "grub-legacy" removed both because there is already a proper piece of code adding bootloader packages. Gbp-Dch: Ignore 2020-04-23T13:54:19+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-01T09:58:47+00:00 urn:sha1:6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1 to keep the renaming simple, but leaving the variable plural is a cause for confusion. since this property is stored in the INI style config/build config file rather than a shell script based one, at the property there is already singular, there was no need for a backwards compatibility hack. Gbp-Dch: Short 2020-04-23T13:46:06+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-28T12:55:53+00:00 urn:sha1:9a91ca9fde8eb2b15a3294fe95f99990d8cf9227 note that the bit of code removed from source_debian relies upon a variable LB_TASKS which itself is an old leftover artefact from before v4.0. Gbp-Dch: Short 2020-04-23T10:52:04+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-28T02:21:36+00:00 urn:sha1:f73797158e631d9fa2d4c9994e2feff542a7501b two parts of the code worked with both comma and space separated lists, while two others only worked with comma separated. swapping out commas with spaces when we setup the var in Set_config_defaults() means that individual scripts no longer need to worry about it and everything supports both; and that we can avoid the IFS/OLDIFS mess. Gbp-Dch: Short 2020-03-20T10:19:33+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-19T00:19:26+00:00 urn:sha1:945a166f75f7bf0419a7caefa7e7337119732929 progress-linux, as discussed in MR #142 ([1]) is a little known distro, which appears to be little more than a personal project of the original author of live-build. given that, the expense of maintaining all of these old hacks for it cannot be justified. it is not known whether or not live-build is even used with respect to it since the author abandoned live-build some years ago. also, at least one past change in live-build possibly broke progress-linux compatibility anyway, which would have required progress-linux users of live-build to use a custom progress-linux config, or a progress-linux fork of live-build, and there is no knowing how much of the hacks in this "upstream" codebase any user of progress-linux currently relies upon. and again, progress-linux appears to just be a personal project of Daniel's, with afaik very little userbase. (Daniel seems to be the only developer working on the project which speaks to how small it is). [1]: https://salsa.debian.org/live-team/live-build/-/merge_requests/142 Gbp-Dch: Short 2020-03-17T22:59:37+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-15T13:05:44+00:00 urn:sha1:fb0790cc4379280084cc9a4469a515e243f45b9b this function takes one or more required stage fileS _plural_, and exits if any are missing (or at least it does now after the refactor). let's rename it to make things more clear Gbp-Dch: Short 2020-03-17T18:57:02+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-13T17:11:53+00:00 urn:sha1:fe9195b59c9647598ecea00900edfe2678bddcac as suggested by Raphaël rather than have fixed stagefile filename strings at all in the scripts, use `$(basename $0)` to use the name of the script (which is the same for almost all cases anyway, and the stage files are supposed to be almost exclusively unique per-script). we can thus simplify things by determining the filename for most use cases within the functions themselves. this does change the file used by a couple of scripts, affecting backwards compatibility of executing live-build upon an existing partially or fully completed build: - binary_grub-pc used "binary_grub" - chroot_includes used "includes.chroot" care had to be taken for the following cases: - there are some cases like bootstrap_cache, source_debian and bootstrap_debootstrap which are dealing with more than one file, and/or otherwise a filename that is not specific to the script itself exactly, or should not be based upon its name. - some cases like chroot_cache, bootstrap_cache and chroot_install-packages need to append something to the end of the name depending upon which pass/action mode the script is being executed with. - furthermore in the bootstrap_cache case one of the filenames is used within the bootstrap_debootstrap and thus needs very careful handling to be certain that a change in filename of bootstrap_cache does not break bootstrap_debootstrap. Gbp-Dch: Short 2020-03-17T18:57:02+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-12T01:21:39+00:00 urn:sha1:04d9ee0211e7cf2d5f637941ff6579b4f5462da6 - avoid all need to pass ".build/" path in stage file names into the functions - add a helper to remove a stage file (required to complete the above properly) - avoid duplicating filenames within scripts which makes them prone to mistakes (some instances of which I've actually encountered and had to fix) Gbp-Dch: Short 2020-03-15T21:38:35+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-15T18:04:55+00:00 urn:sha1:b25db0a4bfdd5b415672cc14ae06c287e15656b3 the chown command needed running within the chroot, since apt-get is being run within the chroot and _apt might have a different UID there than on the host. Gbp-Dch: Short Closes: #953957