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

* Add default UDEB_EXCLUDE files that differ for businesscard, netinst, and 

full CDs.
* Make the full CD have apt-mirror-setup in its udeb_exclude file, to avoid
  that component being installed to satisfy apt-setup's dependency on it (I
  hope), so that the user is not unncessarily asked for a mirror during a
  full CD install, but is still asked for one during installs from the
  smaller CDs.
This commit is contained in:
Joey Hess 2005-11-15 00:28:07 +00:00
parent e1b5db9145
commit 8140171580
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -70,8 +70,8 @@ ifndef JIGDOSCRIPT
JIGDOSCRIPT=$(BASEDIR)/tools/jigdo_header
endif
# Netinst/businesscard CD have different udeb_include and udeb_exclude files
ifndef UDEB_INCLUDE
# Netinst/businesscard CD have different udeb_include files
ifeq ($(INSTALLER_CD),1)
UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_businesscard_udeb_include
endif
@ -79,11 +79,20 @@ ifeq ($(INSTALLER_CD),2)
UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_netinst_udeb_include
endif
endif
# Default udeb_include files.
ifndef UDEB_INCLUDE
UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_udeb_include
endif
ifndef UDEB_EXCLUDE
ifeq ($(INSTALLER_CD),1)
UDEB_EXCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/businesscard_udeb_exclude
endif
ifeq ($(INSTALLER_CD),2)
UDEB_EXCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/netinst_udeb_exclude
endif
endif
ifndef UDEB_EXCLUDE
UDEB_EXCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/udeb_exclude
endif
## Internal variables
apt=$(BASEDIR)/tools/apt-selection

3
data/etch/exclude-udebs
View File

@ -1,4 +1,4 @@
# tHEse udebs build the d-i cdrom initrd. As such, there is no reason
# These udebs build the d-i cdrom initrd. As such, there is no reason
# to keep another copy of them on the CD in udeb form.
#
# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
@ -108,3 +108,4 @@ cdebconf-text-udeb
hw-detect-full
# Eh?
gnumach-udeb
# Exclude apt-setup components; they will be included

1
data/etch/udeb_exclude Normal file
View File

@ -0,0 +1 @@
apt-mirror-setup

11
debian/changelog vendored
View File

@ -67,7 +67,16 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
* For full CD/DVD builds, check that we have an "extra" override
containing task info. If not, use the sid override instead.
-- Joey Hess <joeyh@debian.org> Sun, 13 Nov 2005 15:49:20 -0500
[ Joey Hess ]
* Add default UDEB_EXCLUDE files that differ for businesscard, netinst, and
full CDs.
* Make the full CD have apt-mirror-setup in its udeb_exclude file, to avoid
that component being installed to satisfy apt-setup's dependency on it (I
hope), so that the user is not unncessarily asked for a mirror during a
full CD install, but is still asked for one during installs from the
smaller CDs.
-- Joey Hess <joeyh@debian.org> Mon, 14 Nov 2005 19:26:31 -0500
debian-cd (2.2.23) unstable; urgency=low