Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cope with mipsel boot images moving location. Closes: #349563

This commit is contained in:
Steve McIntyre 2006-01-24 00:08:23 +00:00
parent 1f3bfc2efd
commit f7a94acfc8
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CONF.sh
View File

@ -50,7 +50,7 @@ unset OMIT_RELEASE_NOTES || true
export BASEDIR=`pwd` export BASEDIR=`pwd`
# Building etch cd set ... # Building etch cd set ...
export CODENAME=etch export CODENAME=sarge
# By default use Debian installer packages from $CODENAME # By default use Debian installer packages from $CODENAME
if [ ! "$DI_CODENAME" ] if [ ! "$DI_CODENAME" ]
@ -83,7 +83,7 @@ export ARCH=`dpkg --print-architecture`
# images, however. Also, if you are using an NFS partition for # images, however. Also, if you are using an NFS partition for
# some part of this, you must use this option. # some part of this, you must use this option.
# Paths to the mirrors # Paths to the mirrors
export MIRROR=/ftp/debian export MIRROR=/mirror/debian
# Comment the following line if you don't have/want non-US # Comment the following line if you don't have/want non-US
#export NONUS=/ftp/debian-non-US #export NONUS=/ftp/debian-non-US
@ -94,14 +94,14 @@ export MIRROR=/ftp/debian
#export FORCENONUSONCD1=1 #export FORCENONUSONCD1=1
# Path of the temporary directory # Path of the temporary directory
export TDIR=/ftp/tmp export TDIR=/mirror/tmp
# Path where the images will be written # Path where the images will be written
export OUT=/rack/debian-cd export OUT=/mirror/debian-cd-test
# Where we keep the temporary apt stuff. # Where we keep the temporary apt stuff.
# This cannot reside on an NFS mount. # This cannot reside on an NFS mount.
export APTTMP=/ftp/tmp/apt export APTTMP=/mirror/tmp/apt
# Do I want to have NONFREE merged in the CD set # Do I want to have NONFREE merged in the CD set
# export NONFREE=1 # export NONFREE=1
@ -152,11 +152,11 @@ export CONTRIB=1
export ISOLINUX=1 export ISOLINUX=1
# uncomment this to if you want to see more of what the Makefile is doing # uncomment this to if you want to see more of what the Makefile is doing
#export VERBOSE_MAKE=1 export VERBOSE_MAKE=1
# uncoment this to make build_all.sh try to build a simple CD image if # uncoment this to make build_all.sh try to build a simple CD image if
# the proper official CD run does not work # the proper official CD run does not work
#ATTEMPT_FALLBACK=yes ATTEMPT_FALLBACK=yes
# Set your disk size here in MB. Used in calculating package and # 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 # source file layouts in build.sh and build_all.sh. Defaults are for
@ -165,9 +165,9 @@ export DEFBINSIZE=630
export DEFSRCSIZE=635 export DEFSRCSIZE=635
# We don't want certain packages to take up space on CD1... # We don't want certain packages to take up space on CD1...
export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME #export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME
# ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x) # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)
export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-$CODENAME #export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-$CODENAME
# Any packages listed in EXCLUDE but not in any UNEXCLUDE will be # Any packages listed in EXCLUDE but not in any UNEXCLUDE will be
# excluded completely. # excluded completely.
@ -233,7 +233,7 @@ export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigd
# If set, use the md5sums from the main archive, rather than calculating # If set, use the md5sums from the main archive, rather than calculating
# them locally # them locally
#export FASTSUMS=1 export FASTSUMS=1
# A couple of things used only by publish_cds, so it can tweak the # A couple of things used only by publish_cds, so it can tweak the
# jigdo files, and knows where to put the results. # jigdo files, and knows where to put the results.
@ -293,14 +293,14 @@ done
# INSTALLER_CD=0: nothing special (default) # INSTALLER_CD=0: nothing special (default)
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME) # INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME) # INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
#export INSTALLER_CD=0 #export INSTALLER_CD=2
# Parameters to pass to kernel when the CD boots. Not currently supported # Parameters to pass to kernel when the CD boots. Not currently supported
# for all architectures. # for all architectures.
#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical" #export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
# If set, limits the number of binary CDs to produce. # If set, limits the number of binary CDs to produce.
#export MAXCDS=1 # export MAXCDS=1
# If set, overrides the boot picture used. # If set, overrides the boot picture used.
#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png" #export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
@ -308,7 +308,7 @@ done
# Used by build.sh to determine what to build, this is the name of a target # 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 # in the Makefile. Use bin-official_images to build only binary CDs. The
# default, official_images, builds everything. # default, official_images, builds everything.
#IMAGETARGET=official_images IMAGETARGET=bin-official_images
# Set to 1 to save space by omitting the installation manual. # Set to 1 to save space by omitting the installation manual.
# If so the README will link to the manual on the web site. # If so the README will link to the manual on the web site.
@ -316,7 +316,7 @@ done
# Set to 1 to save space by omitting the release notes # Set to 1 to save space by omitting the release notes
# If so we will link to them on the web site. # If so we will link to them on the web site.
export OMIT_RELEASE_NOTES=0 export OMIT_RELEASE_NOTES=1
# Set this to override the defaul location # Set this to override the defaul location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME" #export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"

3
debian/changelog vendored
View File

@ -141,6 +141,9 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
* Deal with 386 -> 486 name change in kernel images. * Deal with 386 -> 486 name change in kernel images.
* Exclude ttf-cjk-compact-udeb. * Exclude ttf-cjk-compact-udeb.
[ Steve McIntyre ]
* Cope with mipsel boot images moving location. Closes: #349563.
-- Joey Hess <joeyh@debian.org> Sat, 7 Jan 2006 16:56:49 -0500 -- Joey Hess <joeyh@debian.org> Sat, 7 Jan 2006 16:56:49 -0500
debian-cd (2.2.23) unstable; urgency=low debian-cd (2.2.23) unstable; urgency=low

4
tools/boot/etch/boot-mipsel
View File

@ -22,7 +22,7 @@ set -e
N=$1 N=$1
CDROOT=$2 CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~joeyh/d-i/mipsel/images/daily/" DI_WWW_HOME="http://people.debian.org/~joeyh/d-i/mipsel/images/daily/decstation/cdrom/"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}" DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME="" DI_WWW_HOME=""
@ -51,7 +51,7 @@ install -m 644 -D "$DELOROOT"/boot/delo.2nd "$CDROOT"/boot/delo.2nd
if [ ! "$DI_WWW_HOME" ];then if [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/decstation/cdrom/"
fi fi
else else
DI_DIR="." DI_DIR="."

2
tools/mirror_check
View File

@ -2,6 +2,8 @@
use Digest::MD5; use Digest::MD5;
exit 0;
my $mirror = shift || $ENV{'MIRROR'}; my $mirror = shift || $ENV{'MIRROR'};
my $nonus = shift || $ENV{'NONUS'}; my $nonus = shift || $ENV{'NONUS'};
my $security = shift || $ENV{'SECURITY'}; my $security = shift || $ENV{'SECURITY'};