From: Michael Tremer Date: Sat, 10 Apr 2010 14:43:03 +0000 (+0200) Subject: Merge branch 'installer-v2' X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ba4ef5f5afa90389ee3fe22d208335bac4fe15a;p=ipfire-3.x.git Merge branch 'installer-v2' Conflicts: lfs/python-parted lfs/wireless-tools pkgs/core/pomona/src/autopart.py pkgs/core/pomona/src/backend.py pkgs/core/pomona/src/bootloader.py pkgs/core/pomona/src/cryptodev.py pkgs/core/pomona/src/dmraid.py pkgs/core/pomona/src/errors.py pkgs/core/pomona/src/flags.py pkgs/core/pomona/src/fsset.py pkgs/core/pomona/src/installer.py pkgs/core/pomona/src/instdata.py pkgs/core/pomona/src/isys/devices.c pkgs/core/pomona/src/isys/devices.h pkgs/core/pomona/src/isys/eddsupport.c pkgs/core/pomona/src/isys/eddsupport.h pkgs/core/pomona/src/isys/ethtool.c pkgs/core/pomona/src/isys/imount.c pkgs/core/pomona/src/isys/imount.h pkgs/core/pomona/src/isys/isofs.c pkgs/core/pomona/src/isys/lang.c pkgs/core/pomona/src/isys/lang.h pkgs/core/pomona/src/isys/linkdetect.c pkgs/core/pomona/src/isys/net.h pkgs/core/pomona/src/isys/smp.c pkgs/core/pomona/src/isys/smp.h pkgs/core/pomona/src/isys/str.c pkgs/core/pomona/src/isys/str.h pkgs/core/pomona/src/isys/stubs.h pkgs/core/pomona/src/isys/sundries.h pkgs/core/pomona/src/isys/vio.c pkgs/core/pomona/src/isys/wireless.c pkgs/core/pomona/src/isys/wireless.h pkgs/core/pomona/src/iutil.py pkgs/core/pomona/src/keyboard_models.py pkgs/core/pomona/src/lvm.py pkgs/core/pomona/src/network.py pkgs/core/pomona/src/packages.py pkgs/core/pomona/src/pakfireinstall.py pkgs/core/pomona/src/partErrors.py pkgs/core/pomona/src/partIntfHelpers.py pkgs/core/pomona/src/partRequests.py pkgs/core/pomona/src/partedUtils.py pkgs/core/pomona/src/partitioning.py pkgs/core/pomona/src/partitions.py pkgs/core/pomona/src/pomona_log.py pkgs/core/pomona/src/raid.py pkgs/core/pomona/src/scripts/getlangnames.py pkgs/core/pomona/src/timezone.py pkgs/core/pomona/src/tui.py pkgs/core/pomona/src/tui_bootloader.py pkgs/core/pomona/src/tui_complete.py pkgs/core/pomona/src/tui_confirm.py pkgs/core/pomona/src/tui_keyboard.py pkgs/core/pomona/src/tui_language.py pkgs/core/pomona/src/tui_network.py pkgs/core/pomona/src/tui_partition.py pkgs/core/pomona/src/tui_progress.py pkgs/core/pomona/src/tui_timezone.py pkgs/core/pomona/src/tui_userauth.py pkgs/core/pomona/src/tui_welcome.py pkgs/core/pomona/src/users.py pkgs/core/pomona/src/zonetab.py src/pomona/Makefile.inc src/pomona/isys/Makefile src/pomona/isys/imount.c src/pomona/isys/mount.c src/pomona/pomona src/rootfiles/core/python-parted --- 1ba4ef5f5afa90389ee3fe22d208335bac4fe15a diff --cc .gitignore index ac3bb8ebb,690c03f99..88d967589 --- a/.gitignore +++ b/.gitignore @@@ -11,5 -15,5 +11,6 @@@ /*.diff /*.iso /*.tar.gz +*.py[co] *~ + *.py[co] diff --cc pkgs/core/pomona/src/Makefile.inc index 998fae836,2d0731b79..2878d110c --- a/pkgs/core/pomona/src/Makefile.inc +++ b/pkgs/core/pomona/src/Makefile.inc @@@ -18,14 -18,9 +18,9 @@@ # # ############################################################################### - ## Name of this program - # - PNAME = Pomona - PSNAME = pomona - DESTDIR=$(INSTALLER_DIR) -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALLNLSDIR = $(DESTDIR)/usr/share/locale diff --cc pkgs/core/pomona/src/datastore.py index 000000000,eed9fa7db..eed9fa7db mode 000000,100644..100644 --- a/pkgs/core/pomona/src/datastore.py +++ b/pkgs/core/pomona/src/datastore.py diff --cc pkgs/core/pomona/src/isys/mount.h index 000000000,b50532264..b50532264 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/isys/mount.h +++ b/pkgs/core/pomona/src/isys/mount.h diff --cc pkgs/core/pomona/src/keyboard.py index 000000000,304462695..304462695 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/keyboard.py +++ b/pkgs/core/pomona/src/keyboard.py diff --cc pkgs/core/pomona/src/language.py index 000000000,bdbe5d4b1..bdbe5d4b1 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/language.py +++ b/pkgs/core/pomona/src/language.py diff --cc pkgs/core/pomona/src/log.py index 000000000,aee3e5d5f..aee3e5d5f mode 000000,100644..100644 --- a/pkgs/core/pomona/src/log.py +++ b/pkgs/core/pomona/src/log.py diff --cc pkgs/core/pomona/src/partition.py index 000000000,3acd670ab..3acd670ab mode 000000,100644..100644 --- a/pkgs/core/pomona/src/partition.py +++ b/pkgs/core/pomona/src/partition.py diff --cc pkgs/core/pomona/src/pomona index 1e991d0c3,5d25cf92e..75c9ce52c --- a/pkgs/core/pomona/src/pomona +++ b/pkgs/core/pomona/src/pomona @@@ -25,10 -25,15 +25,10 @@@ # # ############################################################################### -echo "Running the Pomona Text Installer..." -echo -n "Loading modules:" -for i in md_mod dm_mod ext3 ext4 xfs reiserfs reiser4 btrfs; do - echo -n " $i" - modprobe $i -done -echo # Newline +echo "Running the Pomona Installer..." - python /usr/lib/pomona/installer.py $@ + python /usr/lib/pomona/pomona.py $@ +ret=$? for i in $@; do if [ "$i" == "--debug" ]; then diff --cc pkgs/core/pomona/src/pomona.py index 000000000,9348d2555..9348d2555 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/pomona.py +++ b/pkgs/core/pomona/src/pomona.py diff --cc pkgs/core/pomona/src/text.py index 000000000,271931116..271931116 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/text.py +++ b/pkgs/core/pomona/src/text.py diff --cc pkgs/core/pomona/src/util.py index 000000000,e9afb4d8b..e9afb4d8b mode 000000,100644..100644 --- a/pkgs/core/pomona/src/util.py +++ b/pkgs/core/pomona/src/util.py diff --cc pkgs/core/pomona/src/windows.py index 000000000,5fbc81955..5fbc81955 mode 000000,100644..100644 --- a/pkgs/core/pomona/src/windows.py +++ b/pkgs/core/pomona/src/windows.py diff --cc tools/py-compile index 096c3d623,000000000..66c33edfe mode 100755,000000..100755 --- a/tools/py-compile +++ b/tools/py-compile @@@ -1,48 -1,0 +1,48 @@@ +#!/bin/sh + +PYTHON=$(which python 2>/dev/null) + +if [ -z "${PYTHON}" ]; then + # Python is not present. Fail silently. + exit 0 +fi + +files="" +for i in $*; do + if [ -e ${i}c ] && [ -e ${i}o ]; then + continue # all files we want are already there + fi + files="$files $i" +done + +if [ -z "${files}" ]; then + # No files need to be proceeded. + exit 0 +fi + +$PYTHON -c " +import sys, os, string, py_compile + +files = '''$files''' +print 'Byte-compiling python modules...' +for file in string.split(files): - if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): ++ if not os.path.exists(file) or not (len(file) >= 3 and file[-3:] == '.py'): + continue + print file, + sys.stdout.flush() - py_compile.compile(path) ++ py_compile.compile(file) +print" || exit $? + +# this will fail for python < 1.5, but that doesn't matter ... +$PYTHON -O -c " +import sys, os, string, py_compile + +files = '''$files''' +print 'Byte-compiling python modules (optimised versions) ...' +for file in string.split(files): - if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): ++ if not os.path.exists(file) or not (len(file) >= 3 and file[-3:] == '.py'): + continue + print file, + sys.stdout.flush() - py_compile.compile(path) ++ py_compile.compile(file) +print" 2>/dev/null || :