(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=cla 2021-02-18T06:02:47+00:00 2021-02-18T06:02:47+00:00 Ryan Finnie ryan@finnie.org 2021-02-05T18:30:31+00:00 urn:sha1:a0400b24998e247f32f95a492ed4f3f6ab053ada 2021-01-13T12:39:07+00:00 Jan Kot janymalino@gmail.com 2021-01-12T22:02:03+00:00 urn:sha1:954d9c7c312317e46d5a7adc1d8e9fa5180a9426 As we're checking if debootstrap is present on the host machine, we should look for it in /usr/sbin and not ./bin 2020-05-04T23:52:13+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-04T23:52:13+00:00 urn:sha1:d68290058e523bed56a8235e6408816ae3c8607e debootstrap must obviously exist in the host. we thus must pass 'host' not 'chroot' such that a warning about needing to install it on your host system is output, rather than it being added to a list of packages to be installed, which never occurs in this script. Gbp-Dch: Ignore 2020-05-02T12:06:17+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-02T12:05:03+00:00 urn:sha1:5f318c5a444ef05bdf79b1f7640294c7423fd10e - it's only used by the debootstrap script after alternatives were dropped long ago, so let's move it, avoiding it being loaded for everything else. - there's no need to pass printing another message through it. - there's little point in making the sid distinction if you happen to decide to build sid, it's a given that it's less stable than stable. really, is there any need for this at all? Gbp-Dch: Ignore 2020-05-02T11:54:22+00:00 Lyndon Brown jnqnfe@gmail.com 2020-05-02T11:54:22+00:00 urn:sha1:d7d0798e4681bb7f5c1a1836df854a72d2772113 Gbp-Dch: Ignore 2020-05-01T09:59:11+00:00 johnraff github@rafflesnagoya.com 2020-05-01T02:23:39+00:00 urn:sha1:0e5d0483e5596e200430d28356b808af76806439 This is considered to be more robust. Two instances remain: scripts/build/chroot_archives, line 257: if [ "${LB_APT}" = "aptitude" ] && [ ! $(Chroot chroot "which aptitude") ] The command is run inside a chroot where the environment might be special, and would need further testing. manpages/Makefile, line 42: @if [ ! -x "$$(which po4a 2>/dev/null)" ]; \ I am insufficiently familiar with makefile syntax to edit this. 2020-04-23T14:00:34+00:00 Lyndon Brown jnqnfe@gmail.com 2020-04-01T10:25:56+00:00 urn:sha1:8ffe48d8f3825a3741deeb0a45e5372b5ed5504c 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-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