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

Merge changes in HEAD branch from 2004-07-09 to now.

This commit is contained in:
Petter Reinholdtsen 2004-07-11 21:19:39 +00:00
parent 5b60e8f108
commit 60f3945862
16 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONF.sh
View File

@ -41,7 +41,7 @@ unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true
unset INSTALLER_CD || true
unset DI_CODENAME || true
unset MAXCDS || true
unset MAXCDS || true
# The debian-cd dir
# Where I am (hoping I'm in the debian-cd dir)

51
Makefile
View File

@ -58,9 +58,9 @@ endif
ifndef HOOK
HOOK=$(BASEDIR)/tools/$(CODENAME).hook
endif
ifneq "$(wildcard $(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH))" ""
ifneq "$(wildcard $(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH))" ""
ifndef BOOTDISKS
export BOOTDISKS=$(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH)
export BOOTDISKS=$(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH)
endif
endif
ifndef DOJIGDO
@ -73,10 +73,10 @@ endif
ifndef UDEB_INCLUDE
# Netinst/businesscard CD should have udeb_include file by default
ifeq ($(INSTALLER_CD),1)
UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_businesscard_udeb_include
UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_businesscard_udeb_include
endif
ifeq ($(INSTALLER_CD),2)
UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_netinst_udeb_include
UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_netinst_udeb_include
endif
endif
@ -175,7 +175,7 @@ endif
## INITIALIZATION ##
# Creation of the directories needed
init: ok $(OUT) $(TDIR) $(BDIR) $(SDIR) $(ADIR)
init: ok $(OUT) $(TDIR) $(BDIR) $(SDIR) $(ADIR) unstable-map
$(OUT):
$(Q)mkdir -p $(OUT)
$(TDIR):
@ -187,6 +187,15 @@ $(SDIR):
$(ADIR):
$(Q)mkdir -p $(ADIR)
$(Q)mkdir -p $(ADIR)/apt-ftparchive-db
# Make sure unstable/sid points to testing/sarge, as there is no build
# rule for unstable/sid.
unstable-map:
$(Q)if [ ! -d $(BASEDIR)/data/sid ] ; then \
ln -s sarge $(BASEDIR)/data/sid ; \
fi
$(Q)if [ ! -d $(BASEDIR)/tools/boot/sid ] ; then \
ln -s sarge $(BASEDIR)/tools/boot/sid ; \
fi
## CLEANINGS ##
@ -207,10 +216,12 @@ src-clean:
realclean: distclean
distclean: ok bin-distclean src-distclean
bin-distclean:
$(Q)echo "Cleaning the binary build directory"
$(Q)rm -rf $(BDIR)
$(Q)rm -rf $(ADIR)
$(Q)rm -rf $(TDIR)/jigdofilelist
src-distclean:
$(Q)echo "Cleaning the source build directory"
$(Q)rm -rf $(SDIR)
$(Q)rm -rf $(TDIR)/jigdofilelist
@ -360,7 +371,7 @@ endif
| tr ' ' '\n' >>$(BDIR)/rawlist; \
fi
$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
-U $(ARCH) -U i386 -U linux -U unix \
-DFORCENONUSONCD1=$(forcenonusoncd1) \
-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist
@ -369,7 +380,7 @@ endif
$(BDIR)/rawlist-exclude:
$(Q)if [ -n "$(EXCLUDE)" ]; then \
perl -npe 's/\@ARCH\@/$(ARCH)/g' $(EXCLUDE) | \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
-U $(ARCH) -U i386 -U linux -U unix \
-DFORCENONUSONCD1=$(forcenonusoncd1) \
-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \
@ -624,10 +635,10 @@ $(BDIR)/bootable-stamp:
dir=$${file%%.packages}; \
n=$${dir##$(BDIR)/}; \
dir=$(BDIR)/CD$$n; \
if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) ]; then \
if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) ]; then \
cd $(BDIR); \
echo "Running tools/boot/$(CODENAME)/boot-$(ARCH) $$n $$dir" ; \
$(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) $$n $$dir; \
echo "Running tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir" ; \
$(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir; \
else \
if [ "$${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ]; then \
echo "No script to make CDs bootable for $(ARCH) ..."; \
@ -701,18 +712,18 @@ $(BDIR)/CD1/tools:
done
# Add the disks-arch directories if/where needed
disks: ok bin-infos $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH)
$(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
disks: ok bin-infos $(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH)
$(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH):
ifdef BOOTDISKS
@echo "Adding disks-$(ARCH) stuff ..."
$(Q)set -e; \
for DISK in $(FIRSTDISKS) ; do \
mkdir -p $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) ; \
mkdir -p $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) ; \
$(add_files) \
$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
$(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) \
$(BOOTDISKS) . ; \
touch $(BDIR)/$$DISK/.disk/kernel_installable ; \
cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \
cd $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH); \
rm -rf base-images-*; \
if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \
if [ -L current ]; then \
@ -892,11 +903,11 @@ bin-images: ok bin-md5list $(OUT) $(TDIR)/jigdofilelist
$(BINDISKINFOND) \
> $(TDIR)/$(CODENAME)-$(ARCH).jigdo; \
fi; \
if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$$n.raw $$opts CD$$n ; \
if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) $$n $$dir \
if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $$dir \
$(OUT)/$(CODENAME)-$(ARCH)-$$n.raw; \
fi; \
if [ "$(DOJIGDO)" != "0" ]; then \
@ -974,8 +985,8 @@ bin-image: ok bin-md5list $(OUT)
volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw $$opts CD$(CD); \
if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
$(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \
fi

20
build.sh
View File

@ -24,24 +24,32 @@ else
fi
fi
echo " ... selecting packages to include"
if [ -e ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. ] ; then
disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
if [ -e ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. ] ; then
disks=`du -sm ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. | \
awk '{print $1}'`
else
disks=0
fi
if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc ]; then
. $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc
if [ -f $BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH.calc ]; then
. $BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH.calc
fi
SIZE_ARGS=''
for CD in 1 2 3 4 5 6 7 8; do
for CD in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
size=`eval echo '$'"BOOT_SIZE_${CD}"`
[ "$size" = "" ] && size=0
[ $CD = "1" ] && size=$(($size + $disks))
mult=`eval echo '$'"SIZE_MULT_${CD}"`
[ "$mult" = "" ] && mult=100
FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc`
echo "INFO: Reserving $size MB on the $CD cd. SIZELIMIT=$FULL_SIZE."
echo "INFO: Reserving $size MB on CD $CD for boot files. SIZELIMIT=$FULL_SIZE."
if [ $mult != 100 ]; then
echo " INFO: Reserving "$((100-$mult))"% of the CD for extra metadata"
FULL_SIZE=`echo "$FULL_SIZE * $mult" / 100 | bc`
echo " INFO: SIZELIMIT now $FULL_SIZE."
fi
SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
done
FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
echo " ... building the images"

10
build_all.sh
View File

@ -35,11 +35,19 @@ do
. $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc
fi
SIZE_ARGS=''
for CD in 1 2 3 4 5 6 7 8; do
for CD in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
size=`eval echo '$'"BOOT_SIZE_${CD}"`
[ "$size" = "" ] && size=0
[ $CD = "1" ] && size=$(($size + $disks))
mult=`eval echo '$'"SIZE_MULT_${CD}"`
[ "$mult" = "" ] && mult=100
FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc`
echo "INFO: Reserving $size MB on CD $CD for boot files. SIZELIMIT=$FULL_SIZE."
if [ $mult != 100 ]; then
echo " INFO: Reserving "$((100-$mult))"% of the CD for extra metadata"
FULL_SIZE=`echo "$FULL_SIZE * $mult" / 100 | bc`
echo " INFO: SIZELIMIT now $FULL_SIZE."
fi
SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
done
FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`

4
debian/changelog vendored
View File

@ -68,6 +68,10 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
building if it is missing.
- Make it possible to give different CONF.sh files to build.sh.
- Make it possible to change which images to build using CONF.sh.
- Use DI_CODENAME to locate the installation system. This make it
possible to use debian-installer with Woody CDs.
- Avoid illegal dash (-) in cpp architecture defines. Patch
from Colin Watson.
* Stephen R. Marenka
- Update m68k support for sarge.
- Fix m68k/amiga icons.

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

@ -18,7 +18,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -7,7 +7,7 @@
# palo is used to make ISOs bootable on HPPA.
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
@ -66,7 +66,7 @@ done
if [ "$NN" = "1" ]; then
echo "Using ISOLINUX boot-disks image on CD$N"
mkdir -p boot$N/isolinux
cp -f $BASEDIR/data/$CODENAME/isolinux.bin boot$N/isolinux/
cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
cp -lf cdrom/vmlinuz $CDDIR/install/
cp -lf cdrom/initrd.gz $CDDIR/install/
echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
@ -99,10 +99,10 @@ done
# ISOLINUX setup
# Include Smart Boot Manager image for people where isolinux fails
gzip -dc $BASEDIR/data/$CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
# Keep the original file timestamp
touch -r $BASEDIR/data/$CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
cp -p $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/
touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
# Isolinux help files come from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
@ -121,7 +121,7 @@ if [ -e boot$N/isolinux/f3.txt.with26 ];then
done
cp -a cdrom/2.6 $CDDIR/install/2.6
# Isolinux config file.
sed "s/\$KERNEL_PARAMS/$KERNEL_PARAMS/g" > boot$N/isolinux/isolinux.cfg <<EOF
cat > boot$N/isolinux/isolinux.cfg <<EOF
DEFAULT /install/vmlinuz APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
LABEL linux
kernel /install/vmlinuz

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

@ -5,7 +5,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
set -x

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

@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -7,7 +7,7 @@
# genisovh is used to make ISOs bootable on mips.
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -15,7 +15,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

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

@ -4,7 +4,7 @@
#
# Do install stuff for sparc, including making first CD bootable
. $BASEDIR/tools/boot/$CODENAME/common.sh
. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e

4
tools/boot/sarge/common.sh
View File

@ -8,11 +8,11 @@
# This function should be called for all bootable images.
install_languages() {
# Param $1 is the CD directory
if [ -f "$MIRROR/dists/$CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
if [ -f "$MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
then
mkdir $1/.xlp
(cd $1/.xlp; \
tar zxf $MIRROR/dists/$CODENAME/main/disks-$ARCH/current/xlp.tgz )
tar zxf $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz )
fi
}

14
tools/generate_di_list
View File

@ -19,12 +19,20 @@ EOF
my @common_excludes = read_exclude("exclude-udebs");
die "Missing \$MIRROR variable" unless $ENV{MIRROR};
die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
foreach my $arch (@ARCHES) {
print OUT "#ifdef ARCH_$arch\n";
my $packagefile="$ENV{MIRROR}/dists/$ENV{DI_CODENAME}/main/debian-installer/binary-$arch/Packages";
unless (-f $packagefile) {
print "Missing package file for arch $arch.\n";
next;
}
(my $cpparch = $arch) =~ s/-/_/g;
print OUT "#ifdef ARCH_$cpparch\n";
my @exclude = @common_excludes;
push @exclude, read_exclude("exclude-udebs-$arch")
if -e exclude_path("exclude-udebs-$arch");
my $packagefile="$ENV{MIRROR}/dists/$ENV{DI_CODENAME}/main/debian-installer/binary-$arch/Packages";
UDEB: foreach my $udeb (map { chomp; $_ } `grep-dctrl -n -s Package '' $packagefile`) {
foreach my $pattern (@exclude) {
if ($udeb =~ /^$pattern$/) {
@ -33,7 +41,7 @@ UDEB: foreach my $udeb (map { chomp; $_ } `grep-dctrl -n -s Package '' $packagef
}
print OUT "$udeb\n";
}
print OUT "#endif /* ARCH_$arch */\n";
print OUT "#endif /* ARCH_$cpparch */\n";
}
sub read_exclude {