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

Remove s390 from the arch lists 

Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
This commit is contained in:
Steve McIntyre 2013-10-16 23:28:08 +01:00
parent 700eb1571f
commit bc4d87e06f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_all.sh
View File

@ -40,7 +40,7 @@ if [ -z "$IMAGETARGET" ] ; then
IMAGETARGET="official_images"
fi
for ARCHES in i386 amd64 armel armhf ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 source
for ARCHES in i386 amd64 armel armhf ia64 mips mipsel powerpc s390x sparc kfreebsd-amd64 kfreebsd-i386 source
do
export ARCHES
echo "Now we're going to build CD for $ARCHES !"

2
contrib/settings.sh
View File

@ -14,7 +14,7 @@ fi
export EXTRACTED_SOURCES=/mnt/nfs-cdimage/cd-sources
if [ "$ARCHES"x = ""x ] ; then
ARCHES="i386 source amd64 multi-arch powerpc armel armhf ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386"
ARCHES="i386 source amd64 multi-arch powerpc armel armhf ia64 mips mipsel s390x sparc kfreebsd-amd64 kfreebsd-i386"
fi
if [ "$ARCHES_FIRMWARE"x = ""x ] ; then

2
debian/changelog vendored
View File

@ -13,6 +13,8 @@ debian-cd (3.1.14) UNRELEASED; urgency=low
any more, and this is causing build failures.
* Remove mention/support of old kfreebsd 8 kernels - they are not
created any more, and this is causing build failures.
* Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
[ Robert Spencer ]
* Build without isolinux/desktop. Closes: #706150

6
tools/boot/jessie/boot-s390-common
View File

@ -35,10 +35,8 @@ if [ "$DI_WWW_HOME" = "default" ];then
# Tempting as it might be to merge these two definitions using $ARCH,
# do *not* do that - these defs are parsed out by other scripts that
# won't cope with that
if [ "$ARCH" = s390 ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390/daily"
else
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
if [ "$ARCH" = s390x ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
fi
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"

2
update-cd
View File

@ -90,7 +90,7 @@ CAPCODE=`perl -e "print ucfirst("$CODENAME")"`
export FIRSTVER CAPCODE
if [ "$ARCHLIST"x = ""x ] ; then
ARCHLIST="armel armhf amd64 i386 ia64 mips mipsel powerpc s390 s390x sparc source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
ARCHLIST="armel armhf amd64 i386 ia64 mips mipsel powerpc s390x sparc source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
fi
export TDIR NONFREE VER MIRROR CODENAME OUT BASEDIR