diff options
Diffstat (limited to 'auto')
| -rwxr-xr-x | auto/build | 3 | ||||
| -rwxr-xr-x | auto/config | 7 | ||||
| -rw-r--r-- | auto/functions/patch-bootstrap | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -10,8 +10,9 @@ LABEL=Kanotix export LB_BOOTLOADER LB_BINARY_IMAGES # Update kanotix-version (32/64-bit and timestamp) -KANOTIX_CODENAMES="lenny=Excalibur squeeze=Hellfire wheezy=Dragonfire jessie=TBA" +KANOTIX_CODENAMES="lenny=Excalibur squeeze=Hellfire wheezy=Dragonfire jessie=Spitfire" KANOTIX_CODENAME="$(echo $KANOTIX_CODENAMES | fmt -w1 | grep "^${LB_DISTRIBUTION}=" | cut -d= -f2)" +[ -z "$KANOTIX_CODENAME" ] && KANOTIX_CODENAME="$(echo $LB_DISTRIBUTION|sed -e 's/\b\(.\)/\u\1/g')" mkdir -p config/chroot_local-includes/etc [ ! -f config/chroot_local-includes/etc/kanotix-version ] && echo Kanotix $KANOTIX_CODENAME 0000-00:00 > config/chroot_local-includes/etc/kanotix-version diff --git a/auto/config b/auto/config index d81c13d..d870f92 100755 --- a/auto/config +++ b/auto/config @@ -63,6 +63,13 @@ wheezy) i386) LB_LINUX_PACKAGES="linux-image-extra-3.14.0-0 linux-headers-3.14.0-0"; LB_LINUX_FLAVOURS="generic";; esac ;; +jessie|*) + LB_REPOSITORIES+=" dragonfire spitfire" + case $LB_ARCHITECTURE in + amd64) LB_LINUX_PACKAGES="linux-image-extra-3.14.0-0 linux-headers-3.14.0-0"; LB_LINUX_FLAVOURS="generic";; + i386) LB_LINUX_PACKAGES="linux-image-extra-3.14.0-0 linux-headers-3.14.0-0"; LB_LINUX_FLAVOURS="generic";; + esac + ;; esac [ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg" diff --git a/auto/functions/patch-bootstrap b/auto/functions/patch-bootstrap index edf0203..270bedd 100644 --- a/auto/functions/patch-bootstrap +++ b/auto/functions/patch-bootstrap @@ -9,7 +9,7 @@ if [ "$current_script" = "chroot" -a ! -e chroot/usr/local/sbin/update-initramfs ln -fs /bin/true chroot/usr/local/sbin/update-initramfs . config/bootstrap - if [ "$LB_ARCHITECTURE" = "amd64" -o "$LB_ARCHITECTURES" = "amd64" ] && [ "$LB_DISTRIBUTION" = "wheezy" ]; then + if [ "$LB_ARCHITECTURE" = "amd64" -o "$LB_ARCHITECTURES" = "amd64" ] && [ "$LB_DISTRIBUTION" != "squeeze" ]; then echo "HACK: Enabling multiarch: amd64 + i386" chroot chroot dpkg --add-architecture i386 fi |