From 4f6783b83d722d040707d0b7cd69f27b133bd562 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Jul 2011 11:58:19 +0100 Subject: module-init-tools-cross: Drop static binaries patch as a better fix has been merged Signed-off-by: Richard Purdie --- .../files/no-static-binaries.patch | 25 ---------------------- .../module-init-tools-cross_3.16.bb | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 meta/recipes-kernel/module-init-tools/files/no-static-binaries.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 33fb6e0b04..0000000000 --- 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 , 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 38f047682b..a6c5d21566 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" -- cgit 1.2.3-korg