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

BACKPORT: Describe discs appropriately depending on the kernel used.

This commit is contained in:
Steve McIntyre 2012-05-30 08:13:44 +00:00
parent c015b5fdf3
commit 916765f1a1
5 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
squeeze/data/squeeze/README.html.in
View File

@ -3,8 +3,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Debian GNU/Linux -- The Universal Operating System</title>
<meta name="Description" content="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort." />
<title>Debian DEBIAN_KERNEL -- The Universal Operating System</title>
<meta name="Description" content="Debian DEBIAN_KERNEL is a free distribution of the DEBIAN_KERNEL operating system. It is maintained and updated through the work of many users who volunteer their time and effort." />
<meta name="Keywords" content="debian, GNU, linux, unix, open source, free, DFSG" />
<meta name="Language" content="English" />
<meta name="Author" content="J.A. Bezemer, debian-boot@lists.debian.org" />
@ -70,7 +70,7 @@
<br />
#endif
<span id="debian-img"><img
src="pics/debian-61.png" alt="Debian GNU/Linux"
src="pics/debian-61.png" alt="Debian DEBIAN_KERNEL"
height="94" width="211" /></span></h1>
#if (defined(DISKTYPEBC) || defined(DISKTYPENETINST))
@ -78,7 +78,7 @@
#else
<p>This is one disc in a set containing the
#endif
<a href="http://www.debian.org/">Debian GNU/Linux</a> distribution.
<a href="http://www.debian.org/">Debian DEBIAN_KERNEL</a> distribution.
Debian is a very extensive collection of software. But it
is more. It is a complete Operating System (OS) for your
computer. And it is <a href=
@ -117,18 +117,16 @@
#endif
</h2>
<p>An operating system is the set of basic programs and
utilities that make your computer run. At the core of an
operating system is the kernel. The kernel is the most
fundamental program on the computer, which does all the basic
housekeeping and lets you start other programs. Debian is
kernel independent. It currently uses the <a href=
"http://www.linux.org/">Linux</a> kernel but work is in
progress to provide Debian for other kernels, using <a href=
"http://www.gnu.org/software/hurd/hurd.html">the Hurd</a>. Most
of the basic operating system tools come from the <a href=
<p>An operating system is the set of basic programs and utilities
that make your computer run. At the core of an operating system is
the kernel. The kernel is the most fundamental program on the
computer, which does all the basic housekeeping and lets you start
other programs. Debian is kernel independent. It currently uses
either the <a href= "http://www.linux.org/">Linux</a>
or <a href="http://www.freebsd.org/">FreeBSD</a> kernel. Most of
the basic operating system tools come from the <a href=
"http://www.gnu.org/">GNU project</a>; hence the name
GNU/Linux.</p>
DEBIAN_KERNEL.</p>
<p>Debian is available for various kinds of computers
(&ldquo;architectures&rdquo;), like &ldquo;IBM-compatible&rdquo; PCs (<em>i386</em>),
@ -193,7 +191,7 @@
site</a>.</p>
# else
# if DISKNUM == 1
<p>The Release Notes for Debian GNU/Linux "squeeze" are included on this disc
<p>The Release Notes for Debian DEBIAN_KERNEL "squeeze" are included on this disc
in <a href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
several languages. Additional translations and updated versions for
the Release Notes may be available from the
@ -235,7 +233,7 @@
#if TYPEbinary
<p>Because Debian is a complete Operating System, the
installation procedure may seem a bit unusual. You can install
Debian GNU/Linux either <em>alongside</em> your current OS, or as
Debian DEBIAN_KERNEL either <em>alongside</em> your current OS, or as
the <em>only</em> OS on your computer.</p>
# if (OFFICIAL_VAL == 2)
# if OMIT_MANUAL
@ -360,7 +358,7 @@
</h2>
<p>You are completely free to manufacture and re-distribute CDs/DVDs of the
Debian GNU/Linux Operating System, like this one. There is no charge from
Debian DEBIAN_KERNEL Operating System, like this one. There is no charge from
us (but of course donations are always welcome).</p>
<p>For all needed information and contact addresses, please

2
squeeze/debian/changelog
View File

