From 64eb9bf559c4d3514f25483f1e280c0cf330c583 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 7 Nov 2011 01:28:37 +0100 Subject: [PATCH] Remove creation of SOUNDCARD_DB obsoleted since postplug 1.2.11 --- platforms/flash-1GB/post.inc.sh | 7 ------- platforms/livecd-gnome-root/post.inc.sh | 7 ------- platforms/livecd-light-root/post.inc.sh | 7 ------- platforms/livecd-root/post.inc.sh | 7 ------- platforms/livedvd-root/post.inc.sh | 9 +-------- platforms/livegames-root/post.inc.sh | 7 ------- platforms/livestudio-root/post.inc.sh | 7 ------- platforms/testcd-root/post.inc.sh | 7 ------- 8 files changed, 1 insertion(+), 57 deletions(-) diff --git a/platforms/flash-1GB/post.inc.sh b/platforms/flash-1GB/post.inc.sh index 8e01a4c..2c62ed2 100644 --- a/platforms/flash-1GB/post.inc.sh +++ b/platforms/flash-1GB/post.inc.sh @@ -93,11 +93,4 @@ if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then sed -i 's|[#]AutoLoginUser=.*|AutoLoginUser=liveuser|' \ $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - prelink diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index d0bf1f2..b8c8ca2 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -45,13 +45,6 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index e57a1de..714961c 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -34,13 +34,6 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index a7a9bae..d218d06 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -46,13 +46,6 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 8fad3d2..f1716b8 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -47,15 +47,8 @@ for f in /usr/share/applications/chromium-devel.desktop \ chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) +# remove unused initramfs generated by kernel for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r` - echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh - chroot $MOUNTDIR sh /tmp/sounddb.sh - rm -f $MOUNTDIR/tmp/sounddb.sh - [ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* done diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index d6b8793..fb2daca 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -46,13 +46,6 @@ for f in /usr/share/applications/chromium-devel.desktop; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* diff --git a/platforms/livestudio-root/post.inc.sh b/platforms/livestudio-root/post.inc.sh index 5cc23c0..ac4e911 100644 --- a/platforms/livestudio-root/post.inc.sh +++ b/platforms/livestudio-root/post.inc.sh @@ -45,11 +45,4 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - prelink diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index a7a9bae..d218d06 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -46,13 +46,6 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f done -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` - # remove unused initramfs generated by kernel rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*