Add support for UDEB_INCLUDE and UDEB_EXCLUDE, making files cdrom/.disk/udeb_include and .../udeb_exclude used by debian-installer.

This commit is contained in:
Petter Reinholdtsen 2003-05-02 12:55:21 +00:00
parent 3de42de5c9
commit dcf6ee4f5d
2 changed files with 31 additions and 2 deletions

17
CONF.sh
View File

@ -32,6 +32,10 @@ unset FASTSUMS || true
unset PUBLISH_URL || true
unset PUBLISH_NONUS_URL || true
unset PUBLISH_PATH || true
unset UDEB_INCLUDE || true
unset UDEB_EXCLUDE || true
unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true
unset INSTALLER_CD || true
@ -194,11 +198,20 @@ 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 '#'
# are comments. The package order is important, when will be
# installed in the given order.
# are comments. The package order is important, as the packages will
# be installed in the given order.
#export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
# File with list of packages to exclude as above.

View File

@ -468,6 +468,22 @@ $(BDIR)/packages-stamp:
if [ -n "$(LOCAL)" ]; then \
echo 'local' >> $(BDIR)/CD$$DISK/.disk/base_components; \
fi; \
if [ -n "$(UDEB_INCLUDE)" ] ; then \
if [ -r "$(UDEB_INCLUDE)" ] ; then \
cp -af "$(UDEB_INCLUDE)" \
"$(BDIR)/CD$$DISK/.disk/udeb_include"; \
else \
echo "ERROR: Unable to read UDEB_INCLUDE file $(UDEB_INCLUDE)"; \
fi; \
fi; \
if [ -n "$(UDEB_EXCLUDE)" ] ; then \
if [ -r "$(UDEB_EXCLUDE)" ] ; then \
cp -af "$(UDEB_EXCLUDE)" \
"$(BDIR)/CD$$DISK/.disk/udeb_exclude"; \
else \
echo "ERROR: Unable to read UDEB_EXCLUDE file $(UDEB_EXCLUDE)"; \
fi; \
fi; \
if [ -n "$(BASE_INCLUDE)" ] ; then \
if [ -r "$(BASE_INCLUDE)" ] ; then \
cp -af "$(BASE_INCLUDE)" \