summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-02 12:04:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit2345af9b4829ed3eed5abf60f2483055649f8af7 (patch)
tree96a9a31e4b1957b93c4fe3eb669117d2752caf0d /meta/recipes-devtools/mtools
parentc4901328fe5cf912c0965e5b011b64a95a9bcb9d (diff)
downloadpoky-2345af9b4829ed3eed5abf60f2483055649f8af7.tar.gz
recipes: Move out stale GPLv2 versions to a seperate layeruninative-1.5
These are recipes where the upstream has moved to GPLv3 and these old versions are the last ones under the GPLv2 license. There are several reasons for making this move. There is a different quality of service with these recipes in that they don't get security fixes and upstream no longer care about them, in fact they're actively hostile against people using old versions. The recipes tend to need a different kind of maintenance to work with changes in the wider ecosystem and there needs to be isolation between changes made in the v3 versions and those in the v2 versions. There are probably better ways to handle a "non-GPLv3" system but right now having these in OE-Core makes them look like a first class citizen when I believe they have potential for a variety of undesireable issues. Moving them into a separate layer makes their different needs clearer, it also makes it clear how many of these there are. Some are probably not needed (e.g. mc), I also wonder whether some are useful (e.g. gmp) since most things that use them are GPLv3 only already. Someone could now more clearly see how to streamline the list of recipes here. I'm proposing we mmove to this separate layer for 2.3 with its future maintinership and testing to be determined in 2.4 and beyond. (From OE-Core rev: 19b7e950346fb1dde6505c45236eba6cd9b33b4b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mtools')
-rw-r--r--meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch23
-rw-r--r--meta/recipes-devtools/mtools/mtools/mtools.patch129
-rw-r--r--meta/recipes-devtools/mtools/mtools/no-x11.patch21
-rw-r--r--meta/recipes-devtools/mtools/mtools_3.9.9.bb55
4 files changed, 0 insertions, 228 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch b/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
deleted file mode 100644
index cb454917ff..0000000000
--- a/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
4Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
5---
6 Makefile.in | 1 +
7 1 file changed, 1 insertion(+)
8
9diff --git a/Makefile.in b/Makefile.in
10index 8f9305a..694e837 100644
11--- a/Makefile.in
12+++ b/Makefile.in
13@@ -251,6 +251,7 @@ install-scripts: ${DESTDIR}$(bindir)/mtools
14 @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
15 @for j in $(SCRIPTS) ; do \
16 $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
17+ $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
18 echo ${DESTDIR}$(bindir)/$$j ; \
19 done
20 rm -f ${DESTDIR}$(bindir)/lz
21--
222.0.0
23
diff --git a/meta/recipes-devtools/mtools/mtools/mtools.patch b/meta/recipes-devtools/mtools/mtools/mtools.patch
deleted file mode 100644
index 15a32088d1..0000000000
--- a/meta/recipes-devtools/mtools/mtools/mtools.patch
+++ /dev/null
@@ -1,129 +0,0 @@
1$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
2
3---
4 Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
5 1 file changed, 33 insertions(+), 41 deletions(-)
6
7Upstream-Status: Inappropriate [licensing]
8
9Index: mtools-3.9.9/Makefile.in
10===================================================================
11--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100
12+++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100
13@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
14
15 # Don't cd, to avoid breaking install-sh references.
16 install-info: info
17- $(top_srcdir)/mkinstalldirs $(infodir)
18+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
19 if test -f mtools.info; then \
20 for i in mtools.info*; do \
21- $(INSTALL_DATA) $$i $(infodir)/$$i; \
22+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
23 done; \
24 else \
25 for i in $(srcdir)/mtools.info*; do \
26- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
27+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
28 done; \
29 fi; \
30- if [ -n "$(INSTALL_INFO)" ] ; then \
31- if [ -f $(infodir)/dir.info ] ; then \
32- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
33- fi; \
34- if [ -f $(infodir)/dir ] ; then \
35- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
36- fi; \
37- fi
38
39 uninstall-info:
40 cd $(infodir) && rm -f mtools.info*
41
42-install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \
43- $(bindir)/mkmanifest install-scripts install-info
44+install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \
45+ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
46
47 uninstall: uninstall-bin uninstall-man uninstall-links \
48 uninstall-scripts
49@@ -228,52 +220,52 @@ distclean: clean texclean
50 maintainer-clean: distclean
51
52
53-$(bindir)/floppyd: floppyd
54- $(top_srcdir)/mkinstalldirs $(bindir)
55- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
56+${DESTDIR}$(bindir)/floppyd: floppyd
57+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
58+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
59
60-$(bindir)/floppyd_installtest: floppyd_installtest
61- $(top_srcdir)/mkinstalldirs $(bindir)
62- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
63+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
64+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
65+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
66
67-$(bindir)/mtools: mtools
68- $(top_srcdir)/mkinstalldirs $(bindir)
69- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
70+${DESTDIR}$(bindir)/mtools: mtools
71+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
72+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
73
74-$(bindir)/mkmanifest: mkmanifest
75- $(top_srcdir)/mkinstalldirs $(bindir)
76- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
77+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
78+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
79+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
80
81 #$(ETCDIR)/mtools: mtools.etc
82 # cp mtools.etc $(ETCDIR)/mtools
83
84-install-links: $(bindir)/mtools
85+install-links: ${DESTDIR}$(bindir)/mtools
86 @for j in $(LINKS); do \
87- rm -f $(bindir)/$$j ; \
88- $(LN_S) mtools $(bindir)/$$j ; \
89- echo $(bindir)/$$j ; \
90+ rm -f ${DESTDIR}$(bindir)/$$j ; \
91+ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
92+ echo ${DESTDIR}$(bindir)/$$j ; \
93 done
94
95 ## "z" is the older version of "gz"; the name is just *too* short
96-install-scripts: $(bindir)/mtools
97- @$(top_srcdir)/mkinstalldirs $(bindir)
98+install-scripts: ${DESTDIR}$(bindir)/mtools
99+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
100 @for j in $(SCRIPTS) ; do \
101- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
102- echo $(bindir)/$$j ; \
103+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
104+ echo ${DESTDIR}$(bindir)/$$j ; \
105 done
106- rm -f $(bindir)/lz
107- $(LN_S) uz $(bindir)/lz
108+ rm -f ${DESTDIR}$(bindir)/lz
109+ $(LN_S) uz ${DESTDIR}$(bindir)/lz
110
111 install-man:
112- @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
113+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
114 @for j in $(MAN1); do \
115- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
116- echo $(MAN1DIR)/$$j ; \
117+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
118+ echo ${DESTDIR}$(MAN1DIR)/$$j ; \
119 done
120- @$(top_srcdir)/mkinstalldirs $(MAN5DIR)
121+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
122 @for j in $(MAN5); do \
123- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
124- echo $(MAN5DIR)/$$j ; \
125+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
126+ echo ${DESTDIR}$(MAN5DIR)/$$j ; \
127 done
128
129 uninstall-bin:
diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.patch b/meta/recipes-devtools/mtools/mtools/no-x11.patch
deleted file mode 100644
index 705b62944d..0000000000
--- a/meta/recipes-devtools/mtools/mtools/no-x11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1---
2 Makefile.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5Upstream-Status: Inappropriate [licensing]
6
7--- mtools-3.9.9.orig/Makefile.in
8+++ mtools-3.9.9/Makefile.in
9@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
10 X_PRE_LIBS = @X_PRE_LIBS@
11 CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
12 CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
13 LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
14 ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
15-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS)
16+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
17 X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
18
19 all: mtools $(LINKS) mkmanifest @FLOPPYD@
20
21 %.o: %.c
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
deleted file mode 100644
index 2904ff4f98..0000000000
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1SUMMARY = "Utilities to access MS-DOS disks without mounting them"
2DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them."
3HOMEPAGE = "http://www.gnu.org/software/mtools/"
4SECTION = "optional"
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=92b58ec77696788ce278b044d2a8e9d3"
7PR = "r6"
8
9DEPENDS += "virtual/libiconv"
10
11RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850"
12RRECOMMENDS_${PN}_libc-glibc = "\
13 glibc-gconv-ibm437 \
14 glibc-gconv-ibm737 \
15 glibc-gconv-ibm775 \
16 glibc-gconv-ibm851 \
17 glibc-gconv-ibm852 \
18 glibc-gconv-ibm855 \
19 glibc-gconv-ibm857 \
20 glibc-gconv-ibm860 \
21 glibc-gconv-ibm861 \
22 glibc-gconv-ibm862 \
23 glibc-gconv-ibm863 \
24 glibc-gconv-ibm865 \
25 glibc-gconv-ibm866 \
26 glibc-gconv-ibm869 \
27 "
28SRC_URI[md5sum] = "3e68b857b4e1f3a6521d1dfefbd30a36"
29SRC_URI[sha256sum] = "af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e"
30
31#http://mtools.linux.lu/mtools-${PV}.tar.gz
32SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
33 file://mtools-makeinfo.patch \
34 file://mtools.patch \
35 file://no-x11.patch \
36 file://fix-broken-lz.patch \
37 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
38 "
39
40inherit autotools texinfo
41
42EXTRA_OECONF = "--without-x"
43
44LDFLAGS_append_libc-uclibc = " -liconv "
45
46BBCLASSEXTEND = "native nativesdk"
47
48PACKAGECONFIG ??= ""
49PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd"
50
51do_install_prepend () {
52 # Create bindir to fix parallel installation issues
53 mkdir -p ${D}/${bindir}
54 mkdir -p ${D}/${datadir}
55}