proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-04 23:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use dpkg-maintscript-helper to convert directories to symlinks in various upgrade cases, in place of hand-coded equivalents.

Browse Source
This commit is contained in:
Colin Watson 2016-01-16 22:11:02 +00:00
parent a97ee38475
commit 2c014745dd
12 changed files with 22 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -10,6 +10,8 @@ grub2 (2.02~beta2-34) UNRELEASED; urgency=medium
* Drop build-dependency on libusb-dev, since it was currently unused in * Drop build-dependency on libusb-dev, since it was currently unused in
any case; also explicitly configure with --disable-grub-emu-usb to avoid any case; also explicitly configure with --disable-grub-emu-usb to avoid
possible future ambiguity (closes: #810421). possible future ambiguity (closes: #810421).
* Use dpkg-maintscript-helper to convert directories to symlinks in
various upgrade cases, in place of hand-coded equivalents.
[ Didier Roche ] [ Didier Roche ]
* Use new plymouth theme path to set grub theme configuration. * Use new plymouth theme path to set grub theme configuration.

15
debian/control vendored
View File

@ -42,6 +42,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grub/grub.git
Package: grub2 Package: grub2
Section: oldlibs Section: oldlibs
Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends: grub-pc (= ${binary:Version}) [any-i386 any-amd64] | grub-ieee1275 (= ${binary:Version}) [any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64], ${misc:Depends} Depends: grub-pc (= ${binary:Version}) [any-i386 any-amd64] | grub-ieee1275 (= ${binary:Version}) [any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64], ${misc:Depends}
Multi-Arch: foreign Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (dummy package) Description: GRand Unified Bootloader, version 2 (dummy package)
@ -51,6 +52,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
Package: grub-linuxbios Package: grub-linuxbios
Section: oldlibs Section: oldlibs
Architecture: any-i386 any-amd64 Architecture: any-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: grub-coreboot (= ${binary:Version}), ${misc:Depends} Depends: grub-coreboot (= ${binary:Version}), ${misc:Depends}
Multi-Arch: foreign Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (dummy package) Description: GRand Unified Bootloader, version 2 (dummy package)
@ -59,6 +61,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
Package: grub-efi Package: grub-efi
Section: oldlibs Section: oldlibs
Architecture: any-i386 any-amd64 Architecture: any-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (= ${binary:Version}) [any-amd64] Depends: ${misc:Depends}, grub-efi-ia32 (= ${binary:Version}) [any-i386], grub-efi-amd64 (= ${binary:Version}) [any-amd64]
Multi-Arch: foreign Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (dummy package) Description: GRand Unified Bootloader, version 2 (dummy package)
@ -99,6 +102,7 @@ Description: GRand Unified Bootloader (common files for version 2)
Package: grub-emu Package: grub-emu
Architecture: any-i386 any-amd64 any-powerpc Architecture: any-i386 any-amd64 any-powerpc
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
Replaces: grub-common (<= 1.97~beta3-1) Replaces: grub-common (<= 1.97~beta3-1)
Multi-Arch: foreign Multi-Arch: foreign
@ -153,6 +157,7 @@ Description: GRand Unified Bootloader, version 2 (PC/BIOS debug files)
Package: grub-pc Package: grub-pc
Priority: optional Priority: optional
Architecture: any-i386 any-amd64 Architecture: any-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-pc-bin (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any], ${gfxpayload-depends} Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-pc-bin (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any], ${gfxpayload-depends}
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275 Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-xen Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-xen
@ -218,6 +223,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot debug files)
Package: grub-coreboot Package: grub-coreboot
Architecture: any-i386 any-amd64 Architecture: any-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-coreboot-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-coreboot-bin (= ${binary:Version}), ucf
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275 Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275, grub-xen Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275, grub-xen
@ -267,6 +273,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 debug files)
Package: grub-efi-ia32 Package: grub-efi-ia32
Architecture: any-i386 any-amd64 Architecture: any-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia32-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia32-bin (= ${binary:Version}), ucf
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275 Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
@ -317,6 +324,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 debug files)
Package: grub-efi-amd64 Package: grub-efi-amd64
Architecture: i386 kopensolaris-i386 any-amd64 Architecture: i386 kopensolaris-i386 any-amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (= ${binary:Version}), ucf
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275 Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275
Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
@ -365,6 +373,7 @@ Description: GRand Unified Bootloader, version 2 (IA64 debug files)
Package: grub-efi-ia64 Package: grub-efi-ia64
Architecture: any-ia64 Architecture: any-ia64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia64-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia64-bin (= ${binary:Version}), ucf
Conflicts: elilo Conflicts: elilo
Multi-Arch: foreign Multi-Arch: foreign
@ -411,6 +420,7 @@ Description: GRand Unified Bootloader, version 2 (ARM UEFI debug files)
Package: grub-efi-arm Package: grub-efi-arm
Architecture: any-arm Architecture: any-arm
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm-bin (= ${binary:Version}), ucf
Conflicts: grub-uboot Conflicts: grub-uboot
Multi-Arch: foreign Multi-Arch: foreign
@ -457,6 +467,7 @@ Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
Package: grub-efi-arm64 Package: grub-efi-arm64
Architecture: any-arm64 Architecture: any-arm64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf
Multi-Arch: foreign Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (ARM64 UEFI version) Description: GRand Unified Bootloader, version 2 (ARM64 UEFI version)
@ -504,6 +515,7 @@ Description: GRand Unified Bootloader, version 2 (Open Firmware debug files)
Package: grub-ieee1275 Package: grub-ieee1275
Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-ieee1275-bin (= ${binary:Version}), ucf, powerpc-ibm-utils (>= 1.2.12-1) [any-powerpc any-ppc64 any-ppc64el], powerpc-utils [any-powerpc any-ppc64 any-ppc64el] Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-ieee1275-bin (= ${binary:Version}), ucf, powerpc-ibm-utils (>= 1.2.12-1) [any-powerpc any-ppc64 any-ppc64el], powerpc-utils [any-powerpc any-ppc64 any-ppc64el]
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc, grub-xen Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc, grub-xen
@ -570,6 +582,7 @@ Description: GRand Unified Bootloader, version 2 (ARM U-Boot debug files)
Package: grub-uboot Package: grub-uboot
Architecture: any-arm Architecture: any-arm
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-uboot-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-uboot-bin (= ${binary:Version}), ucf
Conflicts: grub-efi-arm Conflicts: grub-efi-arm
Multi-Arch: foreign Multi-Arch: foreign
@ -616,6 +629,7 @@ Description: GRand Unified Bootloader, version 2 (Xen debug files)
Package: grub-xen Package: grub-xen
Architecture: i386 amd64 Architecture: i386 amd64
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-xen-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-xen-bin (= ${binary:Version}), ucf
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-pc Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-pc
Multi-Arch: foreign Multi-Arch: foreign
@ -680,6 +694,7 @@ Description: GRand Unified Bootloader, version 2 (Yeeloong debug files)
Package: grub-yeeloong Package: grub-yeeloong
Architecture: any-mipsel Architecture: any-mipsel
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-yeeloong-bin (= ${binary:Version}), ucf Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-yeeloong-bin (= ${binary:Version}), ucf
Replaces: grub-common (<< 1.98+20100617-2) Replaces: grub-common (<< 1.98+20100617-2)
Multi-Arch: foreign Multi-Arch: foreign

