Author: wookey
Date: 2008-06-05 15:03:52 +0100 (Thu, 05 Jun 2008)
New Revision: 490
Added:
balloon/trunk/rootfs/emdebian/machine/balloon3/default/
balloon/trunk/rootfs/emdebian/machine/balloon3/default/config.sh
balloon/trunk/rootfs/emdebian/machine/balloon3/default/packages.conf
balloon/trunk/rootfs/emdebian/machine/balloon3/default/setup.sh
Removed:
balloon/trunk/rootfs/emdebian/machine/balloon3/config.sh
balloon/trunk/rootfs/emdebian/machine/balloon3/packages.conf
balloon/trunk/rootfs/emdebian/machine/balloon3/setup.sh
Log:
use default as machine variant and put script files in the right place
Deleted: balloon/trunk/rootfs/emdebian/machine/balloon3/config.sh
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/config.sh 2008-06-03 16:37:22 UTC (rev 489)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/config.sh 2008-06-05 14:03:52 UTC (rev 490)
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# This config script provides a method of adjusting the tarball
-# contents immediately after the second stage install has completed.
-# The script is copied into the tarball and unpacked to:
-# $TARGET/machine/config.sh
-
-# NOTE: At this stage, the ./debootstrap/ directory has already been
-# removed. Do not rely on the tarball itself being available either.
-# If any other files or scripts are needed by your additions to this
-# script, you must ensure that setup.sh includes them into the tarball.
-
-# It may be easier to create a normal Debian package that can do the
-# job for you.
-
-# This example file can act as a skeleton for your own scripts.
-# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
-# ($WORK is your emdebian working directory, as set in debconf.)
-# Use 'default' as the variant directory if no other variants exist.
-# config.sh does not have to be executable.
Copied: balloon/trunk/rootfs/emdebian/machine/balloon3/default/config.sh (from rev 488, balloon/trunk/rootfs/emdebian/machine/balloon3/config.sh)
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/default/config.sh (rev 0)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/default/config.sh 2008-06-05 14:03:52 UTC (rev 490)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# This config script provides a method of adjusting the tarball
+# contents immediately after the second stage install has completed.
+# The script is copied into the tarball and unpacked to:
+# $TARGET/machine/config.sh
+
+# NOTE: At this stage, the ./debootstrap/ directory has already been
+# removed. Do not rely on the tarball itself being available either.
+# If any other files or scripts are needed by your additions to this
+# script, you must ensure that setup.sh includes them into the tarball.
+
+# It may be easier to create a normal Debian package that can do the
+# job for you.
+
+# This example file can act as a skeleton for your own scripts.
+# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
+# ($WORK is your emdebian working directory, as set in debconf.)
+# Use 'default' as the variant directory if no other variants exist.
+# config.sh does not have to be executable.
Copied: balloon/trunk/rootfs/emdebian/machine/balloon3/default/packages.conf (from rev 488, balloon/trunk/rootfs/emdebian/machine/balloon3/packages.conf)
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/default/packages.conf (rev 0)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/default/packages.conf 2008-06-05 14:03:52 UTC (rev 490)
@@ -0,0 +1,77 @@
+# This is a standard shell conf file, included directly into embootstrap
+
+# This example file can act as a skeleton for your own scripts.
+# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
+# ($WORK is your emdebian working directory, as set in debconf.)
+# Use 'default' as the variant directory if no other variants exist.
+
+# packages.conf is intended to be the principal place for adjusting
+# the emsandbox tarball to suit the needs of specific machine variants.
+# setup.sh and config.sh can fine tune the results but in order to avoid
+# reinventing the wheel, if more than a few machines need similar
+# adjustments to the same files, future versions of packages.conf will
+# collate those into a single configuration parameter available to all.
+# More options and parameters will be added in due course, including
+# support for additional sources for /etc/apt/sources.list and single
+# parameter changes to certain files like /etc/inittab.
+
+# Due to limitations in the current debootstrap support, the only way
+# of adding packages to the first stage is by providing a
+# customised suite script. Even if emsandbox migrates to using a tool
+# from Stag to overcome shortcomings in debootstrap, support for
+# packages.conf, setup.sh and config.sh will remain.
+
+# INCLUDE adds a comma separated list of package names to the list
+# of packages added to the tarball and installed in the second stage.
+# Currently, debootstrap has problems with multiple repositories so
+# either upload this package to the same repository as your other
+# packages or create an apt-proxy that can serve as a local repository,
+# set it in PROXY and specify a usable mirror for the device in MIRROR.
+# DEFAULT: empty
+INCLUDE=
+
+# SCRIPT overrides the default emsandbox suite-script that debootstrap
+# uses to determine the base and required packages and the all important
+# sequence in which the packages can be installed. SCRIPT can be overridden
+# on the emsandbox command line.
+# DEFAULT: /usr/lib/emdebian-tools/emdebian.crossd
+SCRIPT=
+
+# MIRROR overrides the default emsandbox mirror. This repository will
+# will be set in /etc/apt/sources.list and will also be used by
+# debootstrap to obtain all packages for the tarball unless
+# PROXY is also set.
+# DEFAULT:
http://buildd.emdebian.org/emdebian/
+MIRROR=
+
+# PROXY specifies a separate repository to pass to debootstrap that may
+# be local or otherwise not intended for use once the tarball is installed
+# Use MIRROR to set the same value in debootstrap and /etc/apt/sources.list
+# If PROXY is specified without MIRROR, the default emsandbox MIRROR will
+# be written into /etc/apt/sources.list
+# DEFAULT: empty
+PROXY=
+
+# It is often useful to include a kernel image and/or modules or extra
+# files but these may be in generated or variable paths - e.g. including
+# a version string or in another part of the filesystem. To include these
+# files in the emsandbox tarball, write out a list of paths into a file in
+# $WORK/machine/$MACHINE/$VARIANT and read the contents into the
+# setup.sh script. The files copied or unpacked into the $BUILDPLACE
+# will then be included into the tarball.
+
+# If there are extra files with absolute paths that do not change
+# between releases, specify them in EXTRA. Absolute paths only -
+# wildcards supported by 'cp' are allowed. Files are copied into
+# $BUILDPLACE unchanged to be processed by setup.sh (if it exists).
+EXTRA=
+
+# TARBALL_NAME overrides the default name (emdebian-$ARCH) of the tarball
+# Do not specify a path here, just a filename with the .tgz suffix
+# DEFAULT: emdebian-$ARCH.tgz where $ARCH is specified to emsandbox or
+# as the dpkg-cross default architecture.
+TARBALL_NAME=emdebianstage1.tgz
+
+# SUITE is not recommended to be changed.
+# DEFAULT: unstable
+SUITE=
Copied: balloon/trunk/rootfs/emdebian/machine/balloon3/default/setup.sh (from rev 488, balloon/trunk/rootfs/emdebian/machine/balloon3/setup.sh)
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/default/setup.sh (rev 0)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/default/setup.sh 2008-06-05 14:03:52 UTC (rev 490)
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+# This setup script is an alternative method of adjusting the tarball
+# contents immediately after the first stage install has completed.
+# It may be easier to create a normal Debian package that can do the
+# job for you. (Remember to use the postinst if you want to append
+# to existing files instead of replacing the emsandbox versions.
+
+# The script is called by embootstrap with the following arguments:
+
+# $1 = $BUILDPLACE - the top directory of the debootstrapped system
+# $2 = $ARCH - the specified architecture, already checked with dpkg-architecture.
+
+# This example file can act as a skeleton for your own scripts.
+# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
+# ($WORK is your emdebian working directory, as set in debconf.)
+# Use 'default' as the variant directory if no other variants exist.
+# setup.sh does not have to be executable.
+
+# Use any other scripts or files that you need for first stage install.
+# To use any of those scripts or files in the second stage, ensure
+# that this script copies the relevant files into the tarball at
+# /machine/$MACHINE/$VARIANT/
+
+# e.g. To pass the location of a kernel or other files to be added to the
+# tarball, write out a file into $WORK/machine/$MACHINE/$VARIANT and
+# read the contents into this script.
+
+# Nothing to do by default.
Deleted: balloon/trunk/rootfs/emdebian/machine/balloon3/packages.conf
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/packages.conf 2008-06-03 16:37:22 UTC (rev 489)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/packages.conf 2008-06-05 14:03:52 UTC (rev 490)
@@ -1,63 +0,0 @@
-# This is a standard shell conf file, included directly into embootstrap
-
-# This example file can act as a skeleton for your own scripts.
-# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
-# ($WORK is your emdebian working directory, as set in debconf.)
-# Use 'default' as the variant directory if no other variants exist.
-
-# packages.conf is intended to be the principal place for adjusting
-# the emsandbox tarball to suit the needs of specific machine variants.
-# setup.sh and config.sh can fine tune the results but in order to avoid
-# reinventing the wheel, if more than a few machines need similar
-# adjustments to the same files, future versions of packages.conf will
-# collate those into a single configuration parameter available to all.
-# More options and parameters will be added in due course, including
-# support for additional sources for /etc/apt/sources.list and single
-# parameter changes to certain files like /etc/inittab.
-
-# Due to limitations in the current debootstrap support, the only way
-# of adding packages to the first stage is by providing a
-# customised suite script. Even if emsandbox migrates to using a tool
-# from Stag to overcome shortcomings in debootstrap, support for
-# packages.conf, setup.sh and config.sh will remain.
-
-# INCLUDE adds a comma separated list of package names to the list
-# of packages added to the tarball and installed in the second stage.
-# Currently, debootstrap has problems with multiple repositories so
-# either upload this package to the same repository as your other
-# packages or create an apt-proxy that can serve as a local repository,
-# set it in PROXY and specify a usable mirror for the device in MIRROR.
-# DEFAULT: empty
-INCLUDE=
-
-# SCRIPT overrides the default emsandbox suite-script that debootstrap
-# uses to determine the base and required packages and the all important
-# sequence in which the packages can be installed. SCRIPT can be overridden
-# on the emsandbox command line.
-# DEFAULT: /usr/lib/emdebian-tools/emdebian.crossd
-SCRIPT=
-
-# MIRROR overrides the default emsandbox mirror. This repository will
-# will be set in /etc/apt/sources.list and will also be used by
-# debootstrap to obtain all packages for the tarball unless
-# PROXY is also set.
-# DEFAULT:
http://buildd.emdebian.org/emdebian/
-MIRROR=
-
-# PROXY specifies a separate repository to pass to debootstrap that may
-# be local or otherwise not intended for use once the tarball is installed
-# Use MIRROR to set the same value in debootstrap and /etc/apt/sources.list
-# If PROXY is specified without MIRROR, the default emsandbox MIRROR will
-# be written into /etc/apt/sources.list
-# DEFAULT: empty
-PROXY=
-
-# TARBALL_NAME overrides the default name (emdebian-$ARCH) of the tarball
-# Do not specify a path here, just a filename with the .tgz suffix
-# DEFAULT: emdebian-$ARCH.tgz where $ARCH is specified to emsandbox or
-# as the dpkg-cross default architecture.
-TARBALL_NAME=
-
-# SUITE is not recommended to be changed.
-# DEFAULT: unstable
-SUITE=
Deleted: balloon/trunk/rootfs/emdebian/machine/balloon3/setup.sh
===================================================================
--- balloon/trunk/rootfs/emdebian/machine/balloon3/setup.sh 2008-06-03 16:37:22 UTC (rev 489)
+++ balloon/trunk/rootfs/emdebian/machine/balloon3/setup.sh 2008-06-05 14:03:52 UTC (rev 490)
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-# This setup script is an alternative method of adjusting the tarball
-# contents immediately after the first stage install has completed.
-# It may be easier to create a normal Debian package that can do the
-# job for you. (Remember to use the postinst if you want to append
-# to existing files instead of replacing the emsandbox versions.
-
-# The script is called by embootstrap with the following arguments:
-
-# $1 = $BUILDPLACE - the top directory of the debootstrapped system
-# $2 = $ARCH - the specified architecture, already checked with dpkg-architecture.
-
-# This example file can act as a skeleton for your own scripts.
-# Copy into $WORK/machine/$MACHINE/$VARIANT/ and edit.
-# ($WORK is your emdebian working directory, as set in debconf.)
-# Use 'default' as the variant directory if no other variants exist.
-# setup.sh does not have to be executable.
-
-# Use any other scripts or files that you need for first stage install.
-# To use any of those scripts or files in the second stage, ensure
-# that this script copies the relevant files into the tarball at
-# /machine/$MACHINE/$VARIANT/
-
-# Nothing to do by default.
(text/plain)