Patchwork [3/4] module-init-tools-cross: Drop static binaries patch as a better fix has been merged

login
register
mail settings
Submitter Richard Purdie
Date July 27, 2011, 2:29 p.m.
Message ID <0b8b6289a72c9c2c45127af76992fbe5c4ff8086.1311776363.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/8715/
State New, archived
Headers show

Comments

Richard Purdie - July 27, 2011, 2:29 p.m.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../files/no-static-binaries.patch                 |   25 --------------------
 .../module-init-tools-cross_3.16.bb                |    2 -
 2 files changed, 0 insertions(+), 27 deletions(-)
 delete mode 100644 meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch

Patch

diff --git a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
deleted file mode 100644
index 33fb6e0..0000000
--- a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# Building a native, statically-linked insmod can result in ld failing because
-# it can't find a static libc.  A native, static insmod is unnecessary anyway,
-# so this patch just removes it.
-#
-# - jdike@linux.intel.com
-#
-# Change to a simpler method by just disabling static link flag, since even
-# removing those lines don't prevent insmod.static from compile
-#
-# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
-
-Upstream-Status: Pending
-
-Index: module-init-tools-3.2.2/Makefile.am
-===================================================================
---- module-init-tools-3.2.2.orig/Makefile.am	2010-05-26 15:43:16.000000000 -0400
-+++ module-init-tools-3.2.2/Makefile.am	2010-05-26 16:04:06.232990785 -0400
-@@ -10,7 +10,6 @@
- modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h
- 
- insmod_static_SOURCES = insmod.c
--insmod_static_LDFLAGS = -static
- # We don't want the $(zlib_flags) here: that makes a dynamic executable
- insmod_static_LDADD = libmodtools.a
- 
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
index 38f0476..a6c5d21 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
@@ -3,8 +3,6 @@  PR = "r0"
 inherit cross
 PROVIDES += "virtual/${TARGET_PREFIX}depmod"
 
-SRC_URI += "file://no-static-binaries.patch"
-
 SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
 SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"