From 80cacfe57ab1a7e2be7af295ece081ca6fff94c6 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Thu, 11 Oct 2012 22:31:26 +0200 Subject: various smaller changes * removed wine-ppa-oneiric * added hack to generate initrd only once * added multiarch support for wheezy amd64 * updated packagelists for multiarch (wine, skype) * removed obsolete packagelists includes --- auto/config | 2 +- auto/functions/patch-bootstrap | 17 +++++++++++++++++ config/chroot_local-hooks/update-initramfs.sh | 17 +++++------------ config/lists/base | 1 - config/lists/kanotix-kde-base | 7 ++++++- config/lists/kanotix-kde-master | 5 +++++ config/lists/kanotix-trinity-master | 2 ++ config/lists/wheezy-skype | 10 ++++++++++ config/lists/wheezy-wine | 17 +++++++++++++++++ config/repositories/wine-ppa-oneiric | 3 --- config/repositories/wine-ppa-oneiric.gpg | 12 ------------ 11 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 auto/functions/patch-bootstrap create mode 100644 config/lists/wheezy-skype create mode 100644 config/lists/wheezy-wine delete mode 100644 config/repositories/wine-ppa-oneiric delete mode 100644 config/repositories/wine-ppa-oneiric.gpg diff --git a/auto/config b/auto/config index 5bb2033..fd8ff85 100755 --- a/auto/config +++ b/auto/config @@ -66,7 +66,7 @@ squeeze) ;; wheezy) LB_PACKAGES_LISTS+=" dragonfire" - LB_REPOSITORIES+=" dragonfire wine-ppa-oneiric" + LB_REPOSITORIES+=" dragonfire" case $LB_ARCHITECTURE in amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";; i386) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";; diff --git a/auto/functions/patch-bootstrap b/auto/functions/patch-bootstrap new file mode 100644 index 0000000..edf0203 --- /dev/null +++ b/auto/functions/patch-bootstrap @@ -0,0 +1,17 @@ +#!/bin/sh +# Hacks to execute after bootstrapping + +current_script="$(basename "$0"|sed 's/^lb_//')" + +if [ "$current_script" = "chroot" -a ! -e chroot/usr/local/sbin/update-initramfs ]; then + echo "HACK: Disabling update-initramfs to prevent calling it several times during build." + mkdir -p chroot/usr/local/sbin + ln -fs /bin/true chroot/usr/local/sbin/update-initramfs + + . config/bootstrap + if [ "$LB_ARCHITECTURE" = "amd64" -o "$LB_ARCHITECTURES" = "amd64" ] && [ "$LB_DISTRIBUTION" = "wheezy" ]; then + echo "HACK: Enabling multiarch: amd64 + i386" + chroot chroot dpkg --add-architecture i386 + fi +fi + diff --git a/config/chroot_local-hooks/update-initramfs.sh b/config/chroot_local-hooks/update-initramfs.sh index 5179f77..4b1cb2e 100755 --- a/config/chroot_local-hooks/update-initramfs.sh +++ b/config/chroot_local-hooks/update-initramfs.sh @@ -1,15 +1,8 @@ #!/bin/sh +# Disable the diversion that prevented update-initramfs from being run +# This way we save time by not calling update-initramfs several times +rm -f /usr/local/sbin/update-initramfs -# This is a hook for live-helper(7) to rebuild the initramfs image. -# To enable it, copy or symlink this hook into your config/chroot_local-hooks -# directory. -# -# Note: You only want to use this hook if you have modified any initramfs-script -# during the build and need to refresh the initrd.img for that purpose. +# Create stubs that will be updated by chroot_hacks afterwards +touch $(ls /boot/vmlinuz-* | sed 's@^.*/vmlinuz-@/var/lib/initramfs-tools/@g') -for KERNEL in /boot/vmlinuz-* -do - VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')" - - update-initramfs -k ${VERSION} -t -u -done diff --git a/config/lists/base b/config/lists/base index 259ed07..52dfd99 100644 --- a/config/lists/base +++ b/config/lists/base @@ -9,7 +9,6 @@ #endif #include -#include #include diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base index a732a50..cf7c53d 100644 --- a/config/lists/kanotix-kde-base +++ b/config/lists/kanotix-kde-base @@ -12,8 +12,13 @@ apt-xapian-index gecko-mediaplayer # skype -skype pidgin-skype +#if DISTRIBUTION squeeze +skype +#endif +#if DISTRIBUTION wheezy +#include +#endif # other hardware modemmanager diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master index d41b033..974a1a1 100644 --- a/config/lists/kanotix-kde-master +++ b/config/lists/kanotix-kde-master @@ -34,9 +34,14 @@ update-manager-core update-notifier-kde # wine +#if DISTRIBUTION squeeze wine1.3 wine1.3-gecko winetricks +#endif +#if DISTRIBUTION wheezy +#include +#endif # games armagetronad diff --git a/config/lists/kanotix-trinity-master b/config/lists/kanotix-trinity-master index 723727c..72b0fd9 100644 --- a/config/lists/kanotix-trinity-master +++ b/config/lists/kanotix-trinity-master @@ -21,8 +21,10 @@ pidgin-skype khelpcenter-trinity # wine +#if DISTRIBUTION squeeze wine1.3 wine1.3-gecko +#endif # other hardware modemmanager diff --git a/config/lists/wheezy-skype b/config/lists/wheezy-skype new file mode 100644 index 0000000..08913ca --- /dev/null +++ b/config/lists/wheezy-skype @@ -0,0 +1,10 @@ +# skype for wheezy (multiarch) + +#if ARCHITECTURE i386 +skype +#endif + +#if ARCHITECTURE amd64 +skype:i386 +#endif + diff --git a/config/lists/wheezy-wine b/config/lists/wheezy-wine new file mode 100644 index 0000000..99aaec8 --- /dev/null +++ b/config/lists/wheezy-wine @@ -0,0 +1,17 @@ +# wine for wheezy (multiarch) + +wine-unstable +winetricks + +#if ARCHITECTURE i386 +libwine-alsa-unstable +libwine-gl-unstable +libwine-print-unstable +#endif + +#if ARCHITECTURE amd64 +libwine-alsa-unstable:i386 +libwine-gl-unstable:i386 +libwine-print-unstable:i386 +#endif + diff --git a/config/repositories/wine-ppa-oneiric b/config/repositories/wine-ppa-oneiric deleted file mode 100644 index a1b0cb0..0000000 --- a/config/repositories/wine-ppa-oneiric +++ /dev/null @@ -1,3 +0,0 @@ -# PPA for Wine -deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu oneiric main -deb-src http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu oneiric main diff --git a/config/repositories/wine-ppa-oneiric.gpg b/config/repositories/wine-ppa-oneiric.gpg deleted file mode 100644 index 033032b..0000000 --- a/config/repositories/wine-ppa-oneiric.gpg +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.0.10 - -mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAoWdS7H+7Y -4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxscirnag8ShrNM9PtG/v -AQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0IkxhdW5jaHBhZCBQUEEgZm9y -IFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVzlQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B -AheAAAoJEFqaBq75y42wflcD/jLMihWMzRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0n -p+iOB6+PDRbyJ8GVgIjpaIbtl4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCu -ebWU4bV1w+YBvHFFqTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ -=Z9DY ------END PGP PUBLIC KEY BLOCK----- -- cgit v1.0