diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-12 10:08:29 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-12 10:08:58 +0200 |
| commit | 52bdb68d181a68108213054dace2bb486c5504dc (patch) | |
| tree | d639c1547a826e956ef16656b002b0273a9c0795 | |
| parent | 87374242c6517a898943bdea378108238c4c98ee (diff) | |
| download | vyos-live-build-52bdb68d181a68108213054dace2bb486c5504dc.tar.gz vyos-live-build-52bdb68d181a68108213054dace2bb486c5504dc.zip | |
Changing default binary.list filename to binary.contents to make it more explicit and not to be confused with package lists.
| -rwxr-xr-x | frontends/cron/live-build-cron-images | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_checksums | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_clean | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/frontends/cron/live-build-cron-images b/frontends/cron/live-build-cron-images index 48c8d3115..e5bd74005 100755 --- a/frontends/cron/live-build-cron-images +++ b/frontends/cron/live-build-cron-images @@ -196,7 +196,7 @@ Build () lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log mv binary*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso - mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list + mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.packages if [ "${ARCHITECTURE}" != "powerpc" ] @@ -206,7 +206,7 @@ Build () lb binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img - mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list + mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.packages fi @@ -219,7 +219,7 @@ Build () lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.log mv binary-net.tar.gz debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz - mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list + mv binary.contents debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.packages mv binary/*/filesystem.squashfs debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.squashfs diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums index b5ba6b957..d86b55d64 100755 --- a/scripts/build/lb_binary_checksums +++ b/scripts/build/lb_binary_checksums @@ -79,7 +79,7 @@ done # File list cd binary -find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list +find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.contents cd "${OLDPWD}" # Creating stage file diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index e61c14b7f..417ce4f04 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -99,7 +99,7 @@ do rm -f binary*.img rm -f binary*.tar.gz rm -f binary.sh - rm -f binary.list binary.packages md5sum.txt + rm -f binary.contents binary.packages md5sum.txt rm -rf binary rm -rf tftpboot |