--- Begin Message ---
Package: grub-installer
Version: 1.91
Severity: normal
Tags: patch
User: debian-powerpc@lists.debian.org
Usertags: ppc64el
Dear Maintainer,
here is a patch from Ubuntu to add support for the ppc64el architecture.
Thank you,
F.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)
Kernel: Linux 3.14-1-powerpc64le (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru grub-installer-1.91/debian/control grub-installer-1.91/debian/control
--- grub-installer-1.91/debian/control 2013-07-13 07:09:07.000000000 +0000
+++ grub-installer-1.91/debian/control 2014-05-16 14:35:00.000000000 +0000
@@ -8,7 +8,7 @@
Vcs-Git: git://anonscm.debian.org/d-i/grub-installer.git
Package: grub-installer
-Architecture: i386 hurd-i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc mipsel
+Architecture: i386 hurd-i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el mipsel
XB-Subarchitecture: ${subarch}
Provides: bootable-system
Depends: cdebconf-udeb, kernel-installer, created-fstab, di-utils (>= 1.15), di-utils-mapdevfs, os-prober, partman-utils
diff -Nru grub-installer-1.91/debian/grub-installer.install grub-installer-1.91/debian/grub-installer.install
--- grub-installer-1.91/debian/grub-installer.install 2011-07-31 01:01:26.000000000 +0000
+++ grub-installer-1.91/debian/grub-installer.install 2014-05-16 14:39:53.000000000 +0000
@@ -3,3 +3,4 @@
functions.sh usr/share/grub-installer
otheros.sh usr/share/grub-installer
ensure-active usr/lib/grub-installer
+prep-bootdev usr/lib/grub-installer
diff -Nru grub-installer-1.91/grub-installer grub-installer-1.91/grub-installer
--- grub-installer-1.91/grub-installer 2013-07-13 07:09:07.000000000 +0000
+++ grub-installer-1.91/grub-installer 2014-05-16 14:35:00.000000000 +0000
@@ -331,6 +331,9 @@
grub_package="grub-ieee1275"
experimental_arch
;;
+ ppc64el/*)
+ grub_package="grub-ieee1275"
+ ;;
mipsel/loongson-2f)
grub_package="grub-yeeloong"
;;
@@ -581,6 +584,10 @@
fi
fi
;;
+ ppc64el/*:grub-ieee1275)
+ bootdev="$(/usr/lib/grub-installer/prep-bootdev)"
+ state=3
+ ;;
*)
# No need for install device selection on other platforms.
bootdev=dummy
@@ -765,9 +772,16 @@
grub_install_params="$grub_install_params --force"
fi
+ case $ARCH:$grub_package in
+ ppc64el/*:grub-ieee1275)
+ info "Wiping PReP partition $bootdev"
+ log-output -t grub-installer dd if=/dev/zero of="$bootdev" bs=512 count="$(blockdev --getsz "$bootdev")"
+ ;;
+ esac
+
CODE=0
case $ARCH:$grub_package in
- *:grub|*:grub-pc|*:grub-efi|sparc:grub-ieee1275)
+ *:grub|*:grub-pc|*:grub-efi|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275)
info "Running $chroot $ROOT grub-install $grub_install_params \"$bootdev\""
log-output -t grub-installer $chroot $ROOT grub-install $grub_install_params "$bootdev" || CODE=$?
;;
@@ -780,7 +794,7 @@
info "grub-install ran successfully"
else
case $ARCH:$grub_package in
- *:grub|*:grub-pc|*:grub-efi|sparc:grub-ieee1275)
+ *:grub|*:grub-pc|*:grub-efi|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275)
error "Running 'grub-install $grub_install_params \"$bootdev\"' failed."
;;
*)
diff -Nru grub-installer-1.91/Makefile grub-installer-1.91/Makefile
--- grub-installer-1.91/Makefile 2011-07-31 01:01:26.000000000 +0000
+++ grub-installer-1.91/Makefile 2014-05-16 14:39:53.000000000 +0000
@@ -1,9 +1,12 @@
CFLAGS := -Os -g -Wall
-all: ensure-active
+all: ensure-active prep-bootdev
ensure-active: ensure-active.c
$(CC) $(CFLAGS) $^ -o $@ -lparted
+prep-bootdev: prep-bootdev.c
+ $(CC) $(CFLAGS) $^ -o $@ -lparted
+
clean:
- rm -f ensure-active
+ rm -f ensure-active prep-bootdev
diff -Nru grub-installer-1.91/prep-bootdev.c grub-installer-1.91/prep-bootdev.c
--- grub-installer-1.91/prep-bootdev.c 1970-01-01 00:00:00.000000000 +0000
+++ grub-installer-1.91/prep-bootdev.c 2014-05-21 15:16:14.000000000 +0000
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <parted/parted.h>
+
+int
+main(int argc, char *argv[])
+{
+ PedDevice *dev;
+
+ ped_exception_fetch_all();
+ ped_device_probe_all();
+ for (dev = ped_device_get_next(NULL); dev;
+ dev = ped_device_get_next(dev)) {
+ PedDisk *disk;
+ PedPartition *part;
+
+ disk = ped_disk_new(dev);
+ if (!disk)
+ continue;
+
+ for (part = ped_disk_next_partition(disk, NULL); part;
+ part = ped_disk_next_partition(disk, part)) {
+ if (ped_partition_is_active(part) &&
+ ped_partition_get_flag(part, PED_PARTITION_PREP)) {
+ char *path;
+
+ path = ped_partition_get_path(part);
+ if (path) {
+ printf("%s\n", path);
+ free(path);
+ return 0;
+ }
+ free(path);
+ }
+ }
+ }
+
+ return 0;
+}
--- End Message ---
--- Begin Message ---
Source: grub-installer
Source-Version: 1.95
We believe that the bug you reported is fixed in the latest version of
grub-installer, 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 753718@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Colin Watson <cjwatson@debian.org> (supplier of updated grub-installer 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@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 12 Jul 2014 09:45:43 +0100
Source: grub-installer
Binary: grub-installer
Architecture: source i386
Version: 1.95
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Colin Watson <cjwatson@debian.org>
Description:
grub-installer - Install GRUB on a hard disk (udeb)
Closes: 650414 753718
Changes:
grub-installer (1.95) unstable; urgency=medium
.
* Add ${shlibs:Depends}, and replace dependency on cdebconf-udeb with
${misc:Depends}.
* Use --set=root rather than --set in GRUB 2 configuration emitted by
otheros.sh (closes: #650414).
* Add ppc64el support (closes: #753718).
Checksums-Sha1:
c0a2f33519409abe7fd9917d1759820a406f25d2 1978 grub-installer_1.95.dsc
576ab4853ac3349c1b4e3678e46d25eacbac9b6b 192436 grub-installer_1.95.tar.xz
a833cf82f69313fc439170dcff78da016f0e4ece 261866 grub-installer_1.95_i386.udeb
Checksums-Sha256:
a783d0c3eb19c130f322c9ccc22be5d9757aa178b1a766cd191ed83560c8410b 1978 grub-installer_1.95.dsc
2a56c1a192b8174a1e9533e4ad2813f2f86fedcc109d15c00964a0345013e33a 192436 grub-installer_1.95.tar.xz
7b424b025e6cb110ec160e7634b657b49838305dd828d38d3c77cbab45170df8 261866 grub-installer_1.95_i386.udeb
Files:
159a9f8298e5a8ec4f6c87b935a8bfb6 261866 debian-installer standard grub-installer_1.95_i386.udeb
ca10998eb0d838a759f262a0a6b2751d 1978 debian-installer standard grub-installer_1.95.dsc
66dd59e94ad05c47e1ffadf9e9520af4 192436 debian-installer standard grub-installer_1.95.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Colin Watson <cjwatson@debian.org> -- Debian developer
iQIVAwUBU8D2gjk1h9l9hlALAQgpAg/7B9YwLfkZRZzqkgZLDy3ez6ET/1kwLIbB
Za74h7iEe69t7SKmsSnPTCOZj5tXjeG8LTHOsgotHpdVzOxhmr1CsDQSFebvPElN
+ILOTWSoYoPnI/V0DlC2GQRTVvC4yEHqMOzB/CuPGj1EzDnYK8qlQgtHvV3VrCi3
Li5O46tAoHZaOZ15js+ZNPZryD2sBpYypfE0rzQqjQYay9TGpXc0J7j/P9Np2cJR
fEuWpDO510GKi3K+bQekCXlJ+3ANXfgz2GkBLZ8s1CFKYlSn1Q5PKzdcTqgzkj38
6/VafylhlBYTrq+7zDd1WXEs8GMx8wRYpLNj+Soyq5EK4mPAmLOO1VeP/Kv3+SCS
Wx8PUbJcTGjez/Ynqi2axa7IMByUo7XHRvjEvrwY+zOt6sOCPTAT537NXqVKLmhI
PDi92vhgI355dGtrl1QqstiU2ZmQpM1BSxJtRbiJr+Jtyk6kRWBkGpO3Jf/7fRLL
XuBqJt88Nxz6glBfDO5hPs3WZQo3B91ZvZVcpXCnDpTi2JZgMvzN8qs+N/393szu
Vdj0Rx8pHShpZuhsG6ehDu+aX6zbTr6RlJC/Ty2S/c0rwO9ecoDgASCoNfxHmc41
2Z95C6EhvKhqsF0Of6JwHoGC/gTXlOFD44/OuCV4pZYo0OmMcWwakNgq5Th7t9c2
pY7zAk9+WFA=
=Py7m
-----END PGP SIGNATURE-----
--- End Message ---