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

commit changes needed to build debian-edu CDs to debian-edu branch

This commit is contained in:
Joey Hess 2004-06-29 22:33:50 +00:00
parent 6758f7b43a
commit 731d1494a1
13 changed files with 15190 additions and 16244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CONF.sh
View File

@ -47,8 +47,11 @@ unset DI_CODENAME || true
# Where I am (hoping I'm in the debian-cd dir) # Where I am (hoping I'm in the debian-cd dir)
export BASEDIR=`pwd` export BASEDIR=`pwd`
# Set where to find the mirrors and where to store the temp files
export TOPDIR=/skolelinux/developer/local0
# Building woody cd set ... # Building woody cd set ...
export CODENAME=woody 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" ]
@ -57,7 +60,7 @@ then
fi fi
# Version number, "2.2 r0", "2.2 r1" etc. # Version number, "2.2 r0", "2.2 r1" etc.
export DEBVERSION="3.0" export DEBVERSION="edu"
# Official or non-official set. # Official or non-official set.
# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
@ -75,28 +78,34 @@ export ARCH=`dpkg --print-installation-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=$TOPDIR/debian/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
# Include d-i stuff?
export DEBIAN_INSTALLER=1
# Use this to install Tollefs new debian-installer based install system.
export DEBINSTALLER=true
# And this option will make you 2 copies of CD1 - one with all the # 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 # non-US packages on it, one with none. Useful if you're likely to
# need both. # need both.
#export FORCENONUSONCD1=1 #export FORCENONUSONCD1=1
# Path of the temporary directory # Path of the temporary directory
export TDIR=/ftp/tmp export TDIR=$TOPDIR/ftp/tmp
# Path where the images will be written # Path where the images will be written
export OUT=/rack/debian-cd export OUT=$TOPDIR/ftp/sarge-cd
# 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=$TOPDIR/ftp/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
# Do I want to have CONTRIB merged in the CD set # Do I want to have CONTRIB merged in the CD set
export CONTRIB=1 export CONTRIB=1
@ -107,13 +116,13 @@ export CONTRIB=1
# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with # If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with
# local packages that you want to put on the CD set then # local packages that you want to put on the CD set then
# uncomment the following line # uncomment the following line
# export LOCAL=1 export LOCAL=1
# If your local packages are not under $MIRROR, but somewhere else, # If your local packages are not under $MIRROR, but somewhere else,
# you can uncomment this line and edit to to point to a directory # you can uncomment this line and edit to to point to a directory
# containing dists/$CODENAME/local/binary-$ARCH # containing dists/$CODENAME/local/binary-$ARCH
# export LOCALDEBS=/home/joey/debian/va/debian export LOCALDEBS=/skolelinux/developer/local0/ftp/skolelinux/
# If you want a <codename>-secured tree with a copy of the signed # If you want a <codename>-secured tree with a copy of the signed
# Release.gpg and files listed by this Release file, then # Release.gpg and files listed by this Release file, then
@ -122,7 +131,7 @@ export CONTRIB=1
# Where to find the security patches. This directory should be the # Where to find the security patches. This directory should be the
# top directory of a security.debian.org mirror. # top directory of a security.debian.org mirror.
#export SECURITY="$TOPDIR"/debian/debian-security export SECURITY="$TOPDIR"/debian/debian-security
# Sparc only : bootdir (location of cd.b and second.b) # Sparc only : bootdir (location of cd.b and second.b)
# export BOOTDIR=/boot # export BOOTDIR=/boot
@ -137,8 +146,8 @@ export CONTRIB=1
# Options # Options
# export MKISOFS=/usr/bin/mkisofs # export MKISOFS=/usr/bin/mkisofs
# export MKISOFS_OPTS="-r" #For normal users # export MKISOFS_OPTS="-r" #For normal users
# export MKISOFS_OPTS="-r -F ." #For symlink farmers # export MKISOFS_OPTS="-r -F ." #For symlink farmers
# ISOLinux support for multiboot on CD1 for i386 # ISOLinux support for multiboot on CD1 for i386
export ISOLINUX=1 export ISOLINUX=1
@ -157,9 +166,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-potato export EXCLUDE="$BASEDIR"/tasks/exclude-sarge
# ...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-potato export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge
# 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.
@ -168,7 +177,7 @@ export DEFSRCSIZE=635
# Set this if the recommended packages should be skipped when adding # Set this if the recommended packages should be skipped when adding
# package on the CD. The default is 'false'. # package on the CD. The default is 'false'.
#export NORECOMMENDS=1 export NORECOMMENDS=1
# Set this if the suggested packages should be skipped when adding # Set this if the suggested packages should be skipped when adding
# package on the CD. The default is 'true'. # package on the CD. The default is 'true'.
@ -225,7 +234,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.
@ -241,20 +250,20 @@ export PUBLISH_PATH="/home/jigdo-area/"
# first stage installer (debian-installer). One package per line. # first stage installer (debian-installer). One package per line.
# Lines starting with '#' are comments. The package order is # Lines starting with '#' are comments. The package order is
# important, as the packages will be installed in the given order. # important, as the packages will be installed in the given order.
#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include
# File with list of packages to exclude as above. # File with list of packages to exclude as above.
#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude
# File with list of packages to include when running debootstrap from # File with list of packages to include when running debootstrap from
# the first stage installer (currently only supported in # the first stage installer (currently only supported in
# debian-installer). One package per line. Lines starting with '#' # debian-installer). One package per line. Lines starting with '#'
# are comments. The package order is important, as the packages will # are comments. The package order is important, as the packages will
# be installed in the given order. # be installed in the given order.
#export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
# File with list of packages to exclude as above. # File with list of packages to exclude as above.
#export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude
# Only put the installer onto the cd (set NORECOMMENDS,... as well). # Only put the installer onto the cd (set NORECOMMENDS,... as well).
# INSTALLER_CD=0: nothing special (default) # INSTALLER_CD=0: nothing special (default)

2
build.sh
View File

@ -46,7 +46,7 @@ FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
echo " ... building the images" echo " ... building the images"
if [ -z "$IMAGETARGET" ] ; then if [ -z "$IMAGETARGET" ] ; then
IMAGETARGET="official_images" IMAGETARGET="bin-official_images"
fi fi
make "$IMAGETARGET" make "$IMAGETARGET"

4
data/sarge/exclude-udebs
View File

@ -79,7 +79,7 @@ reiserfsprogs-udeb
netcfg-static netcfg-static
netcfg-dhcp netcfg-dhcp
# skolelinux stuff, not for the stock CDs # skolelinux stuff, not for the stock CDs
debian-edu-install-udeb #debian-edu-install-udeb
debian-edu-profile-udeb #debian-edu-profile-udeb
# If needed, will be on the initrd already. # If needed, will be on the initrd already.
module-init-tools-udeb module-init-tools-udeb

11
data/sarge/exclude-udebs-i386
View File

@ -37,3 +37,14 @@ partconf
partitioner partitioner
# This is obsolete. # This is obsolete.
discover2-data-udeb discover2-data-udeb
# autopartkit does not work with lvm2, so exclude that and things that
# depend on it.
lvm2-udeb
lvmcfg-utils
lvmcfg
partman-lvm
# No 2.6 for debian-edu
*2.6*

2
data/sarge/udeb_include Normal file
View File

@ -0,0 +1,2 @@
debian-edu-install-udeb
debian-edu-profile-udeb

5
tasks/Debian_sarge
View File

@ -9,8 +9,11 @@
#endif #endif
/* Packages that should really be on CD1 */ /* Packages that should really be on CD1 */
#include <debian-installer> #include <debian-installer+kernel>
#include <base-sarge> #include <base-sarge>
#include <debian-edu>
#include <forcd1> #include <forcd1>
#include <task-essential-sarge> #include <task-essential-sarge>

8
tasks/debian-edu Normal file
View File

@ -0,0 +1,8 @@
education-common
education-main-server
education-networked
education-standalone
education-thin-client-server
education-standalone-extras
education-laptop
education-workstation

1380
tasks/debian-installer
View File

File diff suppressed because it is too large Load Diff

46
tasks/debian-installer+kernel
View File

@ -5,7 +5,7 @@
* This list can be generated with the command: * This list can be generated with the command:
* ../tools/generate_di+k_list * ../tools/generate_di+k_list
* *
* Last update: Sun Jun 6 23:08:15 MDT 2004 * Last update: Tue Jun 29 23:49:37 CEST 2004
*/ */
#include <debian-installer> #include <debian-installer>
@ -20,6 +20,7 @@ aptitude
jfbterm jfbterm
unifont unifont
hotplug hotplug
usbutils
iso-codes iso-codes
console-cyrillic console-cyrillic
console-terminus console-terminus
@ -35,71 +36,28 @@ grub
lilo lilo
kernel-image-2.4.26-1-386 kernel-image-2.4.26-1-386
kernel-pcmcia-modules-2.4.26-1-386 kernel-pcmcia-modules-2.4.26-1-386
kernel-image-2.6.6-1-386
#endif #endif
#ifdef ARCH_alpha #ifdef ARCH_alpha
discover1 discover1
kernel-image-2.4-generic
kernel-image-2.4-smp
kernel-image-2.4.25-1-generic
kernel-image-2.4.25-1-smp
kernel-image-2.4.26-1-generic
kernel-image-2.4.26-1-smp
kernel-image-2.6-generic
kernel-image-2.6-smp
kernel-image-2.6.5-1-generic
kernel-image-2.6.5-1-smp
kernel-image-2.6.6-1-generic
kernel-image-2.6.6-1-smp
kernel-image-netbootable
#endif #endif
#ifdef ARCH_hppa #ifdef ARCH_hppa
discover1 discover1
kernel-image-2.4.26-32-smp
kernel-image-2.4.26-64
kernel-image-2.4.26-64-smp
kernel-image-netbootable
#endif #endif
#ifdef ARCH_ia64 #ifdef ARCH_ia64
discover1 discover1
initrd-tools initrd-tools
kernel-image-2.4.25-itanium
kernel-image-2.4.25-itanium-smp
kernel-image-2.4.25-mckinley
kernel-image-2.4.25-mckinley-smp
#endif #endif
#ifdef ARCH_mips #ifdef ARCH_mips
arcboot arcboot
kernel-image-2.4.26-r4k-ip22
kernel-image-2.4.26-r5k-ip22
#endif #endif
#ifdef ARCH_mipsel #ifdef ARCH_mipsel
kernel-image-2.4.26-r3k-kn02
kernel-image-2.4.26-r4k-kn04
#endif #endif
#ifdef ARCH_powerpc #ifdef ARCH_powerpc
discover1 discover1
yaboot yaboot
kernel-image-2.4.25-powerpc-pmac
kernel-image-2.4.25-powerpc-small-pmac
kernel-image-2.4.25-powerpc-prep
kernel-image-2.4.25-powerpc-chrp
kernel-image-2.4.25-powerpc-chrp-rs6k
kernel-image-2.4.25-apus
#endif #endif
#ifdef ARCH_sparc #ifdef ARCH_sparc
discover1 discover1
initrd-tools
kernel-image-2.4.26-sparc32
kernel-image-2.4.26-sparc32-smp
kernel-image-2.4.26-sparc64
kernel-image-2.4.26-sparc64-smp
#endif #endif
#ifdef ARCH_m68k #ifdef ARCH_m68k
kernel-image-2.2.25-mac
kernel-image-2.4.26-amiga
kernel-image-2.4.26-atari
kernel-image-2.4.26-bvme6000
kernel-image-2.4.26-mvme147
kernel-image-2.4.26-mvme16x
#endif #endif

125
tasks/exclude-sarge
View File

@ -32,15 +32,40 @@ kernel-image-2.4.24-1-k6
kernel-image-2.4.24-1-k7 kernel-image-2.4.24-1-k7
kernel-image-2.4.24-1-k7-smp kernel-image-2.4.24-1-k7-smp
kernel-image-2.4.24-speakup kernel-image-2.4.24-speakup
kernel-image-2.4.26-speakup
kernel-image-2.4.25-1-386
kernel-image-2.4.25-1-586tsc
kernel-image-2.4.25-1-686
kernel-image-2.4.25-1-686-smp
kernel-image-2.4.25-1-k6
kernel-image-2.4.25-1-k7
kernel-image-2.4.25-1-k7-smp
kernel-image-2.4.26-1-586tsc
kernel-image-2.4.26-1-686
kernel-image-2.4.26-1-686-smp
kernel-image-2.4.26-1-k6
kernel-image-2.4.26-1-k7
kernel-image-2.4.26-1-k7-smp
kernel-image-2.6-386 kernel-image-2.6-386
kernel-image-2.6-686 kernel-image-2.6-686
kernel-image-2.6-686-smp kernel-image-2.6-686-smp
kernel-image-2.6-k7 kernel-image-2.6-k7
kernel-image-2.6-k7-smp kernel-image-2.6-k7-smp
kernel-image-2.6.3-1-386
kernel-image-2.6.3-1-686 kernel-image-2.6.3-1-686
kernel-image-2.6.3-1-686-smp kernel-image-2.6.3-1-686-smp
kernel-image-2.6.3-1-k7 kernel-image-2.6.3-1-k7
kernel-image-2.6.3-1-k7-smp kernel-image-2.6.3-1-k7-smp
kernel-image-2.6.5-1-386
kernel-image-2.6.5-1-686
kernel-image-2.6.5-1-686-smp
kernel-image-2.6.5-1-k7
kernel-image-2.6.5-1-k7-smp
kernel-image-2.6.6-1-386
kernel-image-2.6.6-1-686
kernel-image-2.6.6-1-686-smp
kernel-image-2.6.6-1-k7
kernel-image-2.6.6-1-k7-smp
kernel-pcmcia-modules-2.4-386 kernel-pcmcia-modules-2.4-386
kernel-pcmcia-modules-2.4-586tsc kernel-pcmcia-modules-2.4-586tsc
kernel-pcmcia-modules-2.4-686 kernel-pcmcia-modules-2.4-686
@ -55,9 +80,109 @@ kernel-pcmcia-modules-2.4.24-1-686-smp
kernel-pcmcia-modules-2.4.24-1-k6 kernel-pcmcia-modules-2.4.24-1-k6
kernel-pcmcia-modules-2.4.24-1-k7 kernel-pcmcia-modules-2.4.24-1-k7
kernel-pcmcia-modules-2.4.24-1-k7-smp kernel-pcmcia-modules-2.4.24-1-k7-smp
kernel-pcmcia-modules-2.4.25-1-386
kernel-pcmcia-modules-2.4.25-1-586tsc
kernel-pcmcia-modules-2.4.25-1-686
kernel-pcmcia-modules-2.4.25-1-686-smp
kernel-pcmcia-modules-2.4.25-1-k6
kernel-pcmcia-modules-2.4.25-1-k7
kernel-pcmcia-modules-2.4.25-1-k7-smp
kernel-pcmcia-modules-2.4.26-1-586tsc
kernel-pcmcia-modules-2.4.26-1-686
kernel-pcmcia-modules-2.4.26-1-686-smp
kernel-pcmcia-modules-2.4.26-1-k6
kernel-pcmcia-modules-2.4.26-1-k7
kernel-pcmcia-modules-2.4.26-1-k7-smp
python2.1 python2.1
smail smail
tcl8.0 tcl8.0
tk8.0 tk8.0
xserver-xfree86-dbg xserver-xfree86-dbg
zmailer zmailer
# Packages implementing 'mail-transport-agent' required by 'at' that we
# don't want on the first CD.
courier-mta
deliver
esmtp
exim
exim4-daemon-heavy
maildrop
masqmail
nullmailer
postfix
sendmail
ssmtp
zmailer-ssl
# Drop some openoffice.org translations to save space
openoffice.org-l10n-ar
openoffice.org-l10n-cs
openoffice.org-l10n-el
# We only need one lyx, lyx-qt
lyx-xforms
# Don't need apt-file
apt-file
# Don't need elilo - it is mostly for ia64
elilo
# We don't use vserver
vserver
# We probably don't need rcs
rcs
This installer package is not needed
msttcorefonts
# Ignore list from skolelinux
acorn-fdisk
aolserver
aspell-fo
biff
bison
bootp
cfdisk-utf8
choose-mirror
dc
doc-linux-text
ethdetect
ftp
ftpd
gij
gpm
gs-aladdin
ipfwadm
ipmasqadm
iproute
libmailutils0
lpr
mailutils
masqmail
mpack
net-retriever
netcfg-dhcp
netcfg-static
original-awk
palo
pidentd
postfix-ldap
postfix-pcre
pump
python-newt
sendmail-doc
ssh-askpass
telnetd
vacation
xdm
# Some extra
w3m
wamerican
mutt
libsasl2-modules-mysql
libstdc++3
efibootmgr

29791
tasks/popularity-contest-sarge
View File

File diff suppressed because it is too large Load Diff

2
tools/boot/sarge/boot-i386
View File

@ -123,7 +123,7 @@ if [ -e boot$N/isolinux/f3.txt.with26 ];then
# Isolinux config file. # Isolinux config file.
cat > boot$N/isolinux/isolinux.cfg <<EOF cat > boot$N/isolinux/isolinux.cfg <<EOF
DEFAULT /install/vmlinuz DEFAULT /install/vmlinuz
APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw DEBCONF_PRIORITY=critical
LABEL linux LABEL linux
kernel /install/vmlinuz kernel /install/vmlinuz
LABEL cdrom LABEL cdrom

7
tools/generate_di+k_list
View File

@ -50,9 +50,10 @@ EOF
/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \ /bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \ $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
>> debian-installer+kernel >> debian-installer+kernel
/bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \ # Leave off 2.6 from debian-edu CDs to save space.
$MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \ #/bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
>> debian-installer+kernel # $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
# >> debian-installer+kernel
cat >> debian-installer+kernel << EOF cat >> debian-installer+kernel << EOF
#endif #endif