Peppermint/debian-cd-clone
1
0
Fork 0
mirror of https://salsa.debian.org/images-team/debian-cd.git synced 2024-11-24 15:19:51 -01:00
Code Issues Packages Projects Releases Wiki Activity

Remove old obsolete pre-d-i function install_language and all callers

Browse Source
This commit is contained in:
Steve McIntyre 2015-09-11 18:29:47 +01:00
parent fab83506a0
commit c8730bbda5
11 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -19,6 +19,7 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
* Add kernels and other bits to armel/armhf images (Closes: #795844)
* Do similar for mips images, now r4k-ip22 cdrom images are no longer
built.
* Remove old obsolete pre-d-i function install_language and all callers.
[ Didier Raboud ]
* For stretch, swap amd64 and i386 to let the first be the norm, and the

1
tools/boot/stretch/boot-alpha
View File

@ -94,4 +94,3 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-alpha-boot boot/bootlx"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
#install_languages $CDDIR

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

@ -55,8 +55,6 @@ gzip -c "$DI_DIR"/$K32 > "$CDROOT/install"/$K32
gzip -c "$DI_DIR"/$K64 > "$CDROOT/install"/$K64
cp "$DI_DIR"/initrd.gz "$CDROOT/install"
install_languages "$CDROOT"
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 install/$K64"

3
tools/boot/stretch/boot-hurd
View File

@ -94,9 +94,6 @@ EOF
EOF
fi
# Install languages
install_languages $CDDIR
# Cleanup
rm -rf cdrom

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

@ -41,8 +41,6 @@ for image in boot.img; do
fi
done
install_languages $CDDIR
mkdir -p boot$N/boot
cp -f boot.img boot$N/boot/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"

3
tools/boot/stretch/boot-kfreebsd
View File

@ -108,9 +108,6 @@ EOF
EOF
fi
# Install languages
install_languages $CDDIR
# Cleanup
rm -rf cdrom

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

@ -47,8 +47,6 @@ fi
echo "DI_WWW_HOME: $DI_WWW_HOME"
echo "DI_DIR: $DI_DIR"
install_languages $CDDIR
# remove i386 stuff
rm -rf $CDDIR/tools

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

@ -75,8 +75,6 @@ cp "$DI_DIR"/initrd.gz "$CDROOT/boot/initrd.gz"
cp "$DI_DIR"/vmlinux-*-r3k-kn02 "$CDROOT/boot/vmlinux-r3k-kn02"
cp "$DI_DIR"/vmlinux-*-r4k-kn04 "$CDROOT/boot/vmlinux-r4k-kn04"
install_languages $CDROOT
add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-mipsel-boot boot/delo.2nd"
exit 0

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

@ -21,8 +21,6 @@ fi
cd $CDDIR/..
install_languages $CDDIR
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 4"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs"

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

@ -20,8 +20,6 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
exit 0;
fi
install_languages $CDDIR
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot1"

13
tools/boot/stretch/common.sh
View File

@ -42,19 +42,6 @@ if [ "$ARCH" != i386 ] && [ "$ARCH" != amd64 ]; then
fi
# install_languages decompacts the language packs, you should give the path
# to the CD temporary tree.
# This function should be called for all bootable images.
install_languages() {
# Param $1 is the CD directory
if [ -f "$MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
then
mkdir $1/.xlp
(cd $1/.xlp; \
tar zxf $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz )
fi
}
# Add an option to the mkisofs options for this CD _only_ if it's not
# already set. $1 is the opts file location, "$2" is the new
# option. Call this with _logical groupings_ of options