[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#703436: marked as done (Multi-arch builds uses wrong UDEB_EXCLUDE)

Your message dated Tue, 30 Apr 2013 22:17:30 +0000
with message-id <E1UXIra-0006a3-OG@franck.debian.org>
and subject line Bug#703436: fixed in debian-cd 3.1.13
has caused the Debian Bug report #703436,
regarding Multi-arch builds uses wrong UDEB_EXCLUDE
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
703436: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703436
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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;;

--- End Message ---
--- Begin Message --- 
Source: debian-cd
Source-Version: 3.1.13

We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 703436@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 30 Apr 2013 22:54:32 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.13
Distribution: unstable
Urgency: medium
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description: 
 debian-cd  - Tools for building (Official) Debian CD set
Closes: 703436 705594 705610
Changes: 
 debian-cd (3.1.13) unstable; urgency=medium
 .
   * The traditional "last upload before the stable release" upload...
 .
   [ Robert Spencer ]
   * Use ARCHIVE_KEYRING_PACKAGE and ARCHIVE_KEYRING_FILE parameters to
     not hardcode debian-archive-keyring and let derivatives use their
     own keyring.
   * Add further support for missing win32-loader.ini. Closes: #705594
   * Allow for override of distro name etc. in grub.cfg for EFI boot too.
     Closes: #705610
 .
   [ Steve McIntyre ]
   * Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
     builds should work better. Closes: #703436
   * Remove the dpkg check for debootstrap version before passing the
     --no-check-gpg option; we're not going to support debootstrap versions
     so old that they don't support this flag, *and* the dpkg-query call
     doesn't give us the right version anyway - we're using an extracted
     copy from the archive, not the one that (might be) installed on our
     build machine.
Checksums-Sha1: 
 d4b181cd1316869436ccf01cb5adba849defe1df 1680 debian-cd_3.1.13.dsc
 b190c1c5d0c42df72e7a6a1bac2ce5bc7f474dc7 874044 debian-cd_3.1.13.tar.gz
 035998b1adf825866cb682a4921bcda34591cba9 884818 debian-cd_3.1.13_all.deb
Checksums-Sha256: 
 b45f3063848e8abe0ea7164fbb95608483cd077e32d9a7f96a11abae2c16da92 1680 debian-cd_3.1.13.dsc
 c2e6e26e80edc514d095b62822a98ee2b172ba65ee1f05b454d99aab8ce73d21 874044 debian-cd_3.1.13.tar.gz
 f3a1638f0f00c21309eab76c98255197112f3696b3a9cdc5ccd45ac8af476c53 884818 debian-cd_3.1.13_all.deb
Files: 
 256e96a9cb0272cba6dc795403557b95 1680 admin extra debian-cd_3.1.13.dsc
 bf355d0962f197e1360714f89e9a65f3 874044 admin extra debian-cd_3.1.13.tar.gz
 94f8e9cfb72e2225b9b948aca3ebb194 884818 admin extra debian-cd_3.1.13_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJRgD9xAAoJEFh5eVc0QmhO2kkP/R/X3ZgDd1ExuKEvMfueNQyq
g6cbqSWQEPVvt6o/PTvofeRvBh2sThTFK5FUiouAaGvlurU61w56/WHYX7k7afZa
th6bzKETCVa4/ekaYjShJv7m+vjboXOWn8Ena4QjRQNrpjlr1w4genH6f28D/EpK
1AbkSZpuqMHTPLFYRo14vqYCtQni+YjuavAgzM2zGcRr5R2XpzyPwPxaE4gtONSc
RnoffSpscTfVhguB8bVQYqbCeraKSsjLxr1l+NGcjnS2O8d2iTzxn+X/wyNtgJAi
dg31sulyF7Kh/7KpP41774MD4MLCuMcXd0Ndi5EgLhLuG+AC/E/JUaFbwwPOCXRI
39Dv+oTgc/G1ic/JclPqqeyQxVwSgfiuEfbS7fhmLTJNYIbkJ4X6hkhrtRAI6l1i
nNd8dwyhOgKAjRpkRRDSt0/4zGL1b7Vtd9JE6PQl5gMQxM3uZgpzZRljug3UOvYh
vcptlyPvNq/HrPMEY0cOTGhjRQ11Qs4R8voAf+MbwbubF7zlnFFMBMJl7lf9G4yG
enEbMPMYWp/ak6JSyXSorod5ah2h6mqgDksJTgZjeYuoUQf2FlEJyfaofEukYWuO
wnX24ACFjwGDOHz4RJ0qOguy/kBUIznHaplTNJ3C7puR/xw4i3BOPXQf0utxPaN7
W8lo5Z8WvdKGPWR3Ujdu
=obgc
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: