summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/gnu-efi/ChangeLog5
-rw-r--r--sys-boot/gnu-efi/Manifest5
-rw-r--r--sys-boot/gnu-efi/files/gnu-efi-3.0i-crt0.diff (renamed from sys-boot/gnu-efi/files/gnu-efi-3.0i-stack.diff)0
-rw-r--r--sys-boot/gnu-efi/files/gnu-efi-3.0i-setjmp.diff13
-rw-r--r--sys-boot/gnu-efi/gnu-efi-3.0i-r1.ebuild3
5 files changed, 23 insertions, 3 deletions
diff --git a/sys-boot/gnu-efi/ChangeLog b/sys-boot/gnu-efi/ChangeLog
index 4c4cd76..4cb40ba 100644
--- a/sys-boot/gnu-efi/ChangeLog
+++ b/sys-boot/gnu-efi/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
25 Jul 2010; Dane Smith (c1pher) <smithdanea@gmail.com>
+ gnu-efi-3.0i-r1.ebuild, +files/gnu-efi-3.0i-crt0.diff,
+ +files/gnu-efi-3.0i-setjmp.diff, -files/gnu-efi-3.0i-stack.diff:
+ New patch for the other QA warning.
+
+ 25 Jul 2010; Dane Smith (c1pher) <smithdanea@gmail.com>
gnu-efi-3.0i-r1.ebuild, files/gnu-efi-3.0i-stack.diff:
Actually using the patch tends to help.
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index edf6233..4d2ba40 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,7 +1,8 @@
AUX gnu-efi-3.0a-lds-redhat.patch 881 RMD160 86746f8664fcd068466112502fc89a9f228dcfd1 SHA1 1ee0363dc26736de1a301bfb4c94561cbb651515 SHA256 1e7d9bd7717d9315a96f237e4e4a3ea3b6ffb7e61c3e4de1fca74e8e11b58a9b
AUX gnu-efi-3.0a-lds.patch 995 RMD160 037cf3e08911a01e13846e5adb9c3e56354bc544 SHA1 01f2256709aad74fba97911f5b278cd4d7b37c87 SHA256 d5e07eb3d5172e62be1f8e766709e93c7bff1b7f5aee47cd4fac888036bc886d
-AUX gnu-efi-3.0i-stack.diff 418 RMD160 4e72cc20aa6b3b7a1df87943271f5262c285ee8f SHA1 150ed51e223b3e7df205d5693185e915b0ed499a SHA256 e7dd930187beff2d43b668d319214c22749803b9169d4577e66ca6033a996f85
+AUX gnu-efi-3.0i-crt0.diff 418 RMD160 4e72cc20aa6b3b7a1df87943271f5262c285ee8f SHA1 150ed51e223b3e7df205d5693185e915b0ed499a SHA256 e7dd930187beff2d43b668d319214c22749803b9169d4577e66ca6033a996f85
+AUX gnu-efi-3.0i-setjmp.diff 357 RMD160 7631e3b0fac443c0b20e2f98ad481ddded520523 SHA1 0b1bce5c662f60f97a4e5cb95c198cca11881c32 SHA256 6fb439471a457d786b92523c2fd6f1cd03ce17aaa2c14e1cf3482d8dd3b403e4
DIST gnu-efi_3.0i-2.diff.gz 4838 RMD160 b6113d71f3ec616e55840ce89848fcc335074e8a SHA1 48a79fb85bdab45697310c6eff69ee414b89c4ad SHA256 4488db1978215e06a6e859fb75491d7f5bd5a6821e70be0ba604f0de628a442f
DIST gnu-efi_3.0i.orig.tar.gz 135068 RMD160 c73924116b56e8d4394bdb17cf08a267b6c33f97 SHA1 a4f9bd00e777452648e0d57b32080e63f54f2ee1 SHA256 13bea8e387984e04d93e14004a2e24539802fb2bd42cac112c8a816395d95366
-EBUILD gnu-efi-3.0i-r1.ebuild 1290 RMD160 3f1e899ab6e3428beeb22262833a9b72c5e10751 SHA1 d11c49ef0cca73061bee91a178c6b0b337887b68 SHA256 6d6fe12b7d38ef05f5ccfe172ded91d787251c146b0da030123d1d3c7d0616a5
+EBUILD gnu-efi-3.0i-r1.ebuild 1328 RMD160 76ca3848e20dad62cbf054c75f3ca4dc27afb1ff SHA1 a961872bcbdd368f67ce861230d07d92c8f3a4a9 SHA256 e376ddb0529fcedd082bcfab698e967c17e647bc06b5b60a992ddf6c566b0988
MISC ChangeLog 556 RMD160 42d379280f11275475d32ec23791d1d502812494 SHA1 6265cef6bb8711dd18a517f8afeb9d3f35624b56 SHA256 0556d565bcc17d72a476965334b56bb03907c4f7c5ba0908fbef2c55e71b4bb6
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0i-stack.diff b/sys-boot/gnu-efi/files/gnu-efi-3.0i-crt0.diff
index 8ab617c..8ab617c 100644
--- a/sys-boot/gnu-efi/files/gnu-efi-3.0i-stack.diff
+++ b/sys-boot/gnu-efi/files/gnu-efi-3.0i-crt0.diff
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0i-setjmp.diff b/sys-boot/gnu-efi/files/gnu-efi-3.0i-setjmp.diff
new file mode 100644
index 0000000..27b50ba
--- /dev/null
+++ b/sys-boot/gnu-efi/files/gnu-efi-3.0i-setjmp.diff
@@ -0,0 +1,13 @@
+--- gnuefi/setjmp_ia32.S 2008-09-18 14:32:08.000000000 -0400
++++ gnuefi/setjmp_ia32.S.new 2010-07-25 16:17:33.000000000 -0400
+@@ -54,6 +54,10 @@
+ *
+ */
+
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+ #define EXT_C(sym) sym
+ #define FUNCTION(x) .globl EXT_C(x) ; .type EXT_C(x), "function" ; EXT_C(x):
+
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0i-r1.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0i-r1.ebuild
index 776bbd8..8aa4d3b 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0i-r1.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0i-r1.ebuild
@@ -23,7 +23,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-stack.diff
+ epatch "${FILESDIR}"/${P}-crt0.diff
+ epatch "${FILESDIR}"/${P}-setjmp.diff
ebegin Applying ../*.diff
# Using epatch on this is annoying because it wants to create the elilo-3.6/
# directory. Since all the files are new, it doesn't know better.