From 4ca36c8edc0b756307253071923b0b6ffdce8543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Mon, 13 Aug 2012 11:15:54 -0400 Subject: [PATCH] Update live-build's config for version 3.x in wheezy --- auto/build | 2 +- auto/config | 25 ++++++----- build_all.sh | 4 +- .../workaround-live-build-limitation.chroot | 10 +++++ .../kali.list.chroot} | 3 +- config/package-lists/standard.list.chroot | 43 +++++++++++++++++++ .../kali.preseed.binary} | 0 7 files changed, 69 insertions(+), 18 deletions(-) create mode 100755 config/hooks/workaround-live-build-limitation.chroot rename config/{chroot_local-packageslists/kali.list => package-lists/kali.list.chroot} (68%) create mode 100644 config/package-lists/standard.list.chroot rename config/{binary_debian-installer/preseed.cfg => preseed/kali.preseed.binary} (100%) diff --git a/auto/build b/auto/build index f1f7559..d4ffe1a 100755 --- a/auto/build +++ b/auto/build @@ -4,6 +4,6 @@ # /usr/share/live/build/scripts/build/lb_binary_debian-installer fails because # the version is empty (nothing known in # /usr/share/live/build/functions/releases.sh) -export RELEASE_kali="6.0" +export RELEASE_kali="7.0" lb build noauto "$@" 2>&1 | tee binary.log diff --git a/auto/config b/auto/config index d4b11c0..d15dc3b 100755 --- a/auto/config +++ b/auto/config @@ -1,27 +1,27 @@ #!/bin/sh -# Various comments -# live-build doesn't work if --debian-installer-distribution is unknown of -# debian-cd => we have to override it as "squeeze" and install a symlink on the -# server - -if [ ! -e /usr/share/live/build/data/debian-cd/kali ]; then - echo "ERROR: Run this first" - echo "ln -sf squeeze /usr/share/live/build/data/debian-cd/kali" -fi - lb config noauto \ - --packages-lists "kali" \ --distribution "kali" \ + --parent-distribution "wheezy" \ + --debian-installer-distribution "kali" \ + --parent-debian-installer-distribution "wheezy" \ --archive-areas "main contrib non-free" \ + --parent-archive-areas "main contrib non-free" \ --bootstrap cdebootstrap \ - --bootstrap-config squeeze \ --bootstrap-keyring /usr/share/keyrings/kali-archive-keyring.gpg \ --keyring-packages kali-archive-keyring \ + --volatile false \ + --backports false \ + --source false \ + --parent-mirror-bootstrap http://repo.kali.org/kali \ --mirror-bootstrap http://repo.kali.org/kali \ + --parent-mirror-debian-installer http://repo.kali.org/kali \ --mirror-debian-installer http://repo.kali.org/kali \ + --parent-mirror-chroot-security http://repo.kali.org/security \ --mirror-chroot-security http://repo.kali.org/security \ + --parent-mirror-binary http://repo.kali.org/kali \ --mirror-binary http://repo.kali.org/kali \ + --parent-mirror-binary-security http://repo.kali.org/security \ --mirror-binary-security http://repo.kali.org/security \ --iso-application "Kali Linux" \ --iso-publisher "Kali" \ @@ -29,5 +29,4 @@ lb config noauto \ --debian-installer live \ --linux-packages linux-image \ --linux-flavours kali \ - --username root \ "$@" diff --git a/build_all.sh b/build_all.sh index 0f7acc7..9b37553 100755 --- a/build_all.sh +++ b/build_all.sh @@ -11,13 +11,13 @@ for KALI_ARCH in $KALI_ARCHES; do lb clean --purge >prepare.log 2>&1 lb config --architecture $KALI_ARCH >>prepare.log 2>&1 lb build >/dev/null - if [ ! -e binary.iso ]; then + if [ ! -e binary.hybrid.iso ]; then echo "Build of $KALI_ARCH live image failed" >&2 echo "Last 50 lines of the log:" >&2 tail -n 50 binary.log >&2 exit 1 fi - mv binary.iso images/kali-$KALI_VERSION-$KALI_ARCH.iso + mv binary.hybrid.iso images/kali-$KALI_VERSION-$KALI_ARCH.iso mv binary.log images/kali-$KALI_VERSION-$KALI_ARCH.log done diff --git a/config/hooks/workaround-live-build-limitation.chroot b/config/hooks/workaround-live-build-limitation.chroot new file mode 100755 index 0000000..f1a60fe --- /dev/null +++ b/config/hooks/workaround-live-build-limitation.chroot @@ -0,0 +1,10 @@ +#!/bin/sh + +# /usr/lib/live/build/lb_binary_linux-image expects /boot/initrd.img-* to +# expand to something but the kali image has no initrd + +touch /boot/initrd.img-fake + +# somehow we need to replace wheezy with kali +sed -i -e 's/wheezy/kali/g' /etc/apt/sources.list + diff --git a/config/chroot_local-packageslists/kali.list b/config/package-lists/kali.list.chroot similarity index 68% rename from config/chroot_local-packageslists/kali.list rename to config/package-lists/kali.list.chroot index b10e343..fe54fc7 100644 --- a/config/chroot_local-packageslists/kali.list +++ b/config/package-lists/kali.list.chroot @@ -1,7 +1,6 @@ # kali packages -#include -#include +gnome-core kali-archive-keyring kali-menu diff --git a/config/package-lists/standard.list.chroot b/config/package-lists/standard.list.chroot new file mode 100644 index 0000000..719abc5 --- /dev/null +++ b/config/package-lists/standard.list.chroot @@ -0,0 +1,43 @@ +#! Packages Priority standard +apt-listchanges +at +bash-completion +bc +bind9-host +bsd-mailx +bzip2 +dc +dnsutils +exim4 +exim4-base +exim4-daemon-light +file +ftp +host +less +locales +lsof +m4 +mime-support +mlocate +multiarch-support +mutt +ncurses-term +nfs-common +openssh-client +patch +pciutils +perl +perl-modules +portmap +procmail +python +reportbug +rpcbind +telnet +texinfo +time +ucf +w3m +wamerican +whois diff --git a/config/binary_debian-installer/preseed.cfg b/config/preseed/kali.preseed.binary similarity index 100% rename from config/binary_debian-installer/preseed.cfg rename to config/preseed/kali.preseed.binary