From 532361b00aab739928fdcb767d74f99d253d0b06 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Oct 2007 21:52:01 +0000 Subject: mtools, cdrtools: Move from meta-extras to meta for boot CD support git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2869 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/cdrtools/cdrtools-native_2.01.bb | 23 -------- .../packages/mtools/files/mtools-makeinfo.patch | 63 ---------------------- meta-extras/packages/mtools/mtools-native_3.9.9.bb | 8 --- meta-extras/packages/mtools/mtools_3.9.9.bb | 14 ----- meta/packages/cdrtools/cdrtools-native_2.01.bb | 23 ++++++++ meta/packages/mtools/files/mtools-makeinfo.patch | 63 ++++++++++++++++++++++ meta/packages/mtools/mtools-native_3.9.9.bb | 8 +++ meta/packages/mtools/mtools_3.9.9.bb | 14 +++++ 8 files changed, 108 insertions(+), 108 deletions(-) delete mode 100644 meta-extras/packages/cdrtools/cdrtools-native_2.01.bb delete mode 100644 meta-extras/packages/mtools/files/mtools-makeinfo.patch delete mode 100644 meta-extras/packages/mtools/mtools-native_3.9.9.bb delete mode 100644 meta-extras/packages/mtools/mtools_3.9.9.bb create mode 100644 meta/packages/cdrtools/cdrtools-native_2.01.bb create mode 100644 meta/packages/mtools/files/mtools-makeinfo.patch create mode 100644 meta/packages/mtools/mtools-native_3.9.9.bb create mode 100644 meta/packages/mtools/mtools_3.9.9.bb diff --git a/meta-extras/packages/cdrtools/cdrtools-native_2.01.bb b/meta-extras/packages/cdrtools/cdrtools-native_2.01.bb deleted file mode 100644 index 9b148517d2..0000000000 --- a/meta-extras/packages/cdrtools/cdrtools-native_2.01.bb +++ /dev/null @@ -1,23 +0,0 @@ -# cdrtools-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -LICENSE="GPL" -DESCRIPTION="A set of tools for CD recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html" - -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2" - -S="${WORKDIR}/cdrtools-${PV}" - -inherit native - -STAGE_TEMP="${WORKDIR}/stage_temp" - -do_stage() { - install -d ${STAGE_TEMP} - make install INS_BASE=${STAGE_TEMP} - - install -d ${STAGING_BINDIR} - install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR} -} diff --git a/meta-extras/packages/mtools/files/mtools-makeinfo.patch b/meta-extras/packages/mtools/files/mtools-makeinfo.patch deleted file mode 100644 index 35fae44aba..0000000000 --- a/meta-extras/packages/mtools/files/mtools-makeinfo.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- 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-extras/packages/mtools/mtools-native_3.9.9.bb b/meta-extras/packages/mtools/mtools-native_3.9.9.bb deleted file mode 100644 index 16a0c37f7c..0000000000 --- a/meta-extras/packages/mtools/mtools-native_3.9.9.bb +++ /dev/null @@ -1,8 +0,0 @@ -# mtools-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require mtools_${PV}.bb -S="${WORKDIR}/mtools-${PV}" - -inherit autotools native diff --git a/meta-extras/packages/mtools/mtools_3.9.9.bb b/meta-extras/packages/mtools/mtools_3.9.9.bb deleted file mode 100644 index 90b1cf5830..0000000000 --- a/meta-extras/packages/mtools/mtools_3.9.9.bb +++ /dev/null @@ -1,14 +0,0 @@ -# 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" - -SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ - file://mtools-makeinfo.patch;patch=1" - -#DEPENDS = "tetex-native" - -inherit autotools diff --git a/meta/packages/cdrtools/cdrtools-native_2.01.bb b/meta/packages/cdrtools/cdrtools-native_2.01.bb new file mode 100644 index 0000000000..9b148517d2 --- /dev/null +++ b/meta/packages/cdrtools/cdrtools-native_2.01.bb @@ -0,0 +1,23 @@ +# cdrtools-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +LICENSE="GPL" +DESCRIPTION="A set of tools for CD recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html" + +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2" + +S="${WORKDIR}/cdrtools-${PV}" + +inherit native + +STAGE_TEMP="${WORKDIR}/stage_temp" + +do_stage() { + install -d ${STAGE_TEMP} + make install INS_BASE=${STAGE_TEMP} + + install -d ${STAGING_BINDIR} + install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR} +} diff --git a/meta/packages/mtools/files/mtools-makeinfo.patch b/meta/packages/mtools/files/mtools-makeinfo.patch new file mode 100644 index 0000000000..35fae44aba --- /dev/null +++ b/meta/packages/mtools/files/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/packages/mtools/mtools-native_3.9.9.bb b/meta/packages/mtools/mtools-native_3.9.9.bb new file mode 100644 index 0000000000..16a0c37f7c --- /dev/null +++ b/meta/packages/mtools/mtools-native_3.9.9.bb @@ -0,0 +1,8 @@ +# mtools-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require mtools_${PV}.bb +S="${WORKDIR}/mtools-${PV}" + +inherit autotools native diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb new file mode 100644 index 0000000000..90b1cf5830 --- /dev/null +++ b/meta/packages/mtools/mtools_3.9.9.bb @@ -0,0 +1,14 @@ +# 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" + +SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ + file://mtools-makeinfo.patch;patch=1" + +#DEPENDS = "tetex-native" + +inherit autotools -- cgit v1.2.3-54-g00ecf