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

More buster setup

This commit is contained in:
Steve McIntyre 2017-06-19 14:07:09 +01:00
parent f2d86bff11
commit 00eb0a453e
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONF.sh
View File

@ -62,7 +62,7 @@ export BASEDIR=`pwd`
# export CDNAME=debian # export CDNAME=debian
# Building $codename cd set ... # Building $codename cd set ...
export CODENAME=stretch export CODENAME=buster
# By default use Debian installer packages from $CODENAME # By default use Debian installer packages from $CODENAME
if [ -z "$DI_CODENAME" ]; then if [ -z "$DI_CODENAME" ]; then

6
Makefile
View File

@ -178,14 +178,14 @@ $(DB_DIR): $(LATEST_DB)
fi fi
endif endif
# Make sure unstable/sid points to testing/wheezy, as there is no build # Make sure unstable/sid points to testing/buster, as there is no build
# rule for unstable/sid. # rule for unstable/sid.
unstable-map: unstable-map:
$(Q)if [ ! -d $(BASEDIR)/data/sid ] ; then \ $(Q)if [ ! -d $(BASEDIR)/data/sid ] ; then \
ln -s stretch $(BASEDIR)/data/sid ; \ ln -s buster $(BASEDIR)/data/sid ; \
fi fi
$(Q)if [ ! -d $(BASEDIR)/tools/boot/sid ] ; then \ $(Q)if [ ! -d $(BASEDIR)/tools/boot/sid ] ; then \
ln -s stretch $(BASEDIR)/tools/boot/sid ; \ ln -s buster $(BASEDIR)/tools/boot/sid ; \
fi fi
################# #################

18
data/buster/README.html.in
View File

@ -184,19 +184,19 @@
# endif # endif
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_RELEASE_NOTES # if OMIT_RELEASE_NOTES
<p>The Release Notes for "stretch" are available on the <p>The Release Notes for "buster" are available on the
<a href="http://www.debian.org/releases/stretch/releasenotes">Debian web <a href="http://www.debian.org/releases/buster/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
# if DISKNUM == 1 # if DISKNUM == 1
<p>The Release Notes for Debian DEBIAN_KERNEL "stretch" are included on this disc <p>The Release Notes for Debian DEBIAN_KERNEL "buster" are included on this disc
in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
several languages. Additional translations and updated versions for several languages. Additional translations and updated versions for
the Release Notes may be available from the the Release Notes may be available from the
<a href="http://www.debian.org/releases/stretch/releasenotes">Debian web <a href="http://www.debian.org/releases/buster/releasenotes">Debian web
site</a>.</p> site</a>.</p>
# else # else
<p>See the first disc in this set for the "stretch" Release Notes.</p> <p>See the first disc in this set for the "buster" Release Notes.</p>
# endif # endif
# endif # endif
# endif # endif
@ -236,7 +236,7 @@
# if (OFFICIAL_VAL == 2) # if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL # if OMIT_MANUAL
<p>An <b>Installation Guide</b> for this disc is available from <p>An <b>Installation Guide</b> for this disc is available from
<a href="http://www.debian.org/releases/stretch/installmanual">the <a href="http://www.debian.org/releases/buster/installmanual">the
Debian web site</a>.</p> Debian web site</a>.</p>
# else # else
<p>An <b>Installation Guide</b> is included on this disc at <p>An <b>Installation Guide</b> is included on this disc at
@ -249,13 +249,13 @@
<p>Note: additional translations, other formats (like PDF and TXT) and <p>Note: additional translations, other formats (like PDF and TXT) and
updated versions for the Installation Guide are available from updated versions for the Installation Guide are available from
<a href="http://www.debian.org/releases/stretch/installmanual">the Debian web site</a>. <a href="http://www.debian.org/releases/buster/installmanual">the Debian web site</a>.
</p> </p>
# endif # endif
# else # else
<p>As this is not an official stretch release disc, then the <p>As this is not an official buster release disc, then the
installation guide many not be released yet. It will appear on <a installation guide many not be released yet. It will appear on <a
href="http://www.debian.org/releases/stretch/installmanual">the href="http://www.debian.org/releases/buster/installmanual">the
Debian web site</a> when ready, but before then you could try <a Debian web site</a> when ready, but before then you could try <a
href="http://d-i.alioth.debian.org/manual/">the development href="http://d-i.alioth.debian.org/manual/">the development
version of the manual</a>. version of the manual</a>.

4
easy-build.sh
View File

@ -73,10 +73,10 @@ fi
## For what release to build images ## For what release to build images
# The suite the installed system will be based on # The suite the installed system will be based on
export CODENAME=stretch export CODENAME=buster
# The suite from which the udebs for the installer will be taken (normally # The suite from which the udebs for the installer will be taken (normally
# the same as CODENAME) # the same as CODENAME)
export DI_CODENAME=stretch export DI_CODENAME=buster
## The debian-installer images to use. This must match the suite (DI_CODENAME) ## The debian-installer images to use. This must match the suite (DI_CODENAME)

6
tools/boot/buster/boot-sparc
View File

@ -51,7 +51,7 @@ if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
fi fi
# Some custom etc files # Some custom etc files
cp -f -p $BASEDIR/data/stretch/sparc/silo.conf $inst/boot/ cp -f -p $BASEDIR/data/${CODENAME}/sparc/silo.conf $inst/boot/
if [ -n "$KERNEL_PARAMS" ]; then if [ -n "$KERNEL_PARAMS" ]; then
# Add KERNEL_PARAMS to any existing append line # Add KERNEL_PARAMS to any existing append line
sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \ sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \
@ -62,12 +62,12 @@ if [ -n "$KERNEL_PARAMS" ]; then
$inst/boot/silo.conf $inst/boot/silo.conf
fi fi
fi fi
cat $BASEDIR/data/stretch/sparc/debian.txt \ cat $BASEDIR/data/${CODENAME}/sparc/debian.txt \
| sed "s/\${MEDIA_TYPE}/CDROM/" \ | sed "s/\${MEDIA_TYPE}/CDROM/" \
| sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \ | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
| sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \ | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
> $inst/boot/debian.txt > $inst/boot/debian.txt
cp $BASEDIR/data/stretch/sparc/notsupported.txt $inst/boot/ cp $BASEDIR/data/${CODENAME}/sparc/notsupported.txt $inst/boot/
# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so # Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
# uncompress it before hand. # uncompress it before hand.

6
tools/boot/buster/boot-sparc64
View File

@ -51,7 +51,7 @@ if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
fi fi
# Some custom etc files # Some custom etc files
cp -f -p $BASEDIR/data/stretch/sparc64/silo.conf $inst/boot/ cp -f -p $BASEDIR/data/${CODENAME}/sparc64/silo.conf $inst/boot/
if [ -n "$KERNEL_PARAMS" ]; then if [ -n "$KERNEL_PARAMS" ]; then
# Add KERNEL_PARAMS to any existing append line # Add KERNEL_PARAMS to any existing append line
sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \ sed -i "/^[[:space:]]*append=\"/ s|append=\"|append=\"$KERNEL_PARAMS |" \
@ -62,12 +62,12 @@ if [ -n "$KERNEL_PARAMS" ]; then
$inst/boot/silo.conf $inst/boot/silo.conf
fi fi
fi fi
cat $BASEDIR/data/stretch/sparc64/debian.txt \ cat $BASEDIR/data/${CODENAME}/sparc64/debian.txt \
| sed "s/\${MEDIA_TYPE}/CDROM/" \ | sed "s/\${MEDIA_TYPE}/CDROM/" \
| sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \ | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
| sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \ | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
> $inst/boot/debian.txt > $inst/boot/debian.txt
cp $BASEDIR/data/stretch/sparc64/notsupported.txt $inst/boot/ cp $BASEDIR/data/${CODENAME}/sparc64/notsupported.txt $inst/boot/
# Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so # Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so
# uncompress it before hand. # uncompress it before hand.