Adjust packaging for x32.

- Build-depend on cpio on x32 as well.
- Make grub-efi-ia32-bin and grub-efi-amd64-bin depend on efibootmgr on
  any Linux architecture for which they are built (in practice, adding
  x32).
- Build grub-mount-udeb on x32 as well.
- Add Lintian binary-from-other-architecture overrides where
  appropriate.

diff --git a/debian/changelog b/debian/changelog
index fde39c6b77e5bd9af02d975f7118334127a19ab1..6137ed6a7fa264c925bea8a531921ef2e0799dc0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ grub2 (2.02~beta2-12) UNRELEASED; urgency=medium
 
   * Point Vcs-* fields back at master.
   * Support grub-emu on x32 (closes: #760428).
+  * Adjust packaging for x32:
+    - Build-depend on cpio on x32 as well.
+    - Make grub-efi-ia32-bin and grub-efi-amd64-bin depend on efibootmgr on
+      any Linux architecture for which they are built (in practice, adding
+      x32).
+    - Build grub-mount-udeb on x32 as well.
+    - Add Lintian binary-from-other-architecture overrides where
+      appropriate.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 19 Aug 2014 13:19:40 +0100
 

diff --git a/debian/control b/debian/control
index bb4540dc73869f80eb4eb254709cd96224e97274..2bab93e11ab379567870d09b2e06aff8b91e9506 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 7.4.2~),
  libsdl1.2-dev [!hurd-any],
  xorriso (>= 0.5.6.pl00),
  qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
- cpio [i386 kopensolaris-i386 amd64],
+ cpio [i386 kopensolaris-i386 amd64 x32],
  parted [!hurd-any],
  libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
  ttf-dejavu-core,
@@ -237,7 +237,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot version)
 
 Package: grub-efi-ia32-bin
 Architecture: any-i386 any-amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [i386 amd64]
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
 Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-ia32 (<< 1.99-1)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (EFI-IA32 binaries)
@@ -287,7 +287,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 version)
 
 Package: grub-efi-amd64-bin
 Architecture: i386 kopensolaris-i386 any-amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [i386 amd64]
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
 Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader, version 2 (EFI-AMD64 binaries)
@@ -689,6 +689,6 @@ Description: GRand Unified Bootloader, version 2 (starfield theme)
 Package: grub-mount-udeb
 XC-Package-Type: udeb
 Section: debian-installer
-Architecture: i386 amd64 powerpc ppc64 ppc64el sparc sparc64 mipsel ia64 armel armhf arm64 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64 x32 powerpc ppc64 ppc64el sparc sparc64 mipsel ia64 armel armhf arm64 kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: export GRUB filesystems using FUSE

diff --git a/debian/rules b/debian/rules
index f478e942dfed166c12a8cfdd3acc38340a9a464e..97210bce4effaef1f34152b661da1665dc31de3b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -296,7 +296,8 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia
                | sed -e "s%.*%$(package_bin): unstripped-binary-or-object &%g" \
        >> $(CURDIR)/debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin)
        if ([ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ]) || \
-          [ "$@" = "install/grub-xen" ] ; then \
+          ([ "$@" != "install/grub-emu" ] && [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" = "amd64:32" ]) || \
+          [ "$@" = "install/grub-xen" ]; then \
                echo "$(package_bin): binary-from-other-architecture *.mod" \
                        >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ; \
                cd debian/tmp-$(package) && find usr/lib/grub -name kernel.img \
@@ -309,7 +310,7 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia
            [ "$@" = "install/grub-xen" ] || \
            [ "$@" = "install/grub-emu" ]) && \
           [ "$(DEB_HOST_ARCH_OS)" = "linux" ] && \
-          [ "$(DEB_HOST_ARCH_CPU)" = "i386" ] ; then \
+          [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" != "amd64:64" ] ; then \
                echo "$(package_bin): binary-from-other-architecture *efiemu64.o" \
                        >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ; \
        fi
@@ -323,6 +324,7 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia
                | sed -e "s%.*%$(package_dbg): statically-linked-binary &%g" \
        >> $(CURDIR)/debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg)
        if ([ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ]) || \
+          ([ "$@" != "install/grub-emu" ] && [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" = "amd64:32" ]) || \
           [ "$@" = "install/grub-xen" ] ; then \
                echo "$(package_dbg): binary-from-other-architecture *.module" \
                        >> debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) ; \