From 72a9e5f23bcb786161cb824b9b4e893a8a2a68c7 Mon Sep 17 00:00:00 2001 From: Joerg Schirottke Date: Thu, 10 Apr 2014 23:36:49 +0200 Subject: add Spitfire support --- auto/build | 3 ++- auto/config | 7 +++++++ auto/functions/patch-bootstrap | 2 +- config/lists/base | 7 +++++++ config/lists/desktop-base | 2 +- config/lists/kanotix-kde-master | 4 +++- config/lists/kanotix-lxde-full | 2 +- config/lists/kanotix-lxde-min | 2 +- config/lists/kanotix-min | 9 ++++++++- config/lists/kde | 7 +++++++ config/repositories/dragonfire.gpg | 30 ++++++++++++++++++++++++++++++ config/repositories/excalibur.gpg | 30 ------------------------------ config/repositories/spitfire | 3 +++ config/repositories/spitfire.gpg | 30 ++++++++++++++++++++++++++++++ 14 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 config/repositories/dragonfire.gpg delete mode 100644 config/repositories/excalibur.gpg create mode 100644 config/repositories/spitfire create mode 100644 config/repositories/spitfire.gpg diff --git a/auto/build b/auto/build index 51fa7f0..ec93899 100755 --- a/auto/build +++ b/auto/build @@ -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 diff --git a/config/lists/base b/config/lists/base index a3494ba..7f48451 100644 --- a/config/lists/base +++ b/config/lists/base @@ -99,7 +99,12 @@ foomatic-db-engine foomatic-db foomatic-db-gutenprint cups-driver-gutenprint +#if DISTRIBUTION squeeze foo2zjs +#endif +#nif DISTRIBUTION squeeze +printer-driver-foo2zjs +#endif #printconf printer-driver-splix @@ -148,7 +153,9 @@ gpart # filesystems ntfs-3g +#if DISTRIBUTION squeeze ntfsprogs +#endif reiserfsprogs dmraid kpartx diff --git a/config/lists/desktop-base b/config/lists/desktop-base index ae5d4a1..313f901 100644 --- a/config/lists/desktop-base +++ b/config/lists/desktop-base @@ -23,7 +23,7 @@ joystick # themes gtk2-engines -#if DISTRIBUTION wheezy +#nif DISTRIBUTION squeeze #include #endif diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master index fdfac52..6a71833 100644 --- a/config/lists/kanotix-kde-master +++ b/config/lists/kanotix-kde-master @@ -33,7 +33,9 @@ khelpcenter4 kuser # updates +#if DISTRIBUTION squeeze wheezy update-manager-core +#endif update-notifier-kde # wine @@ -42,7 +44,7 @@ wine1.3 wine1.3-gecko winetricks #endif -#if DISTRIBUTION wheezy +#nif DISTRIBUTION squeeze #include #endif diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full index 63ba0fb..e10c546 100644 --- a/config/lists/kanotix-lxde-full +++ b/config/lists/kanotix-lxde-full @@ -26,7 +26,7 @@ wine1.3 wine1.3-gecko winetricks #endif -#if DISTRIBUTION wheezy +#nif DISTRIBUTION squeeze #include #endif diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min index 9c772f3..9c51333 100644 --- a/config/lists/kanotix-lxde-min +++ b/config/lists/kanotix-lxde-min @@ -10,7 +10,7 @@ gksu # themes gtk2-engines -#if DISTRIBUTION wheezy +#nif DISTRIBUTION squeeze #include #endif diff --git a/config/lists/kanotix-min b/config/lists/kanotix-min index 497671a..c983d08 100644 --- a/config/lists/kanotix-min +++ b/config/lists/kanotix-min @@ -17,12 +17,19 @@ plasma-runners-addons plasma-scriptengine-python # network +#if DISTRIBUTION squeeze network-manager-kde +#endif +#nif DISTRIBUTION squeeze +plasma-widget-networkmanagement +#endif # other hardware kde-config-touchpad kde-config-tablet -system-config-printer-kde +#if DISTRIBUTION squeeze wheezy +system-config-printer-kde +#endif blueman # tools diff --git a/config/lists/kde b/config/lists/kde index 44bbdaa..dde01b9 100644 --- a/config/lists/kde +++ b/config/lists/kde @@ -54,10 +54,17 @@ kde-config-gtk-style gnome-icon-theme # network +#if DISTRIBUTION squeeze network-manager-kde +#endif +#nif DISTRIBUTION squeeze +plasma-widget-networkmanagement +#endif # other hardware kde-config-touchpad kde-config-tablet +#if DISTRIBUTION squeeze wheezy system-config-printer-kde +#endif blueman diff --git a/config/repositories/dragonfire.gpg b/config/repositories/dragonfire.gpg new file mode 100644 index 0000000..051af27 --- /dev/null +++ b/config/repositories/dragonfire.gpg @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.6 (GNU/Linux) + +mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk +oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj +OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi +OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT +jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ +rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s +n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI +EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk +hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo +VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk +qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx +U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq +L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC +Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo +zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ +iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs +PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY +AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj +mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG +YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM +hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda +26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS +tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf +XaCZ+2zAh156vgAAfkPqU5FHg/8= +=fxFL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/config/repositories/excalibur.gpg b/config/repositories/excalibur.gpg deleted file mode 100644 index 051af27..0000000 --- a/config/repositories/excalibur.gpg +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk -oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj -OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi -OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT -jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ -rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s -n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI -EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk -hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo -VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk -qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx -U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq -L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC -Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo -zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ -iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs -PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY -AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj -mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG -YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM -hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda -26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS -tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf -XaCZ+2zAh156vgAAfkPqU5FHg/8= -=fxFL ------END PGP PUBLIC KEY BLOCK----- diff --git a/config/repositories/spitfire b/config/repositories/spitfire new file mode 100644 index 0000000..0f43f91 --- /dev/null +++ b/config/repositories/spitfire @@ -0,0 +1,3 @@ +# Kanotix Spitfire +deb http://kanotix.com/files/spitfire ./ +deb-src http://kanotix.com/files/spitfire ./ diff --git a/config/repositories/spitfire.gpg b/config/repositories/spitfire.gpg new file mode 100644 index 0000000..051af27 --- /dev/null +++ b/config/repositories/spitfire.gpg @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.6 (GNU/Linux) + +mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk +oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj +OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi +OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT +jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ +rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s +n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI +EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk +hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo +VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk +qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx +U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq +L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC +Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo +zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ +iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs +PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY +AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj +mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG +YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM +hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda +26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS +tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf +XaCZ+2zAh156vgAAfkPqU5FHg/8= +=fxFL +-----END PGP PUBLIC KEY BLOCK----- -- cgit v1.0