mirror of
https://salsa.debian.org/images-team/debian-cd.git
synced 2024-11-24 15:19:51 -01:00
- Updated for proper .disk/udeb_include support by default.
This commit is contained in:
parent
dcf6ee4f5d
commit
0e25c9d6b3
10
Makefile
10
Makefile
@ -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
|
||||
|
5
data/sarge/netinst_udeb_include
Normal file
5
data/sarge/netinst_udeb_include
Normal file
@ -0,0 +1,5 @@
|
||||
net-retriever
|
||||
choose-mirror
|
||||
netcfg-dhcp
|
||||
netcfg-static
|
||||
ethdetect
|
9
debian/CONF.sh
vendored
9
debian/CONF.sh
vendored
@ -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
6
debian/changelog
vendored
@ -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
2
debian/control
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user