diffstat for live-build-20190311 live-build-20190311kali1 debian/changelog | 293 +++++++++++++++++++++++++++++++ debian/live-build.links | 3 functions/defaults.sh | 20 +- functions/echo.sh | 2 scripts/build/binary_disk | 10 - scripts/build/binary_iso | 4 scripts/build/binary_package-lists | 6 scripts/build/binary_syslinux | 4 scripts/build/bootstrap_archives | 26 +- scripts/build/bootstrap_debootstrap | 13 - scripts/build/build | 2 scripts/build/chroot_apt | 4 scripts/build/chroot_archives | 52 ++--- scripts/build/chroot_firmware | 16 - scripts/build/config | 55 +++++ scripts/build/installer_debian-installer | 36 +-- scripts/build/source_debian | 6 scripts/build/source_disk | 4 18 files changed, 450 insertions(+), 106 deletions(-) diff -Nru live-build-20190311/debian/changelog live-build-20190311kali1/debian/changelog --- live-build-20190311/debian/changelog 2019-03-11 10:08:38.000000000 +0000 +++ live-build-20190311kali1/debian/changelog 2019-03-19 08:59:27.000000000 +0000 @@ -1,3 +1,12 @@ +live-build (1:20190311kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + - Implement use of different distributions for build and runtime + usage. + + -- Sophie Brun Tue, 19 Mar 2019 09:59:27 +0100 + live-build (1:20190311) unstable; urgency=medium [ Hideki Yamane ] @@ -9,6 +18,15 @@ -- Luca Boccassi Mon, 11 Mar 2019 10:08:38 +0000 +live-build (1:20180925kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + - Implement use of different distributions for build and runtime + usage. + + -- Sophie Brun Tue, 09 Oct 2018 11:51:17 +0200 + live-build (1:20180925) unstable; urgency=medium [ Raphaël Hertzog ] @@ -30,6 +48,15 @@ -- Luca Boccassi Tue, 25 Sep 2018 14:28:19 +0100 +live-build (1:20180618kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + - Implement use of different distributions for build and runtime + usage. + + -- Sophie Brun Tue, 26 Jun 2018 12:12:12 +0200 + live-build (1:20180618) unstable; urgency=medium * ONIE: make lb clean remove the ONIE binary. @@ -43,6 +70,15 @@ -- Luca Boccassi Mon, 18 Jun 2018 12:02:55 +0100 +live-build (1:20180411kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + - Implement use of different distributions for build and runtime + usage. + + -- Sophie Brun Thu, 17 May 2018 16:19:37 +0200 + live-build (1:20180411) unstable; urgency=medium * ONIE: Check_package in the host, not the chroot @@ -93,6 +129,21 @@ -- Luca Boccassi Wed, 28 Mar 2018 20:20:46 +0100 +live-build (1:20171207kali2) kali-dev; urgency=medium + + * Add back Kali codename symlinks in data/debian-cd/. + * Implement use of different distributions for build and runtime + usage. Closes: #888507 + + -- Raphaël Hertzog Fri, 26 Jan 2018 17:13:34 +0100 + +live-build (1:20171207kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + + -- Sophie Brun Thu, 14 Dec 2017 16:31:12 +0100 + live-build (1:20171207) unstable; urgency=medium * Use $SOURCE_DATE_EPOCH when updating timestamps of manual pages in order @@ -105,6 +156,13 @@ -- Raphaël Hertzog Thu, 07 Dec 2017 20:29:59 +0100 +live-build (1:20170920kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + + -- Sophie Brun Tue, 26 Sep 2017 13:58:07 +0200 + live-build (1:20170920) unstable; urgency=medium * Auto-update version strings in manual pages. @@ -122,6 +180,19 @@ -- Raphaël Hertzog Wed, 20 Sep 2017 10:01:42 +0200 +live-build (1:20170829kali2) kali-dev; urgency=medium + + * Replace "kirkwood" and "orion5x" armel flavors with "marvell". + + -- Raphaël Hertzog Mon, 18 Sep 2017 17:33:20 +0200 + +live-build (1:20170829kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + + -- Raphaël Hertzog Tue, 29 Aug 2017 14:21:18 +0200 + live-build (1:20170829) unstable; urgency=medium * Add .disk/mkisofs file recording the xorriso command line. Thanks @@ -134,6 +205,13 @@ -- Raphaël Hertzog Tue, 29 Aug 2017 14:16:49 +0200 +live-build (1:20170807kali1) kali-dev; urgency=medium + + * Synchronize with Debian. Remaining changes: + - XORRISO options for EFI boot + + -- Sophie Brun Fri, 18 Aug 2017 09:47:28 +0200 + live-build (1:20170807) unstable; urgency=medium * Add keyboard shortcut on the "Advanced options" syslinux menu entry. @@ -146,6 +224,13 @@ -- Raphaël Hertzog Mon, 07 Aug 2017 17:29:04 +0200 +live-build (1:20170213kali1) kali-dev; urgency=medium + + * Change xorriso options for EFI boot to be compatible with what + we used to do before. + + -- Raphaël Hertzog Thu, 09 Mar 2017 18:48:46 +0100 + live-build (1:20170213) unstable; urgency=medium * Drop the versatile kernel flavour on armel. It's no longer built since @@ -220,6 +305,38 @@ -- Raphaël Hertzog Fri, 02 Dec 2016 23:33:45 +0100 +live-build (1:20151215kali4) kali-dev; urgency=medium + + * Fix chroot_archives script to not use gpg since it GnuPG 2.x broke + it and we have an easy way out by using APT's trusted=yes repository + attribute. + + -- Raphaël Hertzog Fri, 28 Oct 2016 09:32:19 +0200 + +live-build (1:20151215kali3) kali-dev; urgency=medium + + * Fix up binary_efi script for change to Check_package expected parameters. + + -- Raphaël Hertzog Wed, 20 Jan 2016 17:32:53 +0100 + +live-build (1:20151215kali2) kali-dev; urgency=medium + + * Fix up binary_efi script for new LB_BOOTLOADERS variable. + + -- Raphaël Hertzog Tue, 19 Jan 2016 12:37:36 +0100 + +live-build (1:20151215kali1) kali-dev; urgency=medium + + * Import new version from Debian. + * Dropped Skip-comments-in-package-lists.patch, merged upstream. + * Manually apply the remaining patches (due to switch from "3.0 (quilt)" + to "3.0 (native)"): + - Add-support-for-EFI-boot-with-syslinux-efi.patch + - Better-handle-empty-package-lists.patch (committed upstream) + - Drop-ixp4xx-from-available-armel-flavors.patch (committed upstream) + + -- Raphaël Hertzog Tue, 05 Jan 2016 18:22:29 +0100 + live-build (1:20151215) unstable; urgency=medium * QA Upload. @@ -260,6 +377,41 @@ -- Daniel Baumann Fri, 20 Nov 2015 13:04:24 +0100 +live-build (5.0~a11-1kali4) kali-dev; urgency=medium + + * Add libmenu.c32/libgpl.c32 to the required syslinux files. + + -- Raphaël Hertzog Fri, 13 Nov 2015 09:40:17 +0100 + +live-build (5.0~a11-1kali3) kali-dev; urgency=medium + + * Drop ixp4xx flavour on armel as it's gone from Debian/Kali. + + -- Raphaël Hertzog Tue, 10 Nov 2015 09:35:51 +0100 + +live-build (5.0~a11-1kali2) kali-dev; urgency=medium + + * Add data/debian-cd/ symlinks for sana via debian/live-build.links. + * Use "sid" as target for the symlinks as this distribution always exists. + + -- Raphaël Hertzog Mon, 09 Nov 2015 17:16:18 +0100 + +live-build (5.0~a11-1kali1) kali-dev; urgency=medium + + * Import new version from debian + * Drop the patches Drop-the-ixp4xx-flavour-on-armel-as-Kali-does-not-ha.patch + as it's not needed anymore with new kernel version + * Drop patches Do-not-pass-the-version-to-apt-ftprelease-when-we-do.patch + Use-linux-image-586-instead-of-linux-image-486-for-k.patch and + Drop-elilo-from-list-of-d-i-required-packages-on-i38.patch: + now included in debian + * Drop the patch Add-versions-for-Kali-releases.patch: fixed in debian (bug + 790860) + * Remaining changes compared to debian: three patches including one for + supporting EFI boot + + -- Sophie Brun Wed, 09 Sep 2015 11:20:20 +0200 + live-build (5.0~a11-1) unstable; urgency=low [ Daniel Baumann ] @@ -463,6 +615,56 @@ -- Daniel Baumann Wed, 10 Dec 2014 08:39:14 +0100 +live-build (4.0.4-1kali7) kali-dev; urgency=medium + + * Do not try to include elilo, it's gone from Debian Testing. + + -- Raphaël Hertzog Wed, 15 Jul 2015 12:16:00 +0200 + +live-build (4.0.4-1kali6) kali-dev; urgency=medium + + * Make sure apt-ftparchive does not fail due to #693092. + * Add versions for Kali releases. + + -- Raphaël Hertzog Wed, 24 Jun 2015 17:47:29 +0200 + +live-build (4.0.4-1kali5) kali-dev; urgency=medium + + * Add symlinks for moto/sana/kali-current in data/debian-cd/. + + -- Raphaël Hertzog Wed, 24 Jun 2015 16:06:05 +0200 + +live-build (4.0.4-1kali4) kali-dev; urgency=medium + + * Update d-i setup code to use linux-image-586 instead of linux-image-486 + for newer versions of Kali. + + -- Raphaël Hertzog Thu, 18 Jun 2015 10:42:53 +0200 + +live-build (4.0.4-1kali3) kali-dev; urgency=medium + + * Fix EFI patch to properly include syslinux "libraries" which + are now in a separate path from syslinux.efi. + + -- Raphaël Hertzog Tue, 03 Feb 2015 15:44:04 +0100 + +live-build (4.0.4-1kali2) kali-dev; urgency=medium + + * Better handle empty package lists (second try). + * Fix EFI patch to use again LB_ARCHITECTURES instead of + LIVE_IMAGE_ARCHITECTURE. + + -- Raphaël Hertzog Wed, 10 Dec 2014 16:03:17 +0100 + +live-build (4.0.4-1kali1) kali-dev; urgency=medium + + * Update on top of live-build 4.0.4-1. Remaining changes: + - skip comments in package list + - EFI support + - disable ixp4xx flavour on armel + + -- Raphaël Hertzog Wed, 10 Dec 2014 09:14:54 +0100 + live-build (4.0.4-1) unstable; urgency=low [ Daniel Baumann ] @@ -511,6 +713,30 @@ -- Daniel Baumann Wed, 10 Dec 2014 08:23:55 +0100 +live-build (4.0.3-1kali2) kali-dev; urgency=medium + + [ Sophie Brun ] + * Update EFI patch. + * Fix binary_syslinux to properly detect the presence of the bootloader. + + [ Raphaël Hertzog ] + * Improve package list parsing code in multiple ways: + - fix the #if conditionals + - accept comments in those files + - do not fail on empty package lists + * Make the armel/armhf patch upstreamable. + + -- Sophie Brun Tue, 02 Dec 2014 15:56:49 +0100 + +live-build (4.0.3-1kali1) kali-dev; urgency=medium + + * Import new debian version + * Drop patches add-xfsprogs-jfsutils-to-d-i and + fix-kernel-metapackages-used-in-di-step as it's already in debian version. + * Add a link to kali-rolling + + -- Sophie Brun Thu, 27 Nov 2014 16:00:47 +0100 + live-build (4.0.3-1) unstable; urgency=low [ Richard Nelson ] @@ -1450,6 +1676,67 @@ -- Daniel Baumann Fri, 30 Nov 2012 15:22:32 +0100 +live-build (3.0.5-1kali8) kali; urgency=medium + + * Drop iop32x and ixp4xx flavors on armel. They are gone with Linux 3.14. + + -- Raphaël Hertzog Thu, 31 Jul 2014 09:30:18 +0200 + +live-build (3.0.5-1kali7) kali; urgency=medium + + * Call binary_efi after binary_hooks to include the files after they have + been customized by the binary hooks. + + -- Raphaël Hertzog Mon, 21 Jul 2014 23:20:58 +0200 + +live-build (3.0.5-1kali6) kali; urgency=medium + + * Use the xorriso syntax that doesn't create a GPT but does create + an EFI partition recorded in MBR. This one is know to work on MAC + and on most UEFI implementations (even if the lack of GPT makes + it non-conforming in theory). + + -- Raphaël Hertzog Mon, 21 Jul 2014 16:53:29 +0200 + +live-build (3.0.5-1kali5) kali; urgency=medium + + * Drop -isohybrid-apm-hfsplus as recommended by Thomas Schmitt. + * And add back ldlinux.e64 in the generated EFI image. + + -- Raphaël Hertzog Tue, 08 Jul 2014 14:54:40 +0200 + +live-build (3.0.5-1kali4) kali; urgency=medium + + * Add the /usr/share/live/build/data/debian-cd/kali{,-dev} symlinks that + are currently manually created by Kali's build_all.sh script. + * Add EFI boot support with syslinux 6. Closes: #731709 + + -- Raphaël Hertzog Fri, 28 Mar 2014 17:09:43 +0100 + +live-build (3.0.5-1kali3) kali; urgency=medium + + * Update default kernel flavours for armhf to match what's available with + linux 3.12. + + -- Raphaël Hertzog Wed, 08 Jan 2014 23:08:17 +0100 + +live-build (3.0.5-1kali2) kali; urgency=medium + + * Fix binary_debian-installer step to use linux-image-* metapackages + instead of linux-image-2.6-* which are gone. + + -- Raphaël Hertzog Sat, 21 Dec 2013 13:55:44 +0100 + +live-build (3.0.5-1kali1) kali; urgency=low + + * Ensure xfsprogs and jfsutils are available in the ISO. Otherwise users + opting for XFS and JFS and installing without network won't have them and + the (first) boot can be interrupted due to this. + * Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining + change is the above one. + + -- Raphaël Hertzog Mon, 26 Aug 2013 18:38:06 +0200 + live-build (3.0.5-1) unstable; urgency=low * Skipping loadlin inclusion on netboot images. @@ -1536,6 +1823,12 @@ -- Daniel Baumann Thu, 25 Apr 2013 12:41:54 +0200 +live-build (3.0.1-1+kali1) kali; urgency=low + + * Fix win32-loader. + + -- Raphaël Hertzog Thu, 07 Mar 2013 21:53:48 +0100 + live-build (3.0.1-1) unstable; urgency=low * Removing superfluous menu default directive in installer syslinux diff -Nru live-build-20190311/debian/live-build.links live-build-20190311kali1/debian/live-build.links --- live-build-20190311/debian/live-build.links 1970-01-01 00:00:00.000000000 +0000 +++ live-build-20190311kali1/debian/live-build.links 2019-03-19 08:59:27.000000000 +0000 @@ -0,0 +1,3 @@ +usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-dev +usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-rolling +usr/share/live/build/data/debian-cd/sid usr/share/live/build/data/debian-cd/kali-last-snapshot diff -Nru live-build-20190311/functions/defaults.sh live-build-20190311kali1/functions/defaults.sh --- live-build-20190311/functions/defaults.sh 2019-03-11 10:05:40.000000000 +0000 +++ live-build-20190311kali1/functions/defaults.sh 2019-03-19 08:59:27.000000000 +0000 @@ -128,18 +128,19 @@ LB_DERIVATIVE="false" ;; esac + LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT:-${LB_DISTRIBUTION}}" + LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY:-${LB_DISTRIBUTION_CHROOT}}" + case "${LB_MODE}" in progress-linux) case "${LB_DISTRIBUTION}" in baureo|baureo-backports) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}" - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; cairon|cairon-backports) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}" - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; esac @@ -147,12 +148,17 @@ ;; *) - LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-${LB_DISTRIBUTION}}" - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" - LB_BACKPORTS="${LB_BACKPORTS:-false}" ;; esac + if [ -n "$LB_PARENT_DISTRIBUTION" ]; then + LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT:-${LB_PARENT_DISTRIBUTION}}" + LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY:-${LB_PARENT_DISTRIBUTION}}" + else + LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT:-${LB_DISTRIBUTION_CHROOT}}" + LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY:-${LB_DISTRIBUTION_BINARY}}" + fi + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION_CHROOT}}" # Setting package manager LB_APT="${LB_APT:-apt}" @@ -479,7 +485,7 @@ LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}" # Setting security updates option - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_BINARY}" in sid) LB_SECURITY="${LB_SECURITY:-false}" ;; @@ -490,7 +496,7 @@ esac # Setting updates updates option - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_BINARY}" in sid) LB_UPDATES="${LB_UPDATES:-false}" ;; diff -Nru live-build-20190311/functions/echo.sh live-build-20190311kali1/functions/echo.sh --- live-build-20190311/functions/echo.sh 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/functions/echo.sh 2019-03-19 08:59:27.000000000 +0000 @@ -193,7 +193,7 @@ Echo_breakage () { - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_BINARY}" in sid) Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution." ;; diff -Nru live-build-20190311/scripts/build/binary_disk live-build-20190311kali1/scripts/build/binary_disk --- live-build-20190311/scripts/build/binary_disk 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/binary_disk 2019-03-19 08:59:27.000000000 +0000 @@ -49,8 +49,8 @@ mkdir -p binary/.disk ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" -DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" -DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" +DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 1 | tr '[a-z]' '[A-Z]')" +DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 2-)" if [ -e chroot/etc/os-release ] then @@ -111,7 +111,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include continue fi @@ -136,7 +136,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include continue fi @@ -159,7 +159,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include continue fi diff -Nru live-build-20190311/scripts/build/binary_iso live-build-20190311kali1/scripts/build/binary_iso --- live-build-20190311/scripts/build/binary_iso 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/binary_iso 2019-03-19 08:59:27.000000000 +0000 @@ -157,8 +157,8 @@ grub-efi) if [ -e binary/boot/grub/efi.img ] then - XORRISO_OPTIONS="${XORRISO_OPTIONS} -e boot/grub/efi.img -no-emul-boot" - XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus" + XORRISO_OPTIONS="${XORRISO_OPTIONS} --efi-boot boot/grub/efi.img" + XORRISO_OPTIONS="${XORRISO_OPTIONS} -append_partition 2 0x01 binary/boot/grub/efi.img" else Echo "No EFI boot code to include in the ISO" fi diff -Nru live-build-20190311/scripts/build/binary_package-lists live-build-20190311kali1/scripts/build/binary_package-lists --- live-build-20190311/scripts/build/binary_package-lists 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/binary_package-lists 2019-03-19 08:59:27.000000000 +0000 @@ -141,9 +141,9 @@ SECTION="$(basename ${SECTION})" - mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} - apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages - gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz + mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES} + apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages + gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz done cd "${OLDPWD}" diff -Nru live-build-20190311/scripts/build/binary_syslinux live-build-20190311kali1/scripts/build/binary_syslinux --- live-build-20190311/scripts/build/binary_syslinux 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/binary_syslinux 2019-03-19 08:59:27.000000000 +0000 @@ -204,7 +204,7 @@ _VERSION="${_VERSION:-none}" -_DISTRIBUTION="${LB_DISTRIBUTION}" +_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}" _ARCHITECTURE="${LB_ARCHITECTURES}" _DATE=$(date -R) @@ -242,7 +242,7 @@ -e "s#@APPEND_INSTALL_FAILSAFE@#${LB_BOOTAPPEND_INSTALL_FAILSAFE}#g" \ -e "s|@PROJECT@|${_PROJECT}|g" \ -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \ -e "s|@VERSION@|${_VERSION}|g" \ -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \ -e "s|@DATE@|${_DATE}|g" \ diff -Nru live-build-20190311/scripts/build/bootstrap_archives live-build-20190311kali1/scripts/build/bootstrap_archives --- live-build-20190311/scripts/build/bootstrap_archives 2019-03-11 10:05:40.000000000 +0000 +++ live-build-20190311kali1/scripts/build/bootstrap_archives 2019-03-19 08:59:27.000000000 +0000 @@ -65,19 +65,19 @@ fi cat > chroot/etc/apt/${_PARENT_FILE} << EOF -deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} +deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS} EOF if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] then rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_CHROOT} | sed -e 's|-backports||')" echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list @@ -91,17 +91,17 @@ then case "${LB_MODE}" in debian|progress-linux) - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_CHROOT}" in sid) ;; *) - echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi ;; esac @@ -131,11 +131,11 @@ if [ "${LB_UPDATES}" = "true" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] @@ -153,13 +153,13 @@ then case "${LB_MODE}" in debian) - if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] + if [ "${LB_PARENT_DISTRIBUTION_CHROOT}" != "sid" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi fi ;; @@ -181,8 +181,8 @@ do if [ -e "${FILE}" ] then - sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION_CHROOT}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_CHROOT}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" diff -Nru live-build-20190311/scripts/build/bootstrap_debootstrap live-build-20190311kali1/scripts/build/bootstrap_debootstrap --- live-build-20190311/scripts/build/bootstrap_debootstrap 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/bootstrap_debootstrap 2019-03-19 08:59:27.000000000 +0000 @@ -62,6 +62,7 @@ then # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" + FOREIGN_DEBOOTSTRAP_OPTIONS="--components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi if [ "${_VERBOSE}" = "true" ] @@ -87,7 +88,7 @@ fi Echo_breakage "Running debootstrap (download-only)... " - debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} + debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} # Removing old cache rm -f cache/packages.bootstrap/*.deb @@ -107,10 +108,14 @@ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_QEMU_EXCLUDE} | sed 's| *|,|g')" fi - Echo_message "Running debootstrap with qemu-debootstrap" - qemu-debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} + Echo_message "Bootstrap will be foreign" + debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} + + Echo_message "Running debootstrap second stage under QEMU" + cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin + Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage ${FOREIGN_DEBOOTSTRAP_OPTIONS} else - debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} + debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} fi # Deconfiguring debootstrap configurations diff -Nru live-build-20190311/scripts/build/build live-build-20190311kali1/scripts/build/build --- live-build-20190311/scripts/build/build 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/build 2019-03-19 08:59:27.000000000 +0000 @@ -66,7 +66,7 @@ Check_defaults Echo_message "live-build ${LIVE_BUILD_VERSION}" -Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" +Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" # Bootstrapping system lb bootstrap ${@} diff -Nru live-build-20190311/scripts/build/chroot_apt live-build-20190311kali1/scripts/build/chroot_apt --- live-build-20190311/scripts/build/chroot_apt 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/chroot_apt 2019-03-19 08:59:27.000000000 +0000 @@ -152,7 +152,7 @@ progress-linux) if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ] then - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')" _ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}" _DISABLE_DISTRIBUTIONS="" @@ -167,7 +167,7 @@ _ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates" fi - case "${LB_DISTRIBUTION}" in + case "${LB_DISTRIBUTION_BINARY}" in *-backports) if [ "${LB_BACKPORTS}" = "true" ] then diff -Nru live-build-20190311/scripts/build/chroot_archives live-build-20190311kali1/scripts/build/chroot_archives --- live-build-20190311/scripts/build/chroot_archives 2019-03-11 10:05:40.000000000 +0000 +++ live-build-20190311kali1/scripts/build/chroot_archives 2019-03-19 08:59:27.000000000 +0000 @@ -64,19 +64,19 @@ fi cat > chroot/etc/apt/${_PARENT_FILE} << EOF -deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} +deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS} EOF if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] then rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_CHROOT} | sed -e 's|-backports||')" echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list @@ -90,17 +90,17 @@ then case "${LB_MODE}" in debian|progress-linux) - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_CHROOT}" in sid) ;; *) - echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi ;; esac @@ -130,11 +130,11 @@ if [ "${LB_UPDATES}" = "true" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] @@ -152,13 +152,13 @@ then case "${LB_MODE}" in debian) - if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] + if [ "${LB_PARENT_DISTRIBUTION_CHROOT}" != "sid" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi fi ;; @@ -180,8 +180,8 @@ do if [ -e "${FILE}" ] then - sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION_CHROOT}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_CHROOT}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" @@ -460,19 +460,19 @@ # Configure custom sources.list cat > chroot/etc/apt/${_PARENT_FILE} << EOF -deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} +deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY} ${LB_PARENT_ARCHIVE_AREAS} EOF if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] then rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')" echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list @@ -486,17 +486,17 @@ then case "${LB_MODE}" in debian|progress-linux) - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_BINARY}" in sid) ;; *) - echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION_BINARY}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION_BINARY}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi ;; esac @@ -526,11 +526,11 @@ if [ "${LB_UPDATES}" = "true" ] then - echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi if [ "${LB_DERIVATIVE}" = "true" ] @@ -548,13 +548,13 @@ then case "${LB_MODE}" in debian) - if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] + if [ "${LB_PARENT_DISTRIBUTION_BINARY}" != "sid" ] then - echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi fi ;; @@ -603,8 +603,8 @@ do if [ -e "${FILE}" ] then - sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION_BINARY}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" diff -Nru live-build-20190311/scripts/build/chroot_firmware live-build-20190311kali1/scripts/build/chroot_firmware --- live-build-20190311/scripts/build/chroot_firmware 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/chroot_firmware 2019-03-19 08:59:27.000000000 +0000 @@ -59,15 +59,15 @@ FIRMWARE_PACKAGES="" -_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" +_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION_CHROOT}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" -rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} +rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} | sort -u)" done if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" @@ -91,15 +91,15 @@ then # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). - _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" + _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} + rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} | sort -u)" done fi diff -Nru live-build-20190311/scripts/build/config live-build-20190311kali1/scripts/build/config --- live-build-20190311/scripts/build/config 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/config 2019-03-19 08:59:27.000000000 +0000 @@ -57,6 +57,10 @@ \t [-d|--distribution CODENAME]\n\ \t [--parent-distribution CODENAME]\n\ \t [--parent-debian-installer-distribution CODENAME]\n\ +\t [--distribution-chroot CODENAME]\n\ +\t [--parent-distribution-chroot CODENAME]\n\ +\t [--distribution-binary CODENAME]\n\ +\t [--parent-distribution-binary CODENAME]\n\ \t [--dump]\n\ \t [--fdisk fdisk|fdisk.dist]\n\ \t [--force]\n\ @@ -136,7 +140,10 @@ cache-stages:,debconf-frontend:,debconf-priority:,dump, initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:, architectures:,clean, - distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:, + distribution:,parent-distribution:,parent-debian-installer-distribution:, + distribution-chroot:,parent-distribution-chroot:, + distribution-binary:,parent-distribution-binary:, + parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:, parent-mirror-binary-security:,parent-mirror-debian-installer:, mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:, mirror-binary-security:,mirror-debian-installer:, @@ -356,6 +363,26 @@ shift 2 ;; + --distribution-chroot) + LB_DISTRIBUTION_CHROOT="${2}" + shift 2 + ;; + + --parent-distribution-chroot) + LB_PARENT_DISTRIBUTION_CHROOT="${2}" + shift 2 + ;; + + --distribution-binary) + LB_DISTRIBUTION_BINARY="${2}" + shift 2 + ;; + + --parent-distribution-binary) + LB_PARENT_DISTRIBUTION_BINARY="${2}" + shift 2 + ;; + -m|--parent-mirror-bootstrap) LB_PARENT_MIRROR_BOOTSTRAP="${2}" shift 2 @@ -898,10 +925,10 @@ if [ ! -e config ] then - Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" + Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" mkdir config else - Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" + Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" fi # Creating live-build configuration @@ -1039,6 +1066,22 @@ # (Default: ${LB_PARENT_DISTRIBUTION}) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}" +# \$LB_DISTRIBUTION_CHROOT: select distribution to use in the chroot +# (Default: ${LB_DISTRIBUTION_CHROOT}) +LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT}" + +# \$LB_PARENT_DISTRIBUTION_CHROOT: select parent distribution to use in the chroot +# (Default: ${LB_PARENT_DISTRIBUTION_CHROOT}) +LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT}" + +# \$LB_DISTRIBUTION_BINARY: select distribution to use in the final image +# (Default: ${LB_DISTRIBUTION_BINARY}) +LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY}" + +# \$LB_PARENT_DISTRIBUTION_BINARY: select parent distribution to use in the final image +# (Default: ${LB_PARENT_DISTRIBUTION_BINARY}) +LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY}" + # \$LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use # (Default: ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}) LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" @@ -1417,7 +1460,8 @@ [Image] Architecture: ${LB_ARCHITECTURES} Archive-Areas: ${LB_ARCHIVE_AREAS} -Distribution: ${LB_DISTRIBUTION} +Distribution-Chroot: ${LB_DISTRIBUTION_CHROOT} +Distribution-Binary: ${LB_DISTRIBUTION_BINARY} Mirror-Bootstrap: ${LB_MIRROR_BOOTSTRAP} EOF @@ -1427,7 +1471,8 @@ cat >> config/build << EOF Parent-Archive-Areas: ${LB_ARCHIVE_AREAS} -Parent-Distribution: ${LB_PARENT_DISTRIBUTION} +Parent-Distribution-Chroot: ${LB_PARENT_DISTRIBUTION_CHROOT} +Parent-Distribution-Binary: ${LB_PARENT_DISTRIBUTION_BINARY} Parent-Mirror-Bootstrap: ${LB_PARENT_MIRROR_BOOTSTRAP} EOF diff -Nru live-build-20190311/scripts/build/installer_debian-installer live-build-20190311kali1/scripts/build/installer_debian-installer --- live-build-20190311/scripts/build/installer_debian-installer 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/installer_debian-installer 2019-03-19 08:59:27.000000000 +0000 @@ -349,15 +349,15 @@ FIRMWARE_PACKAGES="" - _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" + _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION_CHROOT}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} + rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} | sort -u)" done if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" @@ -381,15 +381,15 @@ then # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). - _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" + _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} + rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} | sort -u)" done fi @@ -672,13 +672,13 @@ _LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"' fi - case "${LB_PARENT_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION_BINARY}" in sid) _SUITE="unstable" ;; *) - _SUITE="${LB_PARENT_DISTRIBUTION}" + _SUITE="${LB_PARENT_DISTRIBUTION_BINARY}" ;; esac @@ -688,7 +688,7 @@ -o APT::FTPArchive::Release::Label="Debian" \ -o APT::FTPArchive::Release::Suite="${_SUITE}" \ ${_LB_APT_VERSION_OPT} \ - -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ + -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION_BINARY}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \ @@ -700,19 +700,11 @@ rm -f chroot/binary.sh mv chroot/root/binary ./ - case "${LB_PARENT_DISTRIBUTION}" in - jessie) - DISTRIBUTIONS="stable" - ;; - - *) - DISTRIBUTIONS="stable testing unstable" - ;; - esac + DISTRIBUTIONS="stable testing unstable" - if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] + if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION_BINARY}" ] then - DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}" + DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION_BINARY}" fi case "${LIVE_IMAGE_TYPE}" in diff -Nru live-build-20190311/scripts/build/source_debian live-build-20190311kali1/scripts/build/source_debian --- live-build-20190311/scripts/build/source_debian 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/source_debian 2019-03-19 08:59:27.000000000 +0000 @@ -117,19 +117,19 @@ # where available. workaround: disable backports case "${LB_MODE}" in progress-linux) - case "${LB_DISTRIBUTION}" in + case "${LB_DISTRIBUTION_BINARY}" in *-backports) ;; *) - if grep -qs "${LB_DISTRIBUTION}-backports" chroot/etc/apt/sources.list.d/progress-linux.list + if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list then cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig while read _LINE do - if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION}-backports + if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION_BINARY}-backports then sed -i -e "s|${_LINE}|#${_LINE}|" chroot/etc/apt/sources.list.d/progress-linux.list fi diff -Nru live-build-20190311/scripts/build/source_disk live-build-20190311kali1/scripts/build/source_disk --- live-build-20190311/scripts/build/source_disk 2019-03-11 10:05:11.000000000 +0000 +++ live-build-20190311kali1/scripts/build/source_disk 2019-03-19 08:59:27.000000000 +0000 @@ -49,8 +49,8 @@ mkdir -p source/.disk -DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" -DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" +DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 1 | tr '[a-z]' '[A-Z]')" +DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 2-)" if [ -e chroot/etc/os-release ] then