summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-06-21 13:24:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 09:41:56 +0100
commit19be8b3f784d098a5173fbda28616ef4774298db (patch)
treea59efe04b8220ad37ef86a2104ea6aff261407bf /meta
parentc3df564889daacc7024317efdf7265f13326d4fa (diff)
downloadpoky-19be8b3f784d098a5173fbda28616ef4774298db.tar.gz
ed: Upgrade to v1.8
License files chenged but not the license type (From OE-Core rev: 10fb74abc7a34ff47b7e9abd210836b612ff75d3) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch43
-rw-r--r--meta/recipes-extended/ed/ed_1.7.bb28
-rw-r--r--meta/recipes-extended/ed/ed_1.8.bb27
3 files changed, 27 insertions, 71 deletions
diff --git a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
deleted file mode 100644
index d30b393364..0000000000
--- a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
2
32007-04-16 Mike Frysinger <vapier@gentoo.org>
4
5 * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
6 override if they so choose.
7 * Only set CFLAGS/CXXFLAGS if user did not specify any.
8
9ed had already taken GPLv3 when this patch out, so it should be GPLv3.
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11
12Upstream-Status: Pending
13
14Index: ed-1.5/configure
15===================================================================
16--- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700
17+++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800
18@@ -26,10 +26,6 @@
19 mandir='$(datadir)/man'
20 sysconfdir='$(prefix)/etc'
21 program_prefix=
22-CC=
23-CPPFLAGS=
24-CFLAGS='-Wall -W -O2'
25-LDFLAGS=
26
27 # Loop over all args
28 while [ -n "$1" ] ; do
29@@ -105,6 +101,14 @@
30 esac
31 done
32
33+# Defaults if the user did not select any
34+if [ x"${CFLAGS+set}" != xset ] ; then
35+ CFLAGS='-Wall -W -O2'
36+fi
37+if [ x"${CXXFLAGS+set}" != xset ] ; then
38+ CXXFLAGS='-Wall -W -O2'
39+fi
40+
41 # Find the source files, if location was not specified.
42 srcdirtext=
43 if [ -z "${srcdir}" ] ; then
diff --git a/meta/recipes-extended/ed/ed_1.7.bb b/meta/recipes-extended/ed/ed_1.7.bb
deleted file mode 100644
index 005743889b..0000000000
--- a/meta/recipes-extended/ed/ed_1.7.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1DESCRIPTION = "a line-oriented text editor"
2HOMEPAGE = "http://www.gnu.org/software/ed/"
3BUGTRACKER = ""
4
5LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
7 file://ed.h;endline=20;md5=c708cda1b2e8d723d458690b7db03878 \
8 file://main.c;endline=24;md5=1bd039d59e04ee5f82adcc970144a2c3"
9
10SECTION = "base"
11PR = "r0"
12
13# LSB states that ed should be in /bin/
14bindir = "${base_bindir}"
15
16SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \
17 file://ed-1.2-build.patch"
18
19SRC_URI[md5sum] = "0aa4e2428e325203d0d7c3e86c961b1c"
20SRC_URI[sha256sum] = "894241019a5ff2b7816d20c5bd5a7048fb8f336ca52e97b3cc88d45b16472031"
21
22do_configure() {
23 ${S}/configure
24}
25
26do_install() {
27 oe_runmake 'DESTDIR=${D}' install
28}
diff --git a/meta/recipes-extended/ed/ed_1.8.bb b/meta/recipes-extended/ed/ed_1.8.bb
new file mode 100644
index 0000000000..c6b50752a5
--- /dev/null
+++ b/meta/recipes-extended/ed/ed_1.8.bb
@@ -0,0 +1,27 @@
1DESCRIPTION = "a line-oriented text editor"
2HOMEPAGE = "http://www.gnu.org/software/ed/"
3BUGTRACKER = ""
4
5LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
7 file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \
8 file://main.c;endline=24;md5=1b31246da5e3864d7b30094ff76bf7ed"
9
10SECTION = "base"
11PR = "r0"
12
13# LSB states that ed should be in /bin/
14bindir = "${base_bindir}"
15
16SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz"
17
18SRC_URI[md5sum] = "2268d2344b3c52d23730acb2e3c942fe"
19SRC_URI[sha256sum] = "64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273"
20
21do_configure() {
22 ${S}/configure
23}
24
25do_install() {
26 oe_runmake 'DESTDIR=${D}' install
27}