diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-20 17:09:10 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 10:25:35 +0000 |
commit | f92b248d9640d6de1d5fbccb6acf0c3b60689dea (patch) | |
tree | 8ebbde2733cc0862a83e6f7544b57f5d80720e81 /meta | |
parent | 869a677483cdd31889dd95b6d82554c9ac0cc50d (diff) | |
download | poky-f92b248d9640d6de1d5fbccb6acf0c3b60689dea.tar.gz |
ed: fix patch and LIC_FILES_CHKSUM
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 16 | ||||
-rw-r--r-- | meta/recipes-extended/ed/ed_1.5.bb | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch index a65c433d57..4c92aa2ce4 100644 --- a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch +++ b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | |||
@@ -9,24 +9,22 @@ http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html | |||
9 | ed had already taken GPLv3 when this patch out, so it should be GPLv3. | 9 | ed had already taken GPLv3 when this patch out, so it should be GPLv3. |
10 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | 10 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> |
11 | 11 | ||
12 | Index: ed-1.4/configure | 12 | Index: ed-1.5/configure |
13 | =================================================================== | 13 | =================================================================== |
14 | --- ed-1.4.orig/configure 2009-07-10 19:54:33.000000000 +0800 | 14 | --- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700 |
15 | +++ ed-1.4/configure 2010-08-05 17:41:51.000000000 +0800 | 15 | +++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800 |
16 | @@ -26,12 +26,6 @@ | 16 | @@ -26,10 +26,6 @@ |
17 | mandir='$(datadir)/man' | 17 | mandir='$(datadir)/man' |
18 | sysconfdir='$(prefix)/etc' | 18 | sysconfdir='$(prefix)/etc' |
19 | program_prefix= | 19 | program_prefix= |
20 | -CC= | 20 | -CC= |
21 | -CXX= | ||
22 | -CPPFLAGS= | 21 | -CPPFLAGS= |
23 | -CFLAGS='-Wall -W -O2' | 22 | -CFLAGS='-Wall -W -O2' |
24 | -CXXFLAGS='-Wall -W -O2' | ||
25 | -LDFLAGS= | 23 | -LDFLAGS= |
26 | 24 | ||
27 | # Loop over all args | 25 | # Loop over all args |
28 | while [ x"$1" != x ] ; do | 26 | while [ -n "$1" ] ; do |
29 | @@ -111,6 +105,14 @@ | 27 | @@ -105,6 +101,14 @@ |
30 | esac | 28 | esac |
31 | done | 29 | done |
32 | 30 | ||
@@ -40,4 +38,4 @@ Index: ed-1.4/configure | |||
40 | + | 38 | + |
41 | # Find the source files, if location was not specified. | 39 | # Find the source files, if location was not specified. |
42 | srcdirtext= | 40 | srcdirtext= |
43 | if [ x"${srcdir}" = x ] ; then | 41 | if [ -z "${srcdir}" ] ; then |
diff --git a/meta/recipes-extended/ed/ed_1.5.bb b/meta/recipes-extended/ed/ed_1.5.bb index 0243769e90..2242ffa663 100644 --- a/meta/recipes-extended/ed/ed_1.5.bb +++ b/meta/recipes-extended/ed/ed_1.5.bb | |||
@@ -4,8 +4,8 @@ BUGTRACKER = "" | |||
4 | 4 | ||
5 | LICENSE = "GPLv3+" | 5 | LICENSE = "GPLv3+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ |
7 | file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \ | 7 | file://ed.h;endline=20;md5=238781cd8e436dabb0e9f18443400066 \ |
8 | file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b" | 8 | file://main.c;endline=24;md5=177fe82d0649e545591a13fdce5733e8" |
9 | 9 | ||
10 | SECTION = "base" | 10 | SECTION = "base" |
11 | PR = "r0" | 11 | PR = "r0" |