(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=cla 2020-05-03T00:31:47+00:00 2020-05-03T00:31:47+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-02T23:58:18+00:00 urn:sha1:43b4f9cdf62972bff5cff45f895305c391a895f2 did not properly consider all usage cases properly in deciding placement. this captured `--usage` in `$PROGRAM --usage` as the action for instance. Gbp-Dch: Ignore 2020-05-02T13:04:12+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-02T12:43:22+00:00 urn:sha1:b20979334cc28c345b2b72da30c3591fb5c85882 for bootstrap, the check is moved to the case statement for greater robustness, and for consistency with other scripts. Gbp-Dch: Ignore 2020-04-23T13:53:30+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-30T14:17:52+00:00 urn:sha1:6def2c27be28169cf3e0757a6928e3f13de157a8 Gbp-Dch: Ignore 2020-04-23T13:53:12+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-30T14:09:41+00:00 urn:sha1:430c48640c6b5523f8da65561f62d25b6a7efbb2 makes them consistent with other similar script-specific param handling; saves the arg processing from dealing with it. Gbp-Dch: Short 2020-03-17T22:09:51+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-17T22:09:51+00:00 urn:sha1:dadeec9d396382d42bae0cf490dc55456fa71199 missed in final revision of fe9195b59c9647598ecea00900edfe2678bddcac Gbp-Dch: Ignore 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-13T16:19:59+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-13T16:19:59+00:00 urn:sha1:a46985b08ac8b8c73d8a3965ee83daa4d4c41e22 Gbp-Dch: Ignore 2020-03-13T15:37:38+00:00 jnqnfe jnqnfe@gmail.com 2015-02-05T03:30:47+00:00 urn:sha1:b27927724a5da017796d16de47979116d01455dc Combine the check+create done in each script. (The original functions are still callable as before, but a new combined `Aquire_lockfile` function can be called instead, as now used). Note, a further simplification could be done in removing the passing of the lock filename in as a parameter since every use of the functions is with ".lock". The lock functions already have a fallback to ".build/lock" though. Checking the history, the fallback used to be for a system wide lock, which was then replaced with this config-tree specific one. As long as that is not used implicitly by 3rd-party hooks then surely we are free to change the fallback to ".lock" and further remove passing in a name as a param...? history: db5d2b0dcdae96e712661605e17bc9875e224f9f 0aa8289a3773fd8a3885090b72622c2f95ab099c Gbp-Dch: Short Closes: #952918 2020-03-11T13:51:19+00:00 Lyndon Brown jnqnfe@gmail.com 2020-03-11T10:07:21+00:00 urn:sha1:7a4a9f94b89d22c083c1610ecbcb7a173f1b73db Current versions of the project files are built upon versions published and licensed by Daniel Baumann, but are modified copies of those files and thus need to be marked as such per licensing requirements (afaik he did not pass along ownership / licensing rights to anyone when he left the project). We should also be careful to not be misrepresenting such modified copies as being attributed to Daniel. Adding a new copyright line referring to "The Debian Live team" should suffice for this. The authorship block in man pages has also similarly been updated. Notes: - tweaked a copy of daniel copyright lines stating 2014 instead of 2015. both of these cases were in files that i had personally introduced in some of my past merged commits that moved some code around. i don't know why they stated 2014. - binary_onie was introduced in 2018, so that has a 2018 date instead of 2016 unlike the rest. - 'efi-image' is a 3rd-party (Canonical Ltd) work that we bundle, but it has been modified by 674794a8f4d61a729d2dbd6d99385d2826138694 and 36a3ba76347ef72df1c316312ed3a26aa4b0c816 so I similarly added a debian live copyright line. - 'grub-cpmodules' is similar. it was only changed by the indentation fix of 36a3ba76347ef72df1c316312ed3a26aa4b0c816 but modification is modification, and this does help cover any possible future changes that might be made.