[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 5bc237d4ca26631f451621ea43b90c3d599290f2
Steffen Moeller
moeller at debian.org
Sun Mar 6 21:24:23 UTC 2011
The following commit has been merged in the master branch:
commit 5bc237d4ca26631f451621ea43b90c3d599290f2
Merge: 1bf80470cdc5fd3b1bf5d6d11b11edb6f1de2a97 94ea5f97efa6be2e5b49e4004a294858885e7f23
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Mar 6 22:23:22 2011 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-fso/files
diff --combined install.sh
index 63563e6,6558de6..e6a963b
--- a/install.sh
+++ b/install.sh
@@@ -99,7 -99,7 +99,7 @@@ intern_no_partitioning="
CDEBOOTSTRAP_FLAVOUR=minimal
DEBOOTSTRAP_VARIANT=minbase
CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.7_armel.deb
-DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.26_all.deb
+DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.28_all.deb
CDEBOOTSTRAP_EXTRA_PACKAGES=
DEBOOTSTRAP_EXTRA_PACKAGES=install-info
# This gets passed to boot strappers. currently not used
@@@ -303,31 -303,34 +303,34 @@@ ENVIRONMEN
To influence the program's behaviour, set the following
environment variables or leave the default values.
- APT_OPTIONS extra parameters sent to apt for installing packages
- (set to '$APT_OPTIONS').
- HOSTNAME the name of the machine (set to '$HOSTNAME')
- SD_DEVICE the character device to access the microSD card
- (set to '$SD_DEVICE')
- SD_SYS_BLK the directory under /sys/block that refers to the microSD card
- (set to '$SD_SYS_BLK', or derived from the value of SD_DEVICE)
- SD_PART1_FS the filesystem for the first microSD card partition,
- i.e. the one containing the uImage.bin (set to
- '$SD_PART1_FS', possible values are ext2/vfat,
- also ext3 when using Qi as bootloader)
- SD_PART1_SIZE number of megabytes for first partition (set to '$SD_PART1_SIZE')
- SD_SWAP_SIZE number of megabytes of swap partition (set to '$SD_SWAP_SIZE')
- INST_DIR the directory where the microSD card partitions
- will be mounted to (set to '$INST_DIR')
- INST_MIRROR the Debian mirror used during installation, it
- should be set to a mirror nearby that carries armel
- binaries for unstable and experimental (set to
- '$INST_MIRROR')
- LOCALEPURGE Set to 'true' iff the package of the same name shall
- be installed. It reduces disk space enormously,
- but needs user interaction for the install (set to
- '$LOCALEPURGE').
- APT_RECOMMENDS control if APT should install recommends by default
- (set to '$APT_RECOMMENDS', possible values are false/true)
+ APT_OPTIONS extra parameters sent to apt for installing packages (set
+ to '$APT_OPTIONS').
+ HOSTNAME the name of the machine (set to '$HOSTNAME').
+ SD_DEVICE the character device to access the microSD card (set to
+ '$SD_DEVICE').
+ SD_SYS_BLK the directory under /sys/block that refers to the microSD
+ card (set to '$SD_SYS_BLK', or derived from the
+ value of SD_DEVICE).
+ SD_PART1_FS the filesystem for the first microSD card partition, i.e.
+ the one containing the uImage.bin (set to '$SD_PART1_FS', possible
+ values are ext2/vfat, also ext3 when using Qi as
+ bootloader).
+ SD_PART1_SIZE
+ number of megabytes for first partition (set to '$SD_PART1_SIZE').
+ SD_SWAP_SIZE
+ number of megabytes of swap partition (set to '$SD_SWAP_SIZE').
+ INST_DIR the directory where the microSD card partitions will be
+ mounted to (set to '$INST_DIR').
+ INST_MIRROR the Debian mirror used during installation, it should be
+ set to a mirror nearby that carries armel binaries for
+ unstable and experimental (set to
+ '$INST_MIRROR').
+ LOCALEPURGE set this to true, if you want to install the package of the
+ same name. It reduces disk space enormously, but needs user
+ interaction for the install (set to '$LOCALEPURGE').
+ APT_RECOMMENDS
+ control if APT should install recommends by default (set to
+ '$APT_RECOMMENDS', possible values are false/true).
BOOTSTRAPPER determines the bootstrapper to use, should be set to
deboostrap or cdebootstrap - cdebootstrap is somewhat
faster and you may have to "opkg install perl", but it
@@@ -335,38 -338,41 +338,41 @@@
For debootstrap please do not run anything besides
install.sh as you will need all your memory.
CDEBOOTSTRAP_EXTRA_FLAGS
- Parameters to be added to invocation of cdebootstrap,
- only active if BOOTSTRAPPER is not set to debootstrap.
- DASH_BINSH configure dash as default /bin/sh (set to '$DASH_BINSH',
- possible values are true/false)
+ parameters to be added to invocation of cdebootstrap, only
+ active if BOOTSTRAPPER is not set to debootstrap.
+ DASH_BINSH configure dash as default /bin/sh (set to '$DASH_BINSH', possible
+ values are true/false).
DEBOOTSTRAP_EXTRA_FLAGS
- Parameters to be added to invocation of debootstrap,
- only active if BOOTSTRAPPER is not set to cdebootstrap.
+ parameters to be added to invocation of debootstrap, only
+ active if BOOTSTRAPPER is not set to cdebootstrap.
FSO_MIRROR the Debian freesmartphone.org repository (set to
- '$FSO_MIRROR')
- FSO_DEVICE the device the installation is being performed on
- (set to '$FSO_DEVICE', default to autodetection,
- possible values are gta01/gta02)
- QI if you use Qi bootloader set this to true
- (set to '$QI')
- QI_VERBOSE_BOOT set this to true if you want to see the kernel messages
- do this only when QI=true (set to '$QI_VERBOSE_BOOT')
- RDATEHOST machine with which to sync against with ntp (set to $RDATEHOST)
- SINGLE_PART set this to true if only one partition should be created
- this is true by default for QI=true and false if SD_PART1_FS=vfat
- (set to '$SINGLE_PART')
+ '$FSO_MIRROR').
+ FSO_DEVICE the device the installation is being performed on (set to
+ '$FSO_DEVICE', default to autodetection, possible values are
+ gta01/gta02).
+ QI if you use Qi bootloader set this to true (set to '$QI').
+ QI_VERBOSE_BOOT
+ set this to true if you want to see the kernel messages; do
+ this only when QI=true (set to '$QI_VERBOSE_BOOT').
+ RDATEHOST machine with which to sync against with ntp (set to
+ '$RDATEHOST').
+ SINGLE_PART set this to true if only one partition should be created;
+ this is true by default for QI=true and false if
+ SD_PART1_FS=vfat (set to '$SINGLE_PART').
TRAYER name of package to fill the menu bar, supported are
- 'trayer' and 'stalonetray' (set to '$TRAYER')
+ 'trayer' and 'stalonetray' (set to '$TRAYER').
TESTHOST name of machine that should be tested for availability
- (set to '$TESTHOST')
+ (set to '$TESTHOST').
VERBOSE increase amount of information that is forwarded to stdout
- DISPLAY_MANAGER choose the Display Manager to be installed
- (default to nodm, possible values are any *dm
- package in the Debian archive, which could require
- a LOT of disk space; set to none if you do not
- want a Display Manager)
- ZHONE set this to true to install the Zhone GUI (set to '$ZHONE')
- ROOT_PASSWORD the password for the root account (set to '$ROOT_PASSWORD')
+ (set to '$VERBOSE').
+ DISPLAY_MANAGER
+ choose the Display Manager to be installed (default to
+ '$DISPLAY_MANAGER', possible values are any *dm package in the Debian
+ archive, which could require a LOT of disk space; set this
+ to none if you do not want a Display Manager).
+ ZHONE set this to true to install the Zhone GUI (set to '$ZHONE').
+ ROOT_PASSWORD
+ the password for the root account (set to '$ROOT_PASSWORD').
Stages:
--
Various non-packaged files
More information about the pkg-fso-commits
mailing list