diff --git a/VERSION b/VERSION index fcdc2fc..80d09e5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~b4-1 +3.0~b5-1 diff --git a/bin/lb b/bin/lb index 00868b5..d79a62c 100755 --- a/bin/lb +++ b/bin/lb @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/bin/live-build b/bin/live-build index d7eb28f..bd5d560 100755 --- a/bin/live-build +++ b/bin/live-build @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/debian/changelog b/debian/changelog index ee54bbf..fc02ae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +live-build (3.0~b5-1) unstable; urgency=low + + * Omitting binary manifest creation when chroot filesystem is set to + none. + * Omitting memtest in binary if chroot filesystem is set to none. + * Removing redundant check for linux-images in binary_linux-image. + * Correcting glitch with plain chroot filesystems in binary_chroot. + * Switching order of kernel flavours in defaults, the last added one in + the list becomes the default symlink target in the rootfs by apt. + * Using .cfg suffix for consistency with debian-installer on preseed + files in config/preseed. + * Adding sample gitignore file in examples. + * Setting debian-installer to false in all modes by default. + * Updating year in all copyright notices. + * Updating removal of backup files in stripped example hook to also work + with spaces in filenames. + * Don't fail when adding symlinks for firmware in binary/firmware for + debian-installer and the symlink already exists (Closes: #696688). + * Defaulting to obsolete md5 for checksums instead of sha256 on debian, + as debians cdrom-check in d-i only supports md5. + * Defaulting to obsolete filenames for checksums on debian, as debians + cdrom-check in d-i only supports legacy filenames (Closes: #697082). + * Correcting spelling typo in help text within the binary checksums + file. + * Also ignoring legacy checksum filenames when creating checksum files. + * Creating autorun.inf in binary_win32-loader. + * Dropping stable and unstable dist symlinks for d-i in dists for + wheezy. + * Creating install.bat for loadlin. + * Only including gtk d-i in win32-loader config if available on the + target image. + * Updating win32-loader.ini for wheezy. + * Correcting legacy filename for checksum files. + * Removing all checksum files in lb clean. + * Adding support for sha512 checksums. + * Dropping pre-squeeze handling for win32-loader files. + + -- Daniel Baumann Wed, 02 Jan 2013 11:45:30 +0100 + live-build (3.0~b4-1) unstable; urgency=low [ Daniel Baumann ] diff --git a/debian/copyright b/debian/copyright index 0c57bbe..80a0c28 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Source: http://live.debian.net/archive/packages/live-build/ Files: * -Copyright: 2006-2012 Daniel Baumann +Copyright: 2006-2013 Daniel Baumann License: GPL-3+ Files: contrib/grub-splash/lenny @@ -12,7 +12,7 @@ License: other Files: share/bootloaders/*/splash.svg.in -Copyright: 2006-2012 Daniel Baumann +Copyright: 2006-2013 Daniel Baumann License: other License: GPL-3+ diff --git a/examples/gitignore b/examples/gitignore new file mode 100644 index 0000000..dbf1c23 --- /dev/null +++ b/examples/gitignore @@ -0,0 +1,29 @@ +binary/ +binary*.iso +binary*.img +binary*.tar* +binary*.contents +binary*.packages +binary*.zsync + +.build/ +build.log + +cache/ + +chroot/ +chroot.packages.* + +config/binary +config/bootstrap +config/chroot +config/common +config/source + +source/ +source*.iso +source*.img +source*.tar* +source*.contents +source*.packages +source*.zsync diff --git a/examples/hooks/minimal.chroot b/examples/hooks/minimal.chroot index 70af0dd..5a9a8d6 100755 --- a/examples/hooks/minimal.chroot +++ b/examples/hooks/minimal.chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/examples/hooks/stripped.chroot b/examples/hooks/stripped.chroot index fe3f6ca..9ebe5bc 100755 --- a/examples/hooks/stripped.chroot +++ b/examples/hooks/stripped.chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -31,7 +31,7 @@ apt-get autoremove --yes || true # Removing unused files -find . -name *~ | xargs rm -f +find . -name *~ -print0 | xargs -0 rm -f rm -rf /usr/include/* #rm -rf /usr/share/groff/* diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi index f2750fb..ebf5541 100755 --- a/frontends/cgi/live-build-cgi +++ b/frontends/cgi/live-build-cgi @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron index 1d21f8f..4ce9a9c 100755 --- a/frontends/cgi/live-build-cgi.cron +++ b/frontends/cgi/live-build-cgi.cron @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/aliases.sh b/functions/aliases.sh index c2bd147..e6eeccf 100755 --- a/functions/aliases.sh +++ b/functions/aliases.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/architectures.sh b/functions/architectures.sh index 76eb88e..474db39 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/arguments.sh b/functions/arguments.sh index 4da88b8..04feade 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh index 28ad581..cab07b0 100755 --- a/functions/breakpoints.sh +++ b/functions/breakpoints.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/cache.sh b/functions/cache.sh index ecad720..0fa93d5 100755 --- a/functions/cache.sh +++ b/functions/cache.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/chroot.sh b/functions/chroot.sh index d8cd175..c166fdd 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/color.sh b/functions/color.sh index 2020c4a..05f877b 100755 --- a/functions/color.sh +++ b/functions/color.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/common.sh b/functions/common.sh index 9284ec5..bb405df 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/conffile.sh b/functions/conffile.sh index 4674006..e2449f9 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/cursor.sh b/functions/cursor.sh index 5a17a50..a6851eb 100755 --- a/functions/cursor.sh +++ b/functions/cursor.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/defaults.sh b/functions/defaults.sh index 479dfb1..4eaed04 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -707,11 +707,11 @@ *) case "${LB_PARENT_DISTRIBUTION}" in squeeze) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686 486}" ;; *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae 486}" ;; esac ;; @@ -743,7 +743,7 @@ ;; *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc64 powerpc}" ;; esac ;; @@ -875,7 +875,15 @@ fi # Setting checksums - LB_CHECKSUMS="${LB_CHECKSUMS:-sha256}" + case "${LB_MODE}" in + progress-linux) + LB_CHECKSUMS="${LB_CHECKSUMS:-sha256}" + ;; + + *) + LB_CHECKSUMS="${LB_CHECKSUMS:-md5}" + ;; + esac # Setting compression LB_COMPRESSION="${LB_COMPRESSION:-none}" @@ -889,15 +897,7 @@ LB_BUILD_WITH_TMPFS="${LB_BUILD_WITH_TMPFS:-false}" # Setting debian-installer option - case "${LB_MODE}" in - progress-linux) - LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-live}" - ;; - - *) - LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}" - ;; - esac + LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}" LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}" diff --git a/functions/echo.sh b/functions/echo.sh index 8ce5d71..8f08d55 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/exit.sh b/functions/exit.sh index a8e99bb..bde8a2a 100755 --- a/functions/exit.sh +++ b/functions/exit.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/help.sh b/functions/help.sh index bae08b3..1efd12a 100755 --- a/functions/help.sh +++ b/functions/help.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/lockfile.sh b/functions/lockfile.sh index fa29baa..69b56ee 100755 --- a/functions/lockfile.sh +++ b/functions/lockfile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/losetup.sh b/functions/losetup.sh index b62cc16..48c7542 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/man.sh b/functions/man.sh index 03f2052..15a357c 100755 --- a/functions/man.sh +++ b/functions/man.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/packagelists.sh b/functions/packagelists.sh index aad1ea2..0294aea 100755 --- a/functions/packagelists.sh +++ b/functions/packagelists.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/packages.sh b/functions/packages.sh index 4e562b8..b4603a9 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/releases.sh b/functions/releases.sh index 195353c..d9ac4b8 100755 --- a/functions/releases.sh +++ b/functions/releases.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/stagefile.sh b/functions/stagefile.sh index 7d6aa6b..0ef3dcd 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/templates.sh b/functions/templates.sh index d6a54d0..c86b87d 100755 --- a/functions/templates.sh +++ b/functions/templates.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/usage.sh b/functions/usage.sh index 789e795..7a0d127 100755 --- a/functions/usage.sh +++ b/functions/usage.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/wrapper.sh b/functions/wrapper.sh index e760dcd..e6ed88d 100755 --- a/functions/wrapper.sh +++ b/functions/wrapper.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1 index 65751b4..23a5b3e 100644 --- a/manpages/de/lb.de.1 +++ b/manpages/de/lb.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb\fP \- wrapper for live\-build programs diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1 index 8cdd063..73a33b0 100644 --- a/manpages/de/lb_binary.de.1 +++ b/manpages/de/lb_binary.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb binary\fP \- Complete the binary stage diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1 index 019af2b..cda5d03 100644 --- a/manpages/de/lb_bootstrap.de.1 +++ b/manpages/de/lb_bootstrap.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb bootstrap\fP \- Complete the bootstrap stage diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1 index e173842..c6322ad 100644 --- a/manpages/de/lb_build.de.1 +++ b/manpages/de/lb_build.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1 index 04122d9..f5f9920 100644 --- a/manpages/de/lb_chroot.de.1 +++ b/manpages/de/lb_chroot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb chroot\fP \- Complete the chroot stage diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1 index 6827706..0e11ee3 100644 --- a/manpages/de/lb_clean.de.1 +++ b/manpages/de/lb_clean.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb clean\fP \- Clean build directory diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 66f017b..47ba536 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb config\fP \- Create config directory diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1 index e573b72..756c601 100644 --- a/manpages/de/lb_source.de.1 +++ b/manpages/de/lb_source.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb source\fP \- Complete the source stage diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1 index daafb6e..7fb2a0c 100644 --- a/manpages/de/lb_testroot.de.1 +++ b/manpages/de/lb_testroot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlb testroot\fP \- Ensure that a system is built as root diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7 index a2a8e71..0b3ccf3 100644 --- a/manpages/de/live-build.de.7 +++ b/manpages/de/live-build.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 2012\-12\-23 3.0~b4\-1 "Debian Live Project" +.TH LIVE\-BUILD 7 2013\-01\-02 3.0~b5\-1 "Debian Live Project" .SH NAME \fBlive\-build\fP \- the Debian Live tool suite diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index e8ae8ba..cb10dce 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb\fR \- wrapper for live\-build programs diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index 21017f0..9a416ac 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb binary\fR \- Complete the binary stage diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index 0413ed4..b93555a 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb bootstrap\fR \- Complete the bootstrap stage diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index 08405b1..e7357af 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index 2a105dd..c701314 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb chroot\fR \- Complete the chroot stage diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index bbeb4da..f6dd623 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index fab6b16..2c20343 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb config\fR \- Create config directory diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 622a0df..b5154be 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1 index fcce080..8bd62dc 100644 --- a/manpages/en/lb_testroot.1 +++ b/manpages/en/lb_testroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlb testroot\fR \- Ensure that a system is built as root diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 344dea3..e4669dc 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2012\-12\-23 3.0~b4-1 "Debian Live Project" +.TH LIVE\-BUILD 7 2013\-01\-02 3.0~b5-1 "Debian Live Project" .SH NAME \fBlive\-build\fR \- the Debian Live tool suite diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po index ece9725..39d4510 100644 --- a/manpages/po/de/lb.1.po +++ b/manpages/po/de/lb.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po index d03253f..9c27e3b 100644 --- a/manpages/po/de/lb_binary.1.po +++ b/manpages/po/de/lb_binary.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po index 4f8e062..4ef2000 100644 --- a/manpages/po/de/lb_bootstrap.1.po +++ b/manpages/po/de/lb_bootstrap.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po index 9e12e06..35dfbd5 100644 --- a/manpages/po/de/lb_build.1.po +++ b/manpages/po/de/lb_build.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po index 595c6f9..5dbdd3b 100644 --- a/manpages/po/de/lb_chroot.1.po +++ b/manpages/po/de/lb_chroot.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po index d5fa109..b097f15 100644 --- a/manpages/po/de/lb_clean.1.po +++ b/manpages/po/de/lb_clean.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,7 +28,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +36,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index 719996d..6aeb7c2 100644 --- a/manpages/po/de/lb_config.1.po +++ b/manpages/po/de/lb_config.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,7 +28,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +36,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po index 27bcbde..d8cb42d 100644 --- a/manpages/po/de/lb_source.1.po +++ b/manpages/po/de/lb_source.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po index 1d61421..c8c7ef7 100644 --- a/manpages/po/de/lb_testroot.1.po +++ b/manpages/po/de/lb_testroot.1.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,15 +28,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po index 7bf4313..146da7c 100644 --- a/manpages/po/de/live-build.7.po +++ b/manpages/po/de/live-build.7.po @@ -1,18 +1,17 @@ -# German translations for live-build package -# Copyright (C) 2012 Free Software Foundation, Inc. +# German translations for live-build +# Copyright (C) 2006-2012 Daniel Baumann # This file is distributed under the same license as the live-build package. -# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" -"PO-Revision-Date: 2012-08-02 18:55+0300\n" -"Last-Translator: Automatically generated\n" +"Project-Id-Version: live-build 3.0~b5-1\n" +"POT-Creation-Date: 2012-12-30 15:52+0100\n" +"PO-Revision-Date: 2010-05-24 09:59+0300\n" +"Last-Translator: Daniel Baumann \n" "Language-Team: none\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,7 +28,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +36,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index 44db8b3..a4116d7 100644 --- a/manpages/pot/lb.1.pot +++ b/manpages/pot/lb.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index 3d5f35f..f1440a1 100644 --- a/manpages/pot/lb_binary.1.pot +++ b/manpages/pot/lb_binary.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index 3be11df..823cdc9 100644 --- a/manpages/pot/lb_bootstrap.1.pot +++ b/manpages/pot/lb_bootstrap.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index 026c503..825a8fc 100644 --- a/manpages/pot/lb_build.1.pot +++ b/manpages/pot/lb_build.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index dd1c97a..b946749 100644 --- a/manpages/pot/lb_chroot.1.pot +++ b/manpages/pot/lb_chroot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index 2b9981e..b558244 100644 --- a/manpages/pot/lb_clean.1.pot +++ b/manpages/pot/lb_clean.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index aa31883..a3736bf 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index 6f5dd86..f7ac89c 100644 --- a/manpages/pot/lb_source.1.pot +++ b/manpages/pot/lb_source.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot index 0b4903e..0473a8b 100644 --- a/manpages/pot/lb_testroot.1.pot +++ b/manpages/pot/lb_testroot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/lb_testroot.1:1 en/live-build.7:1 -#, no-wrap -msgid "3.0~b4-1" +msgid "2013-01-02" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/lb_testroot.1:1 en/live-build.7:1 +#, no-wrap +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index f3219f2..a7eb257 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-23 10:50+0100\n" +"POT-Creation-Date: 2013-01-02 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-23" +msgid "2013-01-02" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "3.0~b4-1" +msgid "3.0~b5-1" msgstr "" #. type: TH diff --git a/scripts/build/binary b/scripts/build/binary index 5098e42..8b218c4 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums index 244ee14..a19f162 100755 --- a/scripts/build/binary_checksums +++ b/scripts/build/binary_checksums @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -43,7 +43,15 @@ for CHECKSUM in ${LB_CHECKSUMS} do - CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS" + case "${LB_MODE}" in + progress-linux) + CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS" + ;; + + *) + CHECKSUMS="${CHECKSUM}sum.txt" + ;; + esac Echo_message "Begin creating binary ${CHECKSUMS}..." @@ -60,10 +68,11 @@ \! -path './boot/boot.bin' \ \! -path './boot/grub/stage2_eltorito' \ \! -path './*SUMS' \ + \! -path './*sum.txt' \ -print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS} cat > ${CHECKSUMS} << EOF -## This file contains the list of ${CHECKSUM} checksums of all fileson this +## This file contains the list of ${CHECKSUM} checksums of all files on this ## medium. ## ## You can verify them automatically with the 'verify-checksums' boot parameter, diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot index 598fff5..87986c0 100755 --- a/scripts/build/binary_chroot +++ b/scripts/build/binary_chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -85,7 +85,7 @@ ${LB_ROOT_COMMAND} rm -rf chroot.tmp # Copying new chroot -if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ] +if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ] then ${LB_ROOT_COMMAND} mv chroot chroot.tmp ${LB_ROOT_COMMAND} cp -a cache/bootstrap chroot diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 146c767..78e7f5a 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -632,7 +632,7 @@ do for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb") do - ln -s ${_FILE} ./ + ln -sf ${_FILE} ./ done done @@ -813,7 +813,16 @@ rm -f chroot/binary.sh mv chroot/root/binary ./ - DISTRIBUTIONS="stable testing unstable" + case "${LB_PARENT_DISTRIBUTION}" in + wheezy) + DISTRIBUTIONS="testing" + ;; + + *) + + DISTRIBUTIONS="stable testing unstable" + ;; + esac if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] then diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 8b7a43c..105f359 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub index cef3da7..96e3175 100755 --- a/scripts/build/binary_grub +++ b/scripts/build/binary_grub @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2 index 1b77523..85e3c83 100755 --- a/scripts/build/binary_grub2 +++ b/scripts/build/binary_grub2 @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 4dd515f..a7e13d4 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks index 8015e7b..c3ff6ba 100755 --- a/scripts/build/binary_hooks +++ b/scripts/build/binary_hooks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes index f1f345a..405b59f 100755 --- a/scripts/build/binary_includes +++ b/scripts/build/binary_includes @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 7802f04..eb5b505 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index f01ed85..d1e6ba0 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -73,11 +73,8 @@ mkdir -p "${DESTDIR}" # Installing linux-image -if [ "${LB_LINUX_PACKAGES}" != "none" ] -then - cp chroot/boot/"${LINUX}"-* "${DESTDIR}" - cp chroot/boot/initrd.img-* "${DESTDIR}" -fi +cp chroot/boot/"${LINUX}"-* "${DESTDIR}" +cp chroot/boot/initrd.img-* "${DESTDIR}" case "${LB_INITRAMFS}" in live-boot) diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index 1e6a10e..dc665ac 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -72,6 +72,13 @@ gunzip -c /usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe gunzip -c /usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt fi + + echo "\tools\loadlin.exe vmlinuz initrd=initrd.gz" > binary/install/install.bat + + if [ -e binary/install/gtk ] + then + echo "\tools\loadlin.exe \install.386\vmlinuz initrd=initrd.gz vga=788" > binary/install/gtk/install.bat + fi ;; *) diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest index 420d6b4..dfe3ab8 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -23,6 +23,11 @@ # Reading configuration files Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults + +if [ "${LB_CHROOT_FILESYSTEM}" = "none" ] +then + exit 0 +fi Echo_message "Begin creating manifest..." diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 826a12e..1ab2266 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -24,7 +24,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] +if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ] then exit 0 fi diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot index 08cc9d3..23d2875 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index ce459ab..31b1e73 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index df70d60..fa1dae9 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo index 8e833d1..85e78d5 100755 --- a/scripts/build/binary_silo +++ b/scripts/build/binary_silo @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 7f1bf86..4b0fe18 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar index 9b9b3de..5d2a3a6 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 4789398..267abcb 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -63,28 +63,43 @@ fi mv binary/win32-loader.exe binary/setup.exe + mv binary/win32-loader/g2ldr* binary + rmdir binary/win32-loader > /dev/null 2>&1 || true if [ -e binary/win32-loader-standalone.exe ] then + # squeeze mv binary/win32-loader-standalone.exe binary/setup-standalone.exe fi - if ls binary/win32-loader/g2ldr* > /dev/null 2>&1 - then - mv binary/win32-loader/g2ldr* binary - rmdir binary/win32-loader > /dev/null 2>&1 || true - fi +cat >> binary/autorun.inf << EOF +[autorun] +open=setup.exe +EOF if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then cat > binary/win32-loader.ini << EOF [installer] +kernel=linux arch=${LB_ARCHITECTURES} +default_desktop=gnome i386/linux=install/vmlinuz i386/initrd=install/initrd.gz +EOF + + if [ -e install/gtk ] + then + +cat >> binary/win32-loader.ini << EOF i386/gtk/linux=install/vmlinuz i386/gtk/initrd=install/gtk/initrd.gz +EOF + + fi + +cat >> binary/win32-loader.ini << EOF [grub] g2ldr=g2ldr diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot index 8fc5a64..5e916a9 100755 --- a/scripts/build/binary_yaboot +++ b/scripts/build/binary_yaboot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync index f43fe8a..2e6b1cf 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 9d96400..ba4f103 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache index 6b0f582..7eae975 100755 --- a/scripts/build/bootstrap_cache +++ b/scripts/build/bootstrap_cache @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 1c778e3..f799b94 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 7be2437..8f8e59e 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/build b/scripts/build/build index d7b989d..bc86b62 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot b/scripts/build/chroot index 1c63482..64c3d90 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 3b12049..01e460e 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 99433cf..5b5a907 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache index 4c4b055..16ff492 100755 --- a/scripts/build/chroot_cache +++ b/scripts/build/chroot_cache @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot index 7e07b36..d2a6599 100755 --- a/scripts/build/chroot_debianchroot +++ b/scripts/build/chroot_debianchroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index 428927f..2f8aa4b 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg index 9698f79..c67d8eb 100755 --- a/scripts/build/chroot_dpkg +++ b/scripts/build/chroot_dpkg @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index 5a94948..7196bce 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks index 7f11c96..dc9c18c 100755 --- a/scripts/build/chroot_hooks +++ b/scripts/build/chroot_hooks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname index 9f56901..432d60e 100755 --- a/scripts/build/chroot_hostname +++ b/scripts/build/chroot_hostname @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts index 3adaebf..6e44cf8 100755 --- a/scripts/build/chroot_hosts +++ b/scripts/build/chroot_hosts @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes index 8d3c75e..ccd12b3 100755 --- a/scripts/build/chroot_includes +++ b/scripts/build/chroot_includes @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages index d7d9164..2e02706 100755 --- a/scripts/build/chroot_install-packages +++ b/scripts/build/chroot_install-packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive index 31a34fc..422ac50 100755 --- a/scripts/build/chroot_interactive +++ b/scripts/build/chroot_interactive @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image index 10b3fd9..58c15fd 100755 --- a/scripts/build/chroot_linux-image +++ b/scripts/build/chroot_linux-image @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages index 5ef36cb..dff8116 100755 --- a/scripts/build/chroot_live-packages +++ b/scripts/build/chroot_live-packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index 8a7f2e7..c06c116 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed index 1a70340..77e94c9 100755 --- a/scripts/build/chroot_preseed +++ b/scripts/build/chroot_preseed @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -38,8 +38,8 @@ # Creating lock file Create_lockfile .lock -if ls config/preseed/*.preseed > /dev/null 2>&1 || \ - ls config/preseed/*.preseed.chroot > /dev/null 2>&1 || \ +if ls config/preseed/*.cfg > /dev/null 2>&1 || \ + ls config/preseed/*.cfg.chroot > /dev/null 2>&1 || \ ls chroot/root/packages.chroot.cfg > /dev/null 2>&1 then # Check dependency @@ -48,7 +48,7 @@ # Install dependency Install_package - for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot chroot/root/packages.chroot.cfg + for PRESEED in config/preseed/*.cfg config/preseed/*.cfg.chroot chroot/root/packages.chroot.cfg do if [ -e "${PRESEED}" ] then diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc index 2c13fce..96437e5 100755 --- a/scripts/build/chroot_proc +++ b/scripts/build/chroot_proc @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv index 42ba071..5d4f780 100755 --- a/scripts/build/chroot_resolv +++ b/scripts/build/chroot_resolv @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 20e30fb..223d1ac 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs index 4097284..9ae8909 100755 --- a/scripts/build/chroot_sysfs +++ b/scripts/build/chroot_sysfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc index 4e1fc16..ed78bdb 100755 --- a/scripts/build/chroot_sysv-rc +++ b/scripts/build/chroot_sysv-rc @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_tmpfs b/scripts/build/chroot_tmpfs index 80311f5..009f8c9 100755 --- a/scripts/build/chroot_tmpfs +++ b/scripts/build/chroot_tmpfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart index fd7c72f..1ab64f4 100755 --- a/scripts/build/chroot_upstart +++ b/scripts/build/chroot_upstart @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/clean b/scripts/build/clean index 23667c0..07e3be5 100755 --- a/scripts/build/clean +++ b/scripts/build/clean @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -102,7 +102,9 @@ rm -f binary*.tar.gz rm -f binary*.zsync* rm -f binary.sh - rm -f binary.contents binary.packages md5sum.txt + rm -f binary.contents binary.packages + rm -f MD5SUMS SHA1SUMS SHA256SUMS SHA512SUMS + rm -f md5sum.txt sha1sum.txt sha256sum.txt sha512sum.txt rm -rf binary rm -rf tftpboot diff --git a/scripts/build/config b/scripts/build/config index 4edb7cd..b08e2e4 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -38,7 +38,7 @@ \t [--cache-indices true|false]\n\ \t [--cache-packages true|false]\n\ \t [--cache-stages STAGE|\"STAGES\"]\n\ -\t [--checksums md5|sha1|sha256|none]\n\ +\t [--checksums md5|sha1|sha256|sha512|none]\n\ \t [--compression bzip2|gzip|lzip|xz|none]\n\ \t [--config GIT_URL::GIT_BRANCH]\n\ \t [--zsync true|false]\n\ diff --git a/scripts/build/source b/scripts/build/source index b200deb..0dc9780 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums index dac7976..2923a6e 100755 --- a/scripts/build/source_checksums +++ b/scripts/build/source_checksums @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -50,7 +50,15 @@ for CHECKSUM in ${LB_CHECKSUMS} do - CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS" + case "${LB_MODE}" in + progress-linux) + CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS" + ;; + + *) + CHECKSUMS="${CHECKSUM}sum.txt" + ;; + esac Echo_message "Begin creating source ${CHECKSUMS}..." @@ -64,6 +72,7 @@ cd ${DIRECTORY} find . -type f \ \! -path './*SUMS' \ + \! -path './*sum.txt' \ -print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS} cat > ${CHECKSUMS} << EOF diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 502bd82..a8c0fb8 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live index 868d9d9..d71b69f 100755 --- a/scripts/build/source_debian-live +++ b/scripts/build/source_debian-live @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_disk b/scripts/build/source_disk index caca200..2cd868e 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 0d76407..59c66b4 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_iso b/scripts/build/source_iso index 81b4f5c..e4981ea 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/source_tar b/scripts/build/source_tar index 0ef302e..5073c0f 100755 --- a/scripts/build/source_tar +++ b/scripts/build/source_tar @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/testroot b/scripts/build/testroot index 9ded104..9c63b79 100755 --- a/scripts/build/testroot +++ b/scripts/build/testroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build.sh b/scripts/build.sh index e6f8361..78d3d1a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/share/bin/Packages b/share/bin/Packages index a839e9a..83c7e93 100755 --- a/share/bin/Packages +++ b/share/bin/Packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann +## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it