diff --git a/debian/changelog b/debian/changelog index 09a502136..df3be4b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ grub2 (2.02-3) UNRELEASED; urgency=medium * Use current location for upstream signing key (debian/upstream/signing-key.asc). * Update upstream signing key to a non-expired version. + * Install bootinfo.txt and grub.chrp in grub-ieee1275-bin for ppc64, and + install and use prep-bootdev on powerpc and ppc64 as well as ppc64el + (thanks, John Paul Adrian Glaubitz; closes: #881730). [ Debconf translations ] * [sq] Albanian (Silva Arapi; closes: #874497). diff --git a/debian/grub-ieee1275-bin.install.powerpc.in b/debian/grub-ieee1275-bin.install.powerpc.in index 8755593da..76af24ba6 100644 --- a/debian/grub-ieee1275-bin.install.powerpc.in +++ b/debian/grub-ieee1275-bin.install.powerpc.in @@ -1,2 +1,3 @@ usr/lib/grub/@CPU_PLATFORM@/bootinfo.txt usr/lib/grub/@CPU_PLATFORM@/grub.chrp +../../debian/prep-bootdev usr/lib/grub/@CPU_PLATFORM@ diff --git a/debian/grub-ieee1275-bin.install.ppc64.in b/debian/grub-ieee1275-bin.install.ppc64.in new file mode 100644 index 000000000..76af24ba6 --- /dev/null +++ b/debian/grub-ieee1275-bin.install.ppc64.in @@ -0,0 +1,3 @@ +usr/lib/grub/@CPU_PLATFORM@/bootinfo.txt +usr/lib/grub/@CPU_PLATFORM@/grub.chrp +../../debian/prep-bootdev usr/lib/grub/@CPU_PLATFORM@ diff --git a/debian/postinst.in b/debian/postinst.in index 1fe45ba0d..d02bd806d 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -724,7 +724,7 @@ case "$1" in grub-ieee1275) case $(dpkg --print-architecture) in - ppc64el) + powerpc|ppc64|ppc64el) # Output may be empty; if so, just update the core image but # don't install it to any PReP partition. prep_bootdev="$(/usr/lib/grub/powerpc-ieee1275/prep-bootdev)"