| 1 |
commit: f9b3e92c2fd7512eecee3f259193912a83e00db1 |
| 2 |
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Dec 30 15:03:32 2011 +0000 |
| 4 |
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Dec 30 15:03:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f9b3e92c |
| 7 |
|
| 8 |
x11-drivers/ati-drivers: hardened fixups |
| 9 |
|
| 10 |
This commit add a patch needed for hardened to compile |
| 11 |
It just rename the WARN enum entry in kcl_debug.h |
| 12 |
to avoid a name collision with the kernel WARN macro |
| 13 |
|
| 14 |
Many thanks to Zhang Hongjiu <noctuorare <AT> gmail.com> |
| 15 |
for the solution. |
| 16 |
|
| 17 |
--- |
| 18 |
...11.12-r1.ebuild => ati-drivers-11.12-r2.ebuild} | 7 +++- |
| 19 |
.../files/ati-drivers-redefine-WARN.patch | 39 ++++++++++++++++++++ |
| 20 |
2 files changed, 45 insertions(+), 1 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild |
| 23 |
similarity index 98% |
| 24 |
rename from x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 25 |
rename to x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild |
| 26 |
index a397629..73b44b5 100644 |
| 27 |
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 28 |
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild |
| 29 |
@@ -320,7 +320,12 @@ src_prepare() { |
| 30 |
|| die "Replacing 'finger' with 'who' failed." |
| 31 |
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and |
| 32 |
# add function to detect default state. |
| 33 |
- epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch" |
| 34 |
+ epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die \ |
| 35 |
+ "Failed to epatch powermode-opt-path-2.patch" |
| 36 |
+ |
| 37 |
+ # fix needed for at least hardened-sources, see bug #392753 |
| 38 |
+ epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch || die \ |
| 39 |
+ "Failed to epatch ati-drivers-redefine-WARN.patch" |
| 40 |
|
| 41 |
cd "${MODULE_DIR}" |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch |
| 45 |
new file mode 100644 |
| 46 |
index 0000000..fe5ed2f |
| 47 |
--- /dev/null |
| 48 |
+++ b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch |
| 49 |
@@ -0,0 +1,39 @@ |
| 50 |
+--- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2011-12-30 14:32:00.271391437 +0100 |
| 51 |
++++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2011-12-30 15:48:21.647473696 +0100 |
| 52 |
+@@ -85,8 +85,8 @@ |
| 53 |
+ #ifdef ERROR |
| 54 |
+ #undef ERROR |
| 55 |
+ #endif |
| 56 |
+-#ifdef WARN |
| 57 |
+-#undef WARN |
| 58 |
++#ifdef AMD_WARN |
| 59 |
++#undef AMD_WARN |
| 60 |
+ #endif |
| 61 |
+ #ifdef INFO |
| 62 |
+ #undef INFO |
| 63 |
+@@ -122,7 +122,7 @@ |
| 64 |
+ { |
| 65 |
+ SPECIAL = 0, |
| 66 |
+ ERROR , |
| 67 |
+- WARN , |
| 68 |
++ AMD_WARN , |
| 69 |
+ INFO , |
| 70 |
+ INFOEX, |
| 71 |
+ TRACE, |
| 72 |
+@@ -163,14 +163,14 @@ |
| 73 |
+ { |
| 74 |
+ {SPECIAL , 'S'}, |
| 75 |
+ {ERROR , 'E'}, |
| 76 |
+- {WARN , 'W'}, |
| 77 |
++ {AMD_WARN , 'W'}, |
| 78 |
+ {INFO , 'I'}, |
| 79 |
+ {INFOEX , 'X'}, |
| 80 |
+ {TRACE , 'T'}, |
| 81 |
+ {PERFORMANCE , 'P'}, |
| 82 |
+ {DUMP , 'D'}, |
| 83 |
+ }; |
| 84 |
+-#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) |
| 85 |
++#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) |
| 86 |
+ #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX))) |
| 87 |
+ static module_map module_type_map[LOG_M_MAX] = |
| 88 |
+ { |
Archives