From ae6ed7d84add2f5a55c843afa763879678cd2ef8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 11 Jun 2011 13:15:06 +0200 Subject: Removing unmaintained chroot_localization script. The chroot_localization script did two things: * contain a hardcoded list for a couple of packages->l10n-packages * (supposed) to set the locales boot parameter correct. While the first was totally outdated and is a thing that needs to be constantly updated for changes in debian (and nobody wants to do that) and it's a broken approach anyway, the second is useless since we're using syslinux-themes packages anyway. --- scripts/build/lb_chroot | 1 - scripts/build/lb_chroot_localization | 650 ----------------------------------- scripts/build/lb_config | 12 +- 3 files changed, 1 insertion(+), 662 deletions(-) delete mode 100755 scripts/build/lb_chroot_localization (limited to 'scripts') diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index 5b880a26c..062a545d9 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -60,7 +60,6 @@ lb chroot_local-packagelists ${*} lb chroot_local-packages ${*} lb chroot_install-packages ${*} lb chroot_tasks ${*} -lb chroot_localization ${*} lb chroot_local-includes ${*} lb chroot_local-patches ${*} lb chroot_local-hooks ${*} diff --git a/scripts/build/lb_chroot_localization b/scripts/build/lb_chroot_localization deleted file mode 100755 index d4951b161..000000000 --- a/scripts/build/lb_chroot_localization +++ /dev/null @@ -1,650 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann -## -## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'install localization packages into chroot')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin installing localization packages..." - -# Requiring stage file -Require_stagefile .stage/config .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_localization - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Setting localizations -if [ -n "${LB_LANGUAGE}" ] -then - case "${LB_LANGUAGE}" in - af) - # Afrikaans - LOCALIZATIONS="iceweasel kde openoffice" - ;; - - as-in) - # Assamese - LOCALIZATIONS="openoffice" - ;; - - ar) - # Arabic - LOCALIZATIONS="iceweasel kde openoffice" - ;; - - az) - # Azerbaijani - LOCALIZATIONS="kde" - ;; - - be) - # Belarusian - LOCALIZATIONS="iceape iceweasel openoffice" - - # Overrides - OPENOFFICE="be-by" - ;; - - bg) - # Bulgarian - LOCALIZATIONS="icedove iceweasel kde openoffice" - ;; - - bn) - # Bengali - LOCALIZATIONS="kde openoffice" - ;; - - br) - # Breton - LOCALIZATIONS="kde openoffice" - ;; - - bs) - # Bosnian - LOCALIZATION="kde openoffice" - ;; - - ca) - # Catalan - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - cs) - # Czech - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - cy-gb) - # Welsh - LOCALIZATIONS="iceweasel kde koffice openoffice" - - # Overrides - KDE="cy" - KOFFICE="cy" - OPENOFFICE="cy" - ;; - - da) - # Danish - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - de) - # German - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - dz-bt) - # Dzongkha - LOCALIZATIONS="iceweasel openoffice" - - # Overrides - OPENOFFICE="dz" - ;; - - el) - # Greek - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - en-gb) - # English (Great Britain) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - KDE="engb" - KOFFICE="engb" - ;; - - en-za) - # English (South Africa) - LOCALIZATIONS="openoffice" - ;; - - eo) - # Esperanto - LOCALIZATIONS="kde openoffice" - ;; - - es-ar) - # Spanish (Argentina) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - KDE="es" - KOFFICE="es" - OPENOFFICE="es" - ;; - - es-es) - # Spanish (Spain) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - KDE="es" - KOFFICE="es" - OPENOFFICE="es" - ;; - - et-ee) - # Estonian - LOCALIZATIONS="iceweasel kde koffice openoffice" - - # Overrides - KDE="et" - KOFFICE="et" - OPENOFFICE="et" - ;; - - eu) - # Basque - LOCALIZATIONS="icedove iceweasel kde koffice" - ;; - - fa-ir) - # Persian - LOCALIZATIONS="iceweasel kde openoffice" - - # Overrides - KDE="fa" - OPENOFFICE="fa" - ;; - - fi) - # Finnish - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - fr) - # French - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - fur-it) - # Furlan - LOCALIZATIONS="iceweasel" - ;; - - fy-nl) - # Frisian - LOCALIZATIONS="iceweasel kde" - - # Overrides - KDE="fy" - ;; - - ga-ie) - # Irish (Ireland) - LOCALIZATIONS="icedove iceweasel kde openoffice" - - # Overrides - ICEDOVE="ga" - KDE="ga" - OPENOFFICE="ga" - ;; - - gl) - # Galician - LOCALIZATIONS="kde" - ;; - - gu-in) - # Gujarati (India) - LOCALIZATIONS="icedove iceweasel openoffice" - - # Overrides - ICEDOVE="gu" - ;; - - he) - # Hebrew - LOCALIZATIONS="iceape icedove iceweasel kde openoffice" - ;; - - hi) - # Hindi - LOCALIZATIONS="kde openoffice" - ;; - - hr) - # Croatian - LOCALIZATIONS="kde koffice openoffice" - ;; - - hu) - # Hungarian - LOCALIZATIONS="icedove iceweasel kde openoffice" - ;; - - in) - # Indic - LOCALIZATIONS="openoffice" - ;; - - is) - # Icelandic - LOCALIZATIONS="kde" - ;; - - it) - # Italian - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - ja) - # Japanese - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - ka) - # Georgian - LOCALIZATIONS="iceweasel openoffice" - ;; - - km) - # Khmer - LOCALIZATIONS="kde openoffice" - ;; - - ko) - # Korean - LOCALIZATIONS="icedove iceweasel kde openoffice" - ;; - - ku) - # Kurdish - LOCALIZATIONS="iceweasel openoffice" - ;; - - lo) - # Lao - LOCALIZATIONS="openoffice" - ;; - - lt) - # Lithuanian - LOCALIZATIONS="icedove iceweasel kde openoffice" - ;; - - lv) - # Latvian - LOCALIZATIONS="kde koffice openoffice" - ;; - - mk) - # Macedonian - LOCALIZATIONS="icedove iceweasel kde openoffice" - ;; - - ml-in) - # Malayalam - LOCALIZATIONS="openoffice" - ;; - - mn) - # Mongolian - LOCALIZATIONS="iceweasel kde" - ;; - - ms) - # Malay - LOCALIZATIONS="kde koffice" - ;; - - nb-no) - # Bokmaal (Norway) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - ICEDOVE="nb" - KDE="nb" - KOFFICE="nb" - OPENOFFICE="nb" - ;; - - nds) - # Low Saxon - LOCALIZATIONS="kde" - ;; - - ne) - # Nepalese - LOCALIZATIONS="openoffice" - ;; - - nl) - # Dutch - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - nn-no) - # Nynorsk (Norway) - LOCALIZATIONS="iceweasel kde openoffice" - - # Overrides - KDE="nn" - OPENOFFICE="nn" - ;; - - nr) - # Ndebele - LOCALIZATIONS="openoffice" - ;; - - ns) - # Northernsotho - LOCALIZATIONS="openoffice" - ;; - - or-in) - # Oriya - LOCALIZATIONS="openoffice" - ;; - - pa-in) - # Punjabi (India) - LOCALIZATIONS="icedove iceweasel kde openoffice" - - # Overrides - ICEDOVE="pa" - KDE="pa" - ;; - - pl) - # Polish - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - pt-br) - # Portugese (Brazil) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - KDE="ptbr" - KOFFICE="ptbr" - ;; - - pt-pt) - # Portugese (Portugal) - LOCALIZATIONS="iceweasel kde koffice openoffice" - - # Overrides - KDE="pt" - KOFFICE="pt" - OPENOFFICE="pt" - ;; - - ro) - # Romanian - LOCALIZATIONS="iceweasel kde" - ;; - - roa-es-val) - # Valencian (Spain) - LOCALIZATIONS="iceweasel" - ;; - - ru) - # Russian - LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice" - ;; - - rw) - # Kinarwanda - LOCALIZATIONS="kde openoffice" - ;; - - se) - # Northern Sami - LOCALIZATIONS="kde" - ;; - - sk) - # Slovak - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - sl) - # Slovenian - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - ;; - - sr-cs) - # Serbian - LOCALIZATIONS="kde koffice openoffice" - - # Overrides - KDE="sr" - KOFFICE="sr" - ;; - - sr-latin) - # Latin Serbian - LOCALIZATIONS="kde koffice" - - # Overrides - KDE="srlatin" - KOFFICE="srlatin" - ;; - - ss) - # Swazi - LOCALIZATIONS="kde openoffice" - ;; - - st) - # Southern_sotho - LOCALIZATIONS="openoffice" - ;; - - sv-se) - # Swedish - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - ICEDOVE="sv" - KDE="sv" - KOFFICE="sv" - OPENOFFICE="sv" - ;; - - ta-in) - # Tamil - LOCALIZATIONS="kde openoffice" - - # Overrides - KDE="ta" - ;; - - te-in) - # Telugu - LOCALIZATIONS="openoffice" - ;; - - tg) - # Tajik - LOCALIZATIONS="kde openoffice" - ;; - - th) - # Thai - LOCALIZATIONS="openoffice" - ;; - - tn) - # Tswana - LOCALIZATIONS="openoffice" - ;; - - tr) - # Turkish - LOCALIZATIONS="icedove iceweasel kde kofffice openoffice" - ;; - - ts) - # Tsonga - LOCALIZATIONS="openoffice" - ;; - - uk-ua) - # Ukrainian - LOCALIZATIONS="icedove iceweasel kde kofffice openoffice" - - # Overrides - ICEDOVE="uk" - KDE="uk" - KDE="uk" - OPENOFFICE="uk" - ;; - - uz) - # Uzbek - LOCALIZATIONS="kde" - ;; - - ve) - # Venda - LOCALIZATIONS="openoffice" - ;; - - vi) - # Vietnamese - LOCALIZATIONS="openoffice" - ;; - - xh) - # Xhosa - LOCALIZATIONS="openoffice" - ;; - - za) - # South African - LOCALIZATIONS="openoffice" - ;; - - zh-cn) - # Chinese (China) - LOCALIZATIONS="icedove iceweasel kde koffice openoffice" - - # Overrides - KDE="zhcn" - KOFFICE="zhcn" - ;; - - zh-tw) - # Chinese (Taiwan) - LOCALIZATIONS="iceweasel kde koffice openoffice" - - # Overrides - KDE="zhtw" - KOFFICE="zhtw" - ;; - - zu) - # Zulu - LOCALIZATIONS="openoffice" - ;; - esac - - # Setting languages - ICEAPE="${ICEAPE:-$LB_LANGUAGE}" - ICEDOVE="${ICEDOVE:-$LB_LANGUAGE}" - ICEWEASEL="${ICEWEASEL:-$LB_LANGUAGE}" - KDE="${KDE:-$LB_LANGUAGE}" - KOFFICE="${KOFFICE:-$LB_LANGUAGE}" - OPENOFFICE="${OPENOFFICE:-$LB_LANGUAGE}" - - # Setting packages - for LOCALIZATION in ${LOCALIZATIONS} - do - case "${LOCALIZATION}" in - iceape) - Check_installed chroot/usr/bin/iceape iceape; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEAPE}" - ;; - - icedove) - Check_installed chroot/usr/bin/icedove icedove - if [ $INSTALL_STATUS -eq 0 ] - then - Check_package "" icedove-l10n-"${ICEDOVE}" - fi - ;; - - iceweasel) - Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}" - ;; - - kde) - Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}" - ;; - - koffice) - Check_installed chroot/usr/bin/koconverter koffice; [ $INSTALL_STATUS -eq 0 ] && Check_package "" koffice-i18n-"${KOFFICE}" - ;; - - openoffice) - Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}" - ;; - esac - done - - Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n - - # Restoring cache - Restore_cache cache/packages_chroot - - # Installing packages - Install_package - - # Saving cache - Save_cache cache/packages_chroot - - # Creating stage file - Create_stagefile .stage/chroot_localization -fi diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 300b091cf..b91182dbb 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -87,7 +87,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--iso-volume NAME]\n\ \t [--jffs2-eraseblock SIZE]\n\ \t [--keyring-packages PACKAGE|\"PACKAGES\"]\n\ -\t [-l|--language LANGUAGE]\n\ \t [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\ \t [--linux-packages \"PACKAGES\"]\n\ \t [--losetup losetup|losetup.orig]\n\ @@ -156,7 +155,7 @@ Local_arguments () mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:, archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, - gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:, + gzip-options:,hooks:,interactive:,keyring-packages:,linux-flavours:,linux-packages:, package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:, apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:, debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:, @@ -540,11 +539,6 @@ Local_arguments () shift 2 ;; - -l|--language) - LB_LANGUAGE="${2}" - shift 2 - ;; - -k|--linux-flavours) LB_LINUX_FLAVOURS="${2}" shift 2 @@ -1168,10 +1162,6 @@ LB_INTERACTIVE="${LB_INTERACTIVE}" # (Default: empty) LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES}" -# \$LB_LANGUAGE: set language to use -# (Default: empty) -LB_LANGUAGE="${LB_LANGUAGE}" - # \$LB_LINUX_FLAVOURS: set kernel flavour to use # (Default: autodetected) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}" -- cgit v1.2.3