[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH 1/5] Install hfsutils in-target for NewWorld Power Macs (adapted from d-i/yaboot-installer).

On 11/14/2017 02:10 PM, John Paul Adrian Glaubitz wrote:
On 11/06/2017 12:13 PM, Frank Scheiner wrote:
The installation of the hfsutils package is located in debian/postinst
similar to d-i/yaboot-installer, from which the code was adapted. But
d-i/grub-installer does all in-target installations from the
`grub-installer` script itself. If this is important this can still be
moved to `grub-installer`.

It should be moved to grub-installer for consistency reasons. Also, you
don't need to mention this code was taken from the yaboot-installer

The commit message should be simply:

"Install hfsutils in-target for powerpc/ppc64 neworld targets"

Ok, will fix this now.

+    * Install hfsutils in-target for NewWorld Power Macs (adapted from
+      d-i/yaboot-installer).
- -- Frank Scheiner <frank.scheiner@web.de> Thu, 31 Oct 2017 20:08:00 +0200
+ -- Frank Scheiner <frank.scheiner@web.de>  Thu, 06 Nov 2017 08:42:00 +0200

How did you create the second changelog entry?

Manually... :-/

 Normally you should just
run "dch" which should not alter the timestamp at the bottom. Please
recreate the changelog entry with just "dch" so the timestamp doesn't

I suspected that a tool can be used for this, though I didn't know which one. But if `dch` doesn't change the timestamp, than the last addition will have the timestamp of the original one.

+case $ARCH in
+    powerpc/powermac_newworld|ppc64/powermac_newworld)
+	if ! apt-install hfsutils; then
+		info "Calling 'apt-install hfsutils' failed"
+		# Hm, unable to install hfsutils into /target/, what should we do?
+		db_input critical grub-installer/apt_install_hfsutils_failed || [ $? -eq 30 ]
+		if ! db_go; then
+			db_progress STOP
+			exit 10 # back up to menu
+		fi
+		db_get grub-installer/apt_install_hfsutils_failed
+		if [ "$RET" != true ]; then
+			db_progress STOP
+			exit 1
+		fi
+	fi
+	;;

This should be moved to the grub-installer script at the appropriate
position. I would suggest placing it into a new case statement after
the case statement to wipe the prep partition which starts around line
400. So, please put it after that one and, again, match with
$ARCH:$grub_package instead of just $ARCH.

Will change the match, but the whole installation part is needed earlier, before nw_format_offs() - which needs hfsutils - will get called in the match on [1] when PATCH 3/5 is applied.

[1]: https://anonscm.debian.org/cgit/d-i/grub-installer.git/tree/grub-installer?id=4f256e2d5b2de91dab1b4efa2795d5d8c3c960cd#n241


Reply to: