- Updated for proper .disk/udeb_include support by default.

This commit is contained in:
Raphaël Hertzog 2003-05-07 18:06:52 +00:00
parent dcf6ee4f5d
commit 0e25c9d6b3
5 changed files with 29 additions and 3 deletions

View File

@ -65,6 +65,16 @@ ifndef DOJIGDO
export DOJIGDO=0
endif
ifndef UDEB_INCLUDE
# Netinst/businesscard CD should have udeb_include file by default
ifeq ($(INSTALLER_CD),1)
UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/netinst_udeb_include
endif
ifeq ($(INSTALLER_CD),2)
UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/netinst_udeb_include
endif
endif
## Internal variables
apt=$(BASEDIR)/tools/apt-selection
list2cds=$(BASEDIR)/tools/list2cds

View File

@ -0,0 +1,5 @@
net-retriever
choose-mirror
netcfg-dhcp
netcfg-static
ethdetect

9
debian/CONF.sh vendored
View File

@ -189,6 +189,15 @@ 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 '#'

6
debian/changelog vendored
View File

@ -1,6 +1,6 @@
debian-cd (2.2.16) UNRELEASED; urgency=low
* Updated standards-version to 3.5.7.
* Updated standards-version to 3.5.9.
* Use debhelper 4 (build-depends on it, updated DH_COMPAT).
* WARNING: potato is now mostly unsupported, some cruft has been
removed that may have been useful for generating potato CDs.
@ -30,8 +30,10 @@ debian-cd (2.2.16) UNRELEASED; urgency=low
"netinst CDs" !
* Don't check dependencies for udebs, they tend to be broken
and we still want them on the CD.
* Put good default values for UDEB_INCLUDE based on the value of
INSTALLER_CD.
-- Raphael Hertzog <hertzog@debian.org> Thu, 26 Dec 2002 11:08:55 +0100
-- Raphael Hertzog <hertzog@debian.org> Wed, 7 May 2003 20:02:18 +0200
debian-cd (2.2.15) unstable; urgency=low

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: Raphael Hertzog <hertzog@debian.org>
Build-Depends-Indep: debhelper (>= 4)
Standards-Version: 3.5.7
Standards-Version: 3.5.9
Package: debian-cd
Architecture: all