[Debian-NP-Commits] r242 - people/vagrant/simple-cdd
Vagrant Cascadian
debian-np-devel@lists.alioth.debian.org
Thu, 25 Nov 2004 13:27:29 -0700
Author: vagrant-guest
Date: Thu Nov 25 13:27:24 2004
New Revision: 242
Modified:
people/vagrant/simple-cdd/CONF.sh
people/vagrant/simple-cdd/build-simple-cdd
Log:
use most defaults from debian-cd CONF.sh, fix typo.
Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh (original)
+++ people/vagrant/simple-cdd/CONF.sh Thu Nov 25 13:27:24 2004
@@ -2,295 +2,26 @@
# This file will have to be sourced where needed
#
-# Unset all optional variables first to start from a clean state
-unset_vars="TASK SIZELIMIT"
+# see /usr/share/debian-cd/CONF.sh to get a more complete list and description
+# of available variables
+
+# path to simple-cdd files
+simple_cdd_path=$(pwd)
+
+# location of debian-cd files
+debian_cd_dir=/usr/share/debian-cd
+#debian_cd_dir=$simple_cdd_path/debian-cd
+
+# get default values for most things
+. $debian_cd_dir/CONF.sh
+
+# Unset some additional optional variables first to start from a clean state
+unset_vars="TASK SIZELIMIT EXCLUDE UNEXCLUDE2"
for var in $unset_vars ; do
unset $var || true
done
-unset NONUS || true
-unset FORCENONUSONCD1 || true
-unset NONFREE || true
-unset CONTRIB || true
-unset EXTRANONFREE || true
-unset LOCAL || true
-unset LOCALDEBS || true
-unset SECURED || true
-unset SECURITY || true
-unset BOOTDIR || true
-unset BOOTDISKS || true
-unset SYMLINK || true
-unset COPYLINK || true
-unset MKISOFS || true
-unset MKISOFS_OPTS || true
-unset ISOLINUX || true
-unset EXCLUDE || true
-unset SRCEXCLUDE || true
-unset NORECOMMENDS || true
-unset NOSUGGESTS || true
-unset DOJIGDO || true
-unset JIGDOCMD || true
-unset JIGDOTEMPLATEURL || true
-unset JIGDOFALLBACKURLS || true
-unset JIGDOINCLUDEURLS || true
-unset JIGDOSCRIPT || true
-unset DEFBINSIZE || true
-unset DEFSRCSIZE || true
-unset FASTSUMS || true
-unset PUBLISH_URL || true
-unset PUBLISH_NONUS_URL || true
-unset PUBLISH_PATH || true
-unset UDEB_INCLUDE || true
-unset UDEB_EXCLUDE || true
-unset BASE_INCLUDE || true
-unset BASE_EXCLUDE || true
-unset INSTALLER_CD || true
-unset DI_CODENAME || true
-unset MAXCDS || true
-unset SPLASHPNG || true
-
-# The debian-cd dir
-# Where I am (hoping I'm in the debian-cd dir)
-export BASEDIR=/usr/share/debian-cd
-
-# Building sarge cd set ...
-export CODENAME=sarge
-
-# By default use Debian installer packages from $CODENAME
-if [ ! "$DI_CODENAME" ]
-then
- export DI_CODENAME=$CODENAME
-fi
-
-# If set, controls where the d-i components are downloaded from.
-# This may be an url, or "default", which will make it use the default url
-# for the daily d-i builds. If not set, uses the official d-i images from
-# the Debian mirror.
-#export DI_WWW_HOME=default
-
-# Version number, "2.2 r0", "2.2 r1" etc.
-export DEBVERSION="3.1"
-
-# Official or non-official set.
-# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
-# ON THE OFFICIAL DEBIAN CD WEBSITE http://cdimage.debian.org
-export OFFICIAL="Unofficial"
-#export OFFICIAL="Official"
-#export OFFICIAL="Official Beta"
-
-# ... for arch
-export ARCH=`dpkg --print-installation-architecture`
-
-# IMPORTANT : The 4 following paths must be on the same partition/device.
-# If they aren't then you must set COPYLINK below to 1. This
-# takes a lot of extra room to create the sandbox for the ISO
-# images, however. Also, if you are using an NFS partition for
-# some part of this, you must use this option.
-# Paths to the mirrors
-export MIRROR=/ftp/debian
-
-# Comment the following line if you don't have/want non-US
-#export NONUS=/ftp/debian-non-US
-
-# And this option will make you 2 copies of CD1 - one with all the
-# non-US packages on it, one with none. Useful if you're likely to
-# need both.
-#export FORCENONUSONCD1=1
-
-# Path of the temporary directory
-export TDIR=/ftp/tmp
-
-# Path where the images will be written
-export OUT=/rack/debian-cd
-
-# Where we keep the temporary apt stuff.
-# This cannot reside on an NFS mount.
-export APTTMP=/ftp/tmp/apt
-
-# Do I want to have NONFREE merged in the CD set
-# export NONFREE=1
-
-# Do I want to have CONTRIB merged in the CD set
-export CONTRIB=1
-
-# Do I want to have NONFREE on a separate CD (the last CD of the CD set)
-# WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
-# export EXTRANONFREE=1
-
-# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with
-# local packages that you want to put on the CD set then
-# uncomment the following line
-# export LOCAL=1
-
-# If your local packages are not under $MIRROR, but somewhere else,
-# you can uncomment this line and edit to to point to a directory
-# containing dists/$CODENAME/local/binary-$ARCH
-# export LOCALDEBS=/home/joey/debian/va/debian
-
-# If you want a <codename>-secured tree with a copy of the signed
-# Release.gpg and files listed by this Release file, then
-# uncomment this line
-# export SECURED=1
-
-# Where to find the security patches. This directory should be the
-# top directory of a security.debian.org mirror.
-#export SECURITY="$TOPDIR"/debian/debian-security
-
-# Sparc only : bootdir (location of cd.b and second.b)
-# export BOOTDIR=/boot
-
-# Symlink farmers should uncomment this line :
-# export SYMLINK=1
-
-# Use this to force copying the files instead of symlinking or hardlinking
-# them. This is useful if your destination directories are on a different
-# partition than your source files.
-# export COPYLINK=1
-
-# Options
-# export MKISOFS=/usr/bin/mkisofs
-# export MKISOFS_OPTS="-r" #For normal users
-# export MKISOFS_OPTS="-r -F ." #For symlink farmers
-
-# ISOLinux support for multiboot on CD1 for i386
-export ISOLINUX=1
-
-# uncomment this to if you want to see more of what the Makefile is doing
-#export VERBOSE_MAKE=1
-
-# uncoment this to make build_all.sh try to build a simple CD image if
-# the proper official CD run does not work
-#ATTEMPT_FALLBACK=yes
-
-# Set your disk size here in MB. Used in calculating package and
-# source file layouts in build.sh and build_all.sh. Defaults are for
-# CD-R, try ~4600 for DVD-R.
-export DEFBINSIZE=630
-export DEFSRCSIZE=635
-
-# We don't want certain packages to take up space on CD1...
-#export EXCLUDE="$BASEDIR"/tasks/exclude-sarge
-# ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)
-#export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge
-# Any packages listed in EXCLUDE but not in any UNEXCLUDE will be
-# excluded completely.
-
-# We also exclude some source packages
-#export SRCEXCLUDE="$BASEDIR"/tasks/exclude-src-potato
-
-# Set this if the recommended packages should be skipped when adding
-# package on the CD. The default is 'false'.
-export NORECOMMENDS=1
-
-# Set this if the suggested packages should be skipped when adding
-# package on the CD. The default is 'true'.
-#export NOSUGGESTS=1
-
-# Produce jigdo files:
-# 0/unset = Don't do jigdo at all, produce only the full iso image.
-# 1 = Produce both the iso image and jigdo stuff.
-# 2 = Produce ONLY jigdo stuff by piping mkisofs directly into jigdo-file,
-# no temporary iso image is created (saves lots of disk space).
-# NOTE: The no-temp-iso will not work for (at least) alpha and powerpc
-# since they need the actual .iso to make it bootable. For these archs,
-# the temp-iso will be generated, but deleted again immediately after the
-# jigdo stuff is made; needs temporary space as big as the biggest image.
-#export DOJIGDO=2
-#
-# jigdo-file command & options
-# Note: building the cache takes hours, so keep it around for the next run
-#export JIGDOCMD="/usr/local/bin/jigdo-file --cache=$HOME/jigdo-cache.db"
-#
-# HTTP/FTP URL for directory where you intend to make the templates
-# available. You should not need to change this; the default value ""
-# means "template in same dir as the .jigdo file", which is usually
-# correct. If it is non-empty, it needs a trailing slash. "%ARCH%"
-# will be substituted by the current architecture.
-#export JIGDOTEMPLATEURL=""
-#
-# Name of a directory on disc to create data for a fallback server in.
-# Should later be made available by you at the URL given in
-# JIGDOFALLBACKURLS. In the directory, two subdirs named "Debian" and
-# "Non-US" will be created, and filled with hard links to the actual
-# files in your FTP archive. Because of the hard links, the dir must
-# be on the same partition as the FTP archive! If unset, no fallback
-# data is created, which may cause problems - see README.
-#export JIGDOFALLBACKPATH="$(OUT)/snapshot/"
-#
-# Space-separated list of label->URL mappings for "jigdo fallback
-# server(s)" to add to .jigdo file. If unset, no fallback URL is
-# added, which may cause problems - see README.
-#export JIGDOFALLBACKURLS="Debian=http://myserver/snapshot/Debian/ Non-US=http://myserver/snapshot/Non-US/"
-#
-# Space-separated list of "include URLs" to add to the .jigdo file.
-# The included files are used to provide an up-to-date list of Debian
-# mirrors to the jigdo _GUI_application_ (_jigdo-lite_ doesn't support
-# "[Include ...]").
-export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigdo"
-#
-# $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to
-# "tools/jigdo_header", which is used by default to generate the
-# [Image] and [Servers] sections of the .jigdo file. You can provide
-# your own script if you need the .jigdo file to contain different
-# data.
-#export JIGDOSCRIPT="myscript"
-
-# If set, use the md5sums from the main archive, rather than calculating
-# them locally
-#export FASTSUMS=1
-
-# A couple of things used only by publish_cds, so it can tweak the
-# jigdo files, and knows where to put the results.
-# You need to run publish_cds manually, it is not run by the Makefile.
-export PUBLISH_URL="http://cdimage.debian.org/jigdo-area"
-export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area"
-export PUBLISH_PATH="/home/jigdo-area/"
-
-# Where to find the boot disks
-#export BOOTDISKS=$TOPDIR/ftp/skolelinux/boot-floppies
-
-# File with list of packages to include when fetching modules for the
-# first stage installer (debian-installer). One package per line.
-# Lines starting with '#' are comments. The package order is
-# important, as the packages will be installed in the given order.
-#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include
-
-# File with list of packages to exclude as above.
-#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude
-
-# File with list of packages to include when running debootstrap from
-# the first stage installer (currently only supported in
-# debian-installer). One package per line. Lines starting with '#'
-# are comments. The package order is important, as the packages will
-# be installed in the given order.
-#export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
-
-# File with list of packages to exclude as above.
-#export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude
-
-# Only put the installer onto the cd (set NORECOMMENDS,... as well).
-# INSTALLER_CD=0: nothing special (default)
-# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
-# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
-#export INSTALLER_CD=0
-
-# Parameters to pass to kernel when the CD boots. Not currently supported
-# for all architectures.
-#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
-
-# If set, limits the number of binary CDs to produce.
-#export MAXCDS=1
-
-# If set, overrides the boot picture used.
-#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
-
-# Used by build.sh to determine what to build, this is the name of a target
-# in the Makefile. Use bin-official_images to build only binary CDs. The
-# default, official_images, builds everything.
-#IMAGETARGET=official_images
-
-# path to simple-cdd stuff
-simple_cdd_path=$(pwd)
+export BASEDIR=$debian_cd_dir
export MIRROR=$simple_cdd_path/mirror/
export TDIR=$simple_cdd_path/tmp/
export OUT=$simple_cdd_path/images/
@@ -328,7 +59,7 @@
# download a specific installer release, such as 20041118 or rc2
use_di_release="current"
-debian_installer_dir="dists/$use_di_codename/main/installer-i386/$use_di_release/"
+debian_installer_dir="dists/$use_di_codename/main/installer-$ARCH/$use_di_release/"
# debpartial-mirror.conf files variable
debpartial_files="README doc/ tools/ indices/ $debian_installer_dir"
Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd (original)
+++ people/vagrant/simple-cdd/build-simple-cdd Thu Nov 25 13:27:24 2004
@@ -106,7 +106,7 @@
cat $a >> $simple_cdd_path/extras/simple-cdd/default.preseed
done
-echo simple-cdd: extra fils for simple-cdd
+echo simple-cdd: extra files for simple-cdd
make bin-extras CD=1 ROOTSRC=$simple_cdd_path/extras DIR=.
echo simple-cdd: bin-image