Commit 3a60182c7eb137da82814975ae4978d8f17f682f

Authored by Silvan Calarco
1 parent 4f642eba4c
Exists in master

makedist.sh: fix removal of unused translation (fixes spanish live releases); cl…

…eanup of some obsolete comments

Showing 1 changed file with 7 additions and 22 deletions Side-by-side Diff

... ... @@ -111,29 +111,18 @@
111 111 _EOF
112 112 fi
113 113  
114   -# erase_rpm_database
  114 +#erase_rpm_database
115 115 clean_rpm_database
116 116  
117   -echo "Deleting unneeded files..."
118 117 # delete unused localizations
119 118 #
120   -find $MOUNTDIR/usr/share/locale \
121   - -maxdepth 1 -mindepth 1 -type d \
122   -! -name it* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \;
  119 +echo "Deleting other languages l10n files..."
  120 +for d in /usr/share/locale /opt/kde/share/locale \
  121 + /opt/kde/share/locale/l10n /opt/kde3/share/locale; do
  122 + find ${MOUNTDIR}${d} -maxdepth 1 -mindepth 1 -type d \
  123 + ! -name ${LANGUAGE}* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; 2>/dev/null
  124 +done
123 125  
124   -#$CHROOTCMD chkconfig --add acpid ||
125   -# { echo "$mkcd_me: fatal error, aborting installation" >&2
126   -# { (exit 1); exit 1; }; }
127   -
128   -# configure extlinux boot loader
129   -#cat > $MOUNTDIR/boot/extlinux.conf << _EOF
130   -#DEFAULT $PLATFORM
131   -#LABEL $PLATFORM
132   -#KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
133   -#APPEND video=vesafb:1280x1024-32 root=$ROOTDEV console=tty1
134   -#resume2=swap:$SWAPDEV
135   -#_EOF
136   -
137 126 if [ "$U_BOOT" ]; then
138 127 echo "Copying u-boot Image for Kernel"
139 128 #mkimage -A ppc -O linux -T kernel -C gzip -a 0x8000 -e 0x8000 \
... ... @@ -147,10 +136,6 @@
147 136 if [ ${MULTITHREAD:-0} -gt 0 ]; then
148 137 sed -i "s|multithread=1|multithread=0|" $MOUNTDIR/etc/sysconfig/rc
149 138 fi
150   -
151   -# blacklist buggy ehci_hcd
152   -#echo "blacklist ehci_hcd" > $MOUNTDIR/etc/modprobe.conf.d/ehci_hcd
153   -
154 139  
155 140 # set rootdev on extlinux
156 141 [ -e $MOUNTDIR/boot/extlinux.conf ] && sed -i "s|\([^::alpha]root=\)[^ ]*|\1$ROOTDEV|" $MOUNTDIR/boot/extlinux.conf