Bug#703436: Multi-arch builds uses wrong UDEB_EXCLUDE
Package: debian-cd
Version: 3.1.11
When building multi-arch ISOs I noted a error that repeated twice.
WARNING: Unable to read UDEB_EXCLUDE file
/home/idms/debian-cd/data/squeeze/amd64_netinst_udeb_exclude
WARNING: Unable to read UDEB_EXCLUDE file
/home/idms/debian-cd/data/squeeze/amd64_netinst_udeb_exclude
The fact that it repeated exactly looked suspicious. Further
investigation revealed that the same exclude file was used despite the arch.
WARNING: Unable to read UDEB_EXCLUDE file
/home/idms/debian-cd/data/squeeze/amd64_netinst_udeb_exclude [amd64]
WARNING: Unable to read UDEB_EXCLUDE file
/home/idms/debian-cd/data/squeeze/amd64_netinst_udeb_exclude [i386]
Looking at the code showed that it made false assumptions and therefore
the amd64 run tainted the i386 one.
I've assumed that the code is supposed to be checking for a settings in
CONF.sh and added a check for that.
I'm also assuming that UDEB_INCLUDE, being in the same area as
UDEB_EXCLUDE, suffers from the same problem.
Attached please find a patch file that fixes the error.
--
Robert Spencer
--- tools/start_new_disc~ 2012-05-30 07:35:23.000000000 +0000
+++ tools/start_new_disc 2013-03-18 13:17:39.000000000 +0000
@@ -166,12 +166,20 @@
echo " Adding udeb/base includes/excludes"
+ # Check if the following has been set by CONF.sh
+ if [ -z "$UDEB_INCLUDE" ]; then
+ NO_UDEB_INCLUDE=1
+ fi
+ if [ -z "$UDEB_EXCLUDE" ]; then
+ NO_UDEB_EXCLUDE=1
+ fi
+
for ARCH in $ARCHES
do
if [ $ARCH != source ] ; then
# Netinst/businesscard CD have different
# udeb_include and udeb_exclude files
- if [ -z "$UDEB_INCLUDE" ] ; then
+ if [ -n "$NO_UDEB_INCLUDE" ] ; then
case "$INSTALLER_CD"x in
"1"x)
UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_include;;
@@ -182,7 +190,7 @@
esac
fi
- if [ -z "$UDEB_EXCLUDE" ] ; then
+ if [ -n "$NO_UDEB_EXCLUDE" ] ; then
case "$INSTALLER_CD"x in
"1"x)
UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_exclude;;
Reply to: