[Frugalware-git] interim: grub-0.97-21-x86_64

Miklos Vajna vmiklos at frugalware.org
Sun Aug 10 00:37:35 CEST 2008


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=c5c4a49abbd9a4cf4bd49a7fcf77b0b8b3e0c63d

commit c5c4a49abbd9a4cf4bd49a7fcf77b0b8b3e0c63d
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Aug 3 18:03:37 2008 +0200

grub-0.97-21-x86_64
- added 07-grub-macbook-support.patch
- closes #3283

diff --git a/source/base/grub/07-grub-macbook-support.patch b/source/base/grub/07-grub-macbook-support.patch
new file mode 100644
index 0000000..ff551fe
--- /dev/null
+++ b/source/base/grub/07-grub-macbook-support.patch
@@ -0,0 +1,69 @@
+From http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=intelmac_grub.diff;att=1;bug=369655
+
+--- grub-0.97.orig/stage2/asm.S	2004-06-19 18:55:22.000000000 +0200
++++ grub-0.97/stage2/asm.S	2006-04-21 11:10:52.000000000 +0200
+@@ -1651,7 +1651,29 @@
+ 	jnz	3f
+ 	ret
+
+-3:	/* use keyboard controller */
++3:	/*
++	 * try to switch gateA20 using PORT92, the "Fast A20 and Init"
++	 * register
++	*/
++	mov $0x92, %dx
++	inb %dx, %al
++	/* skip the port92 code if it's unimplemented (read returns 0xff) */
++	cmpb $0xff, %al
++	jz 6f
++
++	/* set or clear bit1, the ALT_A20_GATE bit */
++	movb 4(%esp), %ah
++	testb %ah, %ah
++	jz 4f
++	orb $2, %al
++	jmp 5f
++4:	and $0xfd, %al
++
++	/* clear the INIT_NOW bit don't accidently reset the machine */
++5:	and $0xfe, %al
++	outb %al, %dx
++
++6:	/* use keyboard controller */
+ 	pushl	%eax
+
+ 	call    gloop1
+@@ -1661,9 +1683,12 @@
+
+ gloopint1:
+ 	inb	$K_STATUS
++	cmpb	$0xff, %al
++	jz	gloopint1_done
+ 	andb	$K_IBUF_FUL, %al
+ 	jnz	gloopint1
+
++gloopint1_done:
+ 	movb	$KB_OUTPUT_MASK, %al
+ 	cmpb	$0, 0x8(%esp)
+ 	jz	gdoit
+@@ -1684,6 +1709,8 @@
+
+ gloop1:
+ 	inb	$K_STATUS
++	cmpb	$0xff, %al
++	jz	gloop2ret
+ 	andb	$K_IBUF_FUL, %al
+ 	jnz	gloop1
+
+@@ -1991,6 +2018,11 @@
+ ENTRY(console_getkey)
+ 	push	%ebp
+
++wait_for_key:
++	call	EXT_C(console_checkkey)
++	incl	%eax
++	jz	wait_for_key
++
+ 	call	EXT_C(prot_to_real)
+ 	.code16
+
diff --git a/source/base/grub/FrugalBuild b/source/base/grub/FrugalBuild
index ab0bfbc..809b7af 100644
--- a/source/base/grub/FrugalBuild
+++ b/source/base/grub/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=grub
pkgver=0.97
-pkgrel=20
+pkgrel=21
pkgdesc="The GNU GRand Unified Bootloader"
url="http://www.gnu.org/software/grub/"
depends=('texinfo')
@@ -20,7 +20,16 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz \
03-$pkgname-$pkgver-gcc4.patch \
04-grub-0.97-x86_64.patch \
05-grub-0.97-initrdaddr.diff \
-	06-grub-support-256byte-inode.patch)
+	06-grub-support-256byte-inode.patch \
+	07-grub-macbook-support.patch)
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' \
+          'ffe895e10705633228caa903cd5ec8f0e9b4f416' \
+          'ea8fcfc066d2ada5ebccfa3f6c5fc5ffc0dd9225' \
+          '220d1b55f6573b026f7f6cbc583b8aeaede20878' \
+          '157b81dbad3576536b08642242accfa1aeb093a9' \
+          'adbb4685c98797ffb4dc83561ec75698991dddbd' \
+          '389913c8b09e5882373e7cb233ecfefb7ad3a3cb' \
+          '56223e12b2460c3390674158eddfb5a14a2efcc6')

# Original patch was for Debian at:
# http://neverborn.org/files/grub-gfxboot/source/grub-gfxboot/ and
@@ -57,12 +66,5 @@ build()
#	Ffilerel /boot/grub/message
}

-sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' \
-          'ffe895e10705633228caa903cd5ec8f0e9b4f416' \
-          'ea8fcfc066d2ada5ebccfa3f6c5fc5ffc0dd9225' \
-          '220d1b55f6573b026f7f6cbc583b8aeaede20878' \
-          '157b81dbad3576536b08642242accfa1aeb093a9' \
-          'adbb4685c98797ffb4dc83561ec75698991dddbd' \
-          '389913c8b09e5882373e7cb233ecfefb7ad3a3cb')
# optimization OK


More information about the Frugalware-git mailing list