@ -53,6 +53,8 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
* Add an extra tweaked version of d390.ins for s390 booting. The
Hardware Management Console needs the file to be in the root
directory.
* Describe discs appropriately depending on the kernel used.
Closes: #673975
-- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100

2
squeeze/tools/add-bin-doc
View File

@ -55,6 +55,7 @@ cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
-D OMIT_MANUAL="$OMIT_MANUAL" \
-D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
-D DEBIAN_KERNEL="$DEBIAN_KERNEL" \
-D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html
@ -68,6 +69,7 @@ cpp -traditional -undef -P -C -Wall -nostdinc -I $dir/ \
-D OMIT_MANUAL="$OMIT_MANUAL" \
-D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
-D DEBIAN_KERNEL="$DEBIAN_KERNEL" \
-D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html

12
squeeze/tools/start_new_disc
View File

@ -25,6 +25,12 @@ DI_DATA_DIR=$BASEDIR/data/$DI_CODENAME
CAPCODENAME=`perl -e "print ucfirst("$CODENAME")"`
NUM_ARCHES=`echo $ARCHES | wc -w`
case "$ARCHES" in
*kfreebsd*) DEBIAN_KERNEL="GNU/kFreeBSD";;
*hurd*) DEBIAN_KERNEL="GNU/Hurd";;
*) DEBIAN_KERNEL="GNU/Linux";;
esac
export DEBIAN_KERNEL
if [ "$VOLID_BASE"x = ""x ] ; then
VOLID_BASE="Debian $DEBVERSION"
@ -34,13 +40,13 @@ if [ $NUM_ARCHES = 1 ] ; then
case $ARCHES in
source)
SOURCEDISK=1
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $DISKTYPE Source-$DISKNUM $BUILD_DATE"
export DISKINFO="Debian $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $DISKTYPE Source-$DISKNUM $BUILD_DATE"
export VOLID="$VOLID_BASE Source $DISKNUM"
export SOURCEONLY=yes
;;
*)
BINARYDISK=1
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
export DISKINFO="Debian ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
case "$ARCHES" in
powerpc)
export VOLID="$VOLID_BASE ppc $DISKNUM" ;;
@ -60,7 +66,7 @@ else
*source*) SOURCEDISK=1;;
esac
export ARCHDEF=`echo $ARCHES | sed 's? ?/?g'`
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE #$DISKNUM $BUILD_DATE"
export DISKINFO="Debian ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE #$DISKNUM $BUILD_DATE"
export VOLID="$VOLID_BASE M-A $DISKNUM"
fi

12
squeeze/update-cd
View File

@ -171,7 +171,7 @@ make_cd () {
${JIGDODIR}/${BASENAME}.jigdo \
${BASENAME}.iso \
$OUT ${BASENAME}.template \
"Debian GNU/Linux $VER - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
"Debian ${DEBIAN_KERNEL} $VER - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo
# Make sure that the ISO is as new/newer than the jigdo file; #587774
touch ${ISODIR}/${BASENAME}.iso
@ -244,7 +244,7 @@ start_new_disc () {
echo "Creating $TYPEUP$CDNUM for binary-$THISARCH (part $THISNUM)"
fi
mkdir $UPD/CD$CDNUM $UPD/CD$CDNUM/.disk
INFO="Debian GNU/Linux $VER Update $TYPEUP $DATE: $THISARCH $TYPEUP $THISNUM"
INFO="Debian ${DEBIAN_KERNEL} $VER Update $TYPEUP $DATE: $THISARCH $TYPEUP $THISNUM"
echo $INFO > $UPD/CD$CDNUM/.disk/info
SIZE_USED=0
SRCFILES=0
@ -279,6 +279,14 @@ do
MIRROR=$MIRROR_NORM
case "$THISARCH" in
kfreebsd) DEBIAN_KERNEL="GNU/kFreeBSD";;
hurd) DEBIAN_KERNEL="GNU/Hurd";;
source) DEBIAN_KERNEL="";;
*) DEBIAN_KERNEL="GNU/Linux";;
esac
export DEBIAN_KERNEL
rm -rf $OUT/$THISARCH/*-$TYPE
for file in `cat $UPD/list`