diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/mtools | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.bz2 openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.xz openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.zip |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/mtools')
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch | 63 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/mtools.patch | 127 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools/no-x11.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/mtools/mtools_3.9.9.bb | 22 |
4 files changed, 231 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch new file mode 100644 index 000000000..35fae44ab --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -0,0 +1,63 @@ +--- mtools-3.9.9/configure.in.orig 2006-04-14 16:05:54.337655192 -0600 ++++ mtools-3.9.9/configure.in 2006-04-14 16:12:29.736545424 -0600 +@@ -21,6 +21,33 @@ + AC_C_CONST + AC_C_INLINE + ++AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ) ++if test "x$MAKEINFO" = "x"; then ++ MAKEINFO="@echo makeinfo missing; true" ++fi ++AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, ) ++if test "x$TEXI2DVI" = "x"; then ++ TEXI2DVI="@echo texi2dvi missing; true" ++fi ++AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, ) ++if test "x$TEXI2PDF" = "x"; then ++ TEXI2PDF="@echo texi2pdf missing; true" ++fi ++AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ) ++if test "x$TEXI2HTML" = "x"; then ++ TEXI2HTML="@echo texi2html missing; true" ++fi ++AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, ) ++if test "x$DVI2PS" = "x"; then ++ DVI2PS="@echo dvi2ps missing; true" ++fi ++ ++AC_SUBST(MAKEINFO) ++AC_SUBST(TEXI2DVI) ++AC_SUBST(TEXI2PDF) ++AC_SUBST(TEXI2HTML) ++AC_SUBST(DVI2PS) ++ + + dnl Check for configuration options + dnl Enable OS/2 extended density format disks +--- mtools-3.9.9/Makefile.in.sav 2006-04-14 15:56:19.000000000 -0600 ++++ mtools-3.9.9/Makefile.in 2006-04-14 16:15:29.315245312 -0600 +@@ -11,10 +11,11 @@ + USERLDFLAGS = + USERLDLIBS = + +-MAKEINFO = makeinfo +-TEXI2DVI = texi2dvi +-TEXI2PDF = texi2pdf +-TEXI2HTML = texi2html ++MAKEINFO = @MAKEINFO@ ++TEXI2DVI = @TEXI2DVI@ ++TEXI2PDF = @TEXI2PDF@ ++TEXI2HTML = @TEXI2HTML@ ++DVI2PS = @DVI2PS@ + + + # do not edit below this line +@@ -181,7 +182,7 @@ + + ps: mtools.ps + %.ps: %.dvi +- dvips -f < $< > $@ ++ $(DVI2PS) -f < $< > $@ + + pdf: mtools.pdf + %.pdf: %.texi diff --git a/meta/recipes-devtools/mtools/mtools/mtools.patch b/meta/recipes-devtools/mtools/mtools/mtools.patch new file mode 100644 index 000000000..2abf53473 --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/mtools.patch @@ -0,0 +1,127 @@ +$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ + +--- + Makefile.in | 74 ++++++++++++++++++++++++++---------------------------------- + 1 file changed, 33 insertions(+), 41 deletions(-) + +Index: mtools-3.9.9/Makefile.in +=================================================================== +--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100 ++++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100 +@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html + + # Don't cd, to avoid breaking install-sh references. + install-info: info +- $(top_srcdir)/mkinstalldirs $(infodir) ++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir) + if test -f mtools.info; then \ + for i in mtools.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/mtools.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi; \ +- if [ -n "$(INSTALL_INFO)" ] ; then \ +- if [ -f $(infodir)/dir.info ] ; then \ +- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ +- fi; \ +- if [ -f $(infodir)/dir ] ; then \ +- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ +- fi; \ +- fi + + uninstall-info: + cd $(infodir) && rm -f mtools.info* + +-install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \ +- $(bindir)/mkmanifest install-scripts install-info ++install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \ ++ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info + + uninstall: uninstall-bin uninstall-man uninstall-links \ + uninstall-scripts +@@ -228,52 +220,52 @@ distclean: clean texclean + maintainer-clean: distclean + + +-$(bindir)/floppyd: floppyd +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd ++${DESTDIR}$(bindir)/floppyd: floppyd ++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ++ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd + +-$(bindir)/floppyd_installtest: floppyd_installtest +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest ++${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest ++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ++ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest + +-$(bindir)/mtools: mtools +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(INSTALL_PROGRAM) mtools $(bindir)/mtools ++${DESTDIR}$(bindir)/mtools: mtools ++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ++ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools + +-$(bindir)/mkmanifest: mkmanifest +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest ++${DESTDIR}$(bindir)/mkmanifest: mkmanifest ++ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ++ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest + + #$(ETCDIR)/mtools: mtools.etc + # cp mtools.etc $(ETCDIR)/mtools + +-install-links: $(bindir)/mtools ++install-links: ${DESTDIR}$(bindir)/mtools + @for j in $(LINKS); do \ +- rm -f $(bindir)/$$j ; \ +- $(LN_S) mtools $(bindir)/$$j ; \ +- echo $(bindir)/$$j ; \ ++ rm -f ${DESTDIR}$(bindir)/$$j ; \ ++ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \ ++ echo ${DESTDIR}$(bindir)/$$j ; \ + done + + ## "z" is the older version of "gz"; the name is just *too* short +-install-scripts: $(bindir)/mtools +- @$(top_srcdir)/mkinstalldirs $(bindir) ++install-scripts: ${DESTDIR}$(bindir)/mtools ++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + @for j in $(SCRIPTS) ; do \ +- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \ +- echo $(bindir)/$$j ; \ ++ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \ ++ echo ${DESTDIR}$(bindir)/$$j ; \ + done +- rm -f $(bindir)/lz +- $(LN_S) uz $(bindir)/lz ++ rm -f ${DESTDIR}$(bindir)/lz ++ $(LN_S) uz ${DESTDIR}$(bindir)/lz + + install-man: +- @$(top_srcdir)/mkinstalldirs $(MAN1DIR) ++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR) + @for j in $(MAN1); do \ +- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \ +- echo $(MAN1DIR)/$$j ; \ ++ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \ ++ echo ${DESTDIR}$(MAN1DIR)/$$j ; \ + done +- @$(top_srcdir)/mkinstalldirs $(MAN5DIR) ++ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR) + @for j in $(MAN5); do \ +- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \ +- echo $(MAN5DIR)/$$j ; \ ++ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \ ++ echo ${DESTDIR}$(MAN5DIR)/$$j ; \ + done + + uninstall-bin: diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.patch b/meta/recipes-devtools/mtools/mtools/no-x11.patch new file mode 100644 index 000000000..300f43f00 --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/no-x11.patch @@ -0,0 +1,19 @@ +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- mtools-3.9.9.orig/Makefile.in ++++ mtools-3.9.9/Makefile.in +@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) + CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) + LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ + ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) +-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS) ++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS) + X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) + + all: mtools $(LINKS) mkmanifest @FLOPPYD@ + + %.o: %.c diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb new file mode 100644 index 000000000..932d88f2a --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb @@ -0,0 +1,22 @@ +# mtools OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them." +HOMEPAGE="http://mtools.linux.lu" +LICENSE="GPL" +PR = "r4" + +#http://mtools.linux.lu/mtools-${PV}.tar.gz +SRC_URI="http://folks.o-hand.com/richard/poky/sources/mtools-${PV}.tar.gz \ + file://mtools-makeinfo.patch;patch=1 \ + file://mtools.patch;patch=1 \ + file://no-x11.patch;patch=1" + +S = "${WORKDIR}/mtools-${PV}" + +inherit autotools + +EXTRA_OECONF = "--without-x" + +BBCLASSEXTEND = "native" |