- Same grub-mkrescue for grub-pc and grub-coreboot, used by

grub-rescue-pc during postinst now.

debian/changelog

@@ -1,9 +1,11 @@
-grub2 (1.97+20091109-1) unstable; urgency=low
+grub2 (1.97+20091114-1) unstable; urgency=low
 
   * New upstream snapshot.
     - Fix security problem with password checking.  (Closes: #555195)
     - Fix the generated GNU/Hurd menu entries and also add support for
       it in 30_os-prober. (Closes: #555188)
+    - Same grub-mkrescue for grub-pc and grub-coreboot, used by
+      grub-rescue-pc during postinst now.
 
   [ Felix Zielcke ]
   * Ship grub-mkisofs in grub-common.

debian/control

@@ -50,7 +50,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
 Package: grub-common
 Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia powerpc sparc
 Depends: ${shlibs:Depends}, base-files (>= 4.0.1~), ${misc:Depends}
-Replaces: grub-pc (<< 1.96+20080831-1), grub-ieee1275 (<< 1.96+20080831-1), grub-efi (<< 1.96+20080831-1), grub-coreboot (<< 1.96+20080831-1), grub-linuxbios (<< 1.96+20080831-1)
+Replaces: grub-pc (<< 1.97+20091114-1), grub-ieee1275 (<< 1.96+20080831-1), grub-efi (<< 1.96+20080831-1), grub-coreboot (<< 1.97+20091114-1), grub-linuxbios (<< 1.96+20080831-1)
 Recommends: os-prober (>= 1.33)
 Suggests: multiboot-doc [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia], grub-emu
 # See bugs #435983 and #455746
@@ -91,7 +91,7 @@ Description: GRand Unified Bootloader, version 2 (PC/BIOS version)
 
 Package: grub-rescue-pc
 Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia
-Depends: base-files (>= 4.0.1~), ${misc:Depends}
+Depends: ${misc:Depends}, grub-pc (>= 1.97+20091114-1), grub-common (>= 1.97+20091114-1)
 Description: GRUB bootable rescue images, version 2 (PC/BIOS version)
  This package contains two GRUB rescue images that have been built for use with
  traditional PC/BIOS architecture:

debian/grub-common.examples

@@ -0,0 +1 @@
+docs/grub.cfg

debian/grub-rescue-pc.install

@@ -1,2 +0,0 @@
-build/grub-rescue-pc/grub-rescue-floppy.img	usr/lib/grub-rescue
-build/grub-rescue-pc/grub-rescue-cdrom.iso	usr/lib/grub-rescue

debian/grub-rescue-pc.postinst

@@ -0,0 +1,27 @@
+#!/bin/bash -e
+
+case "$1" in
+  configure)
+    tmpdir=`mktemp -d`
+    mkdir -p ${tmpdir}/boot/grub
+    cp /usr/share/doc/grub-common/examples/grub.cfg ${tmpdir}/boot/grub/
+    grub-mkrescue --output=/usr/lib/grub-rescue/grub-rescue-cdrom.iso ${tmpdir}
+    rm -rf ${tmpdir}
+
+    # grub-mkfloppy doesn't support overlays
+    grub-mkfloppy --output=/usr/lib/grub-rescue/grub-rescue-floppy.img
+  ;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+  ;;
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/rules

@@ -61,23 +61,6 @@ build/grub-common build/grub-pc build/grub-efi-ia32 build/grub-efi-amd64 build/g
 build/grub-emu::
 	$(MAKE) -C $@ grub-emu
 
-build/grub-rescue-pc:: build/grub-pc
-	mkdir -p $@
-	mkdir -p $@/rescue-disk/boot/grub
-	cp docs/grub.cfg $@/rescue-disk/boot/grub/
-	$(CURDIR)/build/grub-pc/grub-mkrescue \
-		--pkglibdir=$(CURDIR)/build/grub-pc \
-		--grub-mkimage=$(CURDIR)/build/grub-pc/grub-mkimage \
-		--overlay=$@/rescue-disk/ \
-		--image-type=floppy \
-		$(CURDIR)/$@/grub-rescue-floppy.img
-	$(CURDIR)/build/grub-pc/grub-mkrescue \
-		--pkglibdir=$(CURDIR)/build/grub-pc \
-		--grub-mkimage=$(CURDIR)/build/grub-pc/grub-mkimage \
-		--overlay=$@/rescue-disk/ \
-		--image-type=cdrom \
-		$(CURDIR)/$@/grub-rescue-cdrom.iso
-
 build/grub-firmware-qemu::
 	$(MAKE) -C $@
 	grub_dir=`mktemp -d` ; \
@@ -101,7 +84,7 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee12
 	# shipped with grub-common
 	rm -rf $(CURDIR)/debian/$(subst install/,,$@)/etc/grub.d
 	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{sbin,share/man/man8}/{grub-dumpbios,grub-probe,grub-emu,grub-mkconfig,grub-mkdevicemap,grub-ofpathname}{,.8}
-	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/{grub-mkelfimage,grub-mkfont,grub-editenv,grub-mkisofs}{,.1}
+	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/{grub-mkelfimage,grub-mkfont,grub-editenv,grub-mkisofs,grub-mkrescue}{,.1}
 	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
 	rm -rf $(CURDIR)/debian/$(subst install/,,$@)/usr/share/{grub,info}/
 	rm -rf $(CURDIR)/debian/$(subst install/,,$@)/usr/include
@@ -144,7 +127,7 @@ install/grub-common::
 	$(MAKE) -C $(subst install/,build/,$@) install DESTDIR=$(CURDIR)/debian/$(subst install/,,$@)/
 	rm -rf $(CURDIR)/debian/$(subst install/,,$@)/usr/lib/grub/{i386,powerpc,sparc64}-*
 	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{sbin,share/man/man8}/{update-grub,grub-install,grub-setup,grub-emu}{,.8}
-	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/grub-{mkimage,mkrescue}{,.1}
+	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/grub-mkimage{,.1}
 	rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/share/info/dir*
 
 clean:: debian/legacy/update-grub debian/grub-extras