1
debian/grub-efi.maintscript vendored Normal file
View File

@ -0,0 +1 @@
dir_to_symlink /usr/share/doc/grub-efi grub-common 2.00-6~

19
debian/grub-efi.postinst vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh
set -e
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl 2.00-6; then
# Force dpkg to replace this directory with a symlink.
if [ ! -L /usr/share/doc/grub-efi ] && [ -d /usr/share/doc/grub-efi ]; then
if rmdir /usr/share/doc/grub-efi 2>/dev/null; then
ln -sf grub-common /usr/share/doc/grub-efi
fi
fi
fi
;;
esac
#DEBHELPER#
exit 0

1
debian/grub-emu.maintscript.in vendored Normal file
View File

@ -0,0 +1 @@
dir_to_symlink /usr/share/doc/@PACKAGE@ grub-common 2.00-2~

19
debian/grub-emu.postinst.in vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh
set -e
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl 2.00-2; then
# Force dpkg to replace this directory with a symlink.
if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
ln -sf grub-common /usr/share/doc/@PACKAGE@
fi
fi
fi
;;
esac
#DEBHELPER#
exit 0

1
debian/grub-linuxbios.maintscript vendored Normal file
View File

@ -0,0 +1 @@
dir_to_symlink /usr/share/doc/grub-linuxbios grub-common 2.00-6~

19
debian/grub-linuxbios.postinst vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh
set -e
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl 2.00-6; then
# Force dpkg to replace this directory with a symlink.
if [ ! -L /usr/share/doc/grub-linuxbios ] && [ -d /usr/share/doc/grub-linuxbios ]; then
if rmdir /usr/share/doc/grub-linuxbios 2>/dev/null; then
ln -sf grub-common /usr/share/doc/grub-linuxbios
fi
fi
fi
;;
esac
#DEBHELPER#
exit 0

1
debian/grub2.maintscript vendored Normal file
View File

@ -0,0 +1 @@
dir_to_symlink /usr/share/doc/grub2 grub-common 2.00-6~

19
debian/grub2.postinst vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh
set -e
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl 2.00-6; then
# Force dpkg to replace this directory with a symlink.
if [ ! -L /usr/share/doc/grub2 ] && [ -d /usr/share/doc/grub2 ]; then
if rmdir /usr/share/doc/grub2 2>/dev/null; then
ln -sf grub-common /usr/share/doc/grub2
fi
fi
fi
;;
esac
#DEBHELPER#
exit 0

1
debian/maintscript.in vendored Normal file
View File

@ -0,0 +1 @@
dir_to_symlink /usr/share/doc/@PACKAGE@ grub-common 1.99-1~

9
debian/postinst.in vendored
View File

@ -311,15 +311,6 @@ case "$1" in
configure) configure)
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
if dpkg --compare-versions "$2" lt-nl 1.99-1; then
# Force dpkg to replace this directory with a symlink.
if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
ln -sf grub-common /usr/share/doc/@PACKAGE@
fi
fi
fi
devicemap_regenerated= devicemap_regenerated=
if egrep -q '^[[:space:]]*post(inst|rm)_hook[[:space:]]*=[[:space:]]*(/sbin/|/usr/sbin/)?update-grub' /etc/kernel-img.conf 2>/dev/null; then if egrep -q '^[[:space:]]*post(inst|rm)_hook[[:space:]]*=[[:space:]]*(/sbin/|/usr/sbin/)?update-grub' /etc/kernel-img.conf 2>/dev/null; then