openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

livedvd: staging changes for multilanguage support

Browse Source
This commit is contained in:
Silvan Calarco 2014-03-09 14:52:36 +01:00
parent ffe669f786
commit cefc8f6149
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -35,17 +35,17 @@ endif
kdelibs3:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in it es; do echo -n "kde-i18n-$$l "; done; \
[ "$(MULTILANGUAGE)" ] && for l in $(MULTILANGUAGE); do echo -n "kde-i18n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || :
kdelibs:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in it es; do echo -n "kde-l10n-$$l "; done; \
[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || :
koffice:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \
# [ "$(MULTILANGUAGE)" != "" ] && for l in it es; do echo -n "koffice-i18n-$$l "; done; \
# [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "koffice-i18n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "koffice-i18n-$(LANGUAGE) "; } || :
#k3b:
# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
@ -55,9 +55,10 @@ koffice:
aspell:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in it en es; do echo -n "aspell-$$l "; done; \
[ "$(MULTILANGUAGE)" ] && for l in $(MULTILANGUAGE); do echo -n "aspell-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && echo -n "aspell-$(LANGUAGE) "; } || :
libreoffice:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "libreoffice-i18n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && echo -n "libreoffice-i18n-$(LANGUAGE) "; } || :

31
makedist.inc.sh
View File

@ -88,7 +88,13 @@ sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_H
#install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools ""
install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
[ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}"
if [ "$MULTILANGUAGE" ]; then
for l in $MULTILANGUAGE; do
install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $l" ${MAKEDIST_TARGET}-${PLATFORM}-${l} "${RPMEXTRAARGS}"
done
else
[ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}"
fi
[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
if [ "$APPLICATION_TARGET" ]; then
@ -110,12 +116,14 @@ fi
# delete unused localizations
#
echo "Deleting other languages l10n files..."
for d in /usr/share/locale /opt/kde/share/locale \
if [ ! "$MULTILANGUAGE" ]; then
echo "Deleting other languages l10n files..."
for d in /usr/share/locale /opt/kde/share/locale \
/opt/kde/share/locale/l10n /opt/kde3/share/locale; do
find ${MOUNTDIR}${d} -maxdepth 1 -mindepth 1 -type d \
! -name ${LANGUAGE}* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; 2>/dev/null
done
find ${MOUNTDIR}${d} -maxdepth 1 -mindepth 1 -type d \
! -name ${LANGUAGE}* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; 2>/dev/null
done
fi
if [ "$U_BOOT" ]; then
echo "Copying u-boot Image for Kernel"
@ -150,8 +158,15 @@ rm -rf $MOUNTDIR/tmp/kde-root
cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root/* $MOUNTDIR/
# copy localized static files for specific platform
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
if [ "$MULTILANGUAGE" ]; then
for l in $MULTILANGUAGE; do
[ -e $TARGETDIR/platforms/$PLATFORM/root-$l ] &&
cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$l/* $MOUNTDIR/
done
else
[ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
fi
# enable additional smart repositories
if [ "$SMART_CHANNELS_ENABLE" != "" ]; then

8
platforms/livedvd-root/Makefile
View File

@ -1,5 +1,5 @@
$(MAKEDIST_TARGET)-livedvd-kde4: kppp krfb ark kcalc kdf kgpg desktop-base-kde4 \
ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \
$(MAKEDIST_TARGET)-livedvd-kde4: desktop-base-kde4 kppp krfb ark kcalc kdf kgpg \
ksnapshot okular kontact kmail akregator kmix \
kopete bluedevil smb4k amarok kwallet dragon kate
$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
@ -20,10 +20,10 @@ $(MAKEDIST_TARGET)-livedvd-root-en: \
kde-l10n-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: \
kde-l10n-es
# firefox-i18n-es-ES
$(MAKEDIST_TARGET)-livedvd-root-fr: \
kde-l10n-fr
$(MAKEDIST_TARGET)-livedvd-root-it: \
kde-l10n-it
# firefox-i18n-it
# FIXME: add kdepim
syslog-ng:
@echo

1
platforms/livedvd-root/settings.inc
View File

@ -12,6 +12,7 @@ elif [ "$ARCH" = "x86_64" ]; then
KERNEL_PLATFORM=""
#KERNEL_ADDITIONAL="vboxvideo"
KERNEL_MORE_EXTRAVER=
MULTILANGUAGE="it en es fr"
fi
TARGET_HOSTNAME=openmamba-livedvd

2
platforms/livedvd/Makefile
View File

@ -2,5 +2,5 @@ $(MAKEDIST_TARGET)-livedvd: openmamba-release memtest86+ syslinux macbook-tools
# Localized targets
$(MAKEDIST_TARGET)-livedvd-en:
$(MAKEDIST_TARGET)-livedvd-it:
$(MAKEDIST_TARGET)-livedvd-fr:
$(MAKEDIST_TARGET)-livedvd-es: