linuxdoc-tools-native bugfix

PATCH Applied Scott Garman 2 participants 3 messages Feb 25, 2011 – Feb 26, 2011

lore

Share & tools

lore

Scott Garman

author

2011-02-25 23:45 UTC #0 lore raw

cover linuxdoc-tools-native bugfix

From: Scott Garman <[email protected]>

Hi Saul,

This pull request fixes bug #774, which is a do_install error which can occur for linuxdoc-tools-native if the host OS has latex or dvips installed.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: sgarman/linuxdoc-tools-fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/linuxdoc-tools-fix

Thanks,
Scott Garman <[email protected]>
---

Scott Garman (1):
linuxdoc-tools-native: disable doc builds requriing latex and dvips

 .../linuxdoc-tools-native/disable_dvips_doc.patch  |   29 ++++++++++++++++++++
 .../linuxdoc-tools-native/disable_tex_doc.patch    |   25 +++++++++++++++++
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb |    6 +++-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch

Scott Garman

author

2011-02-25 23:45 UTC #1 lore raw

PATCH 1/1 linuxdoc-tools-native: disable doc builds requriing latex and dvips

From: Scott Garman <[email protected]>

This fixes the following errors during do_install on hosts which have latex and/or dvips installed:

fmt_latex2e::postASP: LaTeX first run problem. Aborting ...

dvips: ! DVI file can't be opened.

Our goal is to have native versions of these tools eventually. Until then, disable these parts of the documentation install process.

This fixes [BUGID #774].

Signed-off-by Scott Garman <[email protected]>

---
 .../linuxdoc-tools-native/disable_dvips_doc.patch  |   29 ++++++++++++++++++++
 .../linuxdoc-tools-native/disable_tex_doc.patch    |   25 +++++++++++++++++
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb |    6 +++-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch new file +29 -0

new file mode 100644
index 0000000..7ac1a1f
@@ -0,0 +1,29 @@
+Disable building documentation which requires the dvips utility.
+This patch should be dropped once we include a native version of
+dvips.
+
+Signed-off-by: Scott Garman <[email protected]>
+diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
+--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2011-02-25 15:26:41.142917782 -0800
++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:27:25.141917472 -0800
+@@ -52,13 +52,13 @@
+ #	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
+ #fi
+ 
+-if [ -n "`which dvips`" ]; then
+-	echo "   + dvips" >&2
+-	dvips -t letter -o ./guide.ps ./guide.dvi
+-	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
+-		gzip -fN ./guide.ps
+-	fi
+-fi
++#if [ -n "`which dvips`" ]; then
++#	echo "   + dvips" >&2
++#	dvips -t letter -o ./guide.ps ./guide.dvi
++#	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
++#		gzip -fN ./guide.ps
++#	fi
++#fi
+ 
+ 
+ echo "- Building info docs" >&2

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch new file +25 -0

new file mode 100644
index 0000000..f47693b
@@ -0,0 +1,25 @@
+Disable building documentation which requires the latex utility.
+This patch should be dropped once we include a native version of
+latex.
+
+Signed-off-by: Scott Garman <[email protected]>
+diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
+--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2009-11-09 11:58:25.000000000 -0800
++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:23:58.610016114 -0800
+@@ -46,11 +46,11 @@
+ 	$TMPDIR/sgml2txt -b 1 ./guide
+ fi
+ 
+-if [ -n "`which latex`" ]; then
+-	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
+-	echo "- Building latex docs" >&2
+-	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
+-fi
++#if [ -n "`which latex`" ]; then
++#	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
++#	echo "- Building latex docs" >&2
++#	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
++#fi
+ 
+ if [ -n "`which dvips`" ]; then
+ 	echo "   + dvips" >&2

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb +4 -2

index f3cd195..ed45ad9 100644
@@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe"
 
 DEPENDS = "openjade-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \
-           file://disable_sgml2rtf.patch"
+           file://disable_sgml2rtf.patch \
+           file://disable_tex_doc.patch \
+           file://disable_dvips_doc.patch"
 
 SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563"
 SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec"

Signature · 1 line

1.7.1

Saul Wold

Applied

2011-02-26 22:47 UTC #2 lore raw

Re: [PATCH 1/1] linuxdoc-tools-native: disable doc builds requriing latex and dvips

Quoted 98 lines · Scott Garman

From: Scott Garman<[email protected]>

This fixes the following errors during do_install on hosts which have latex and/or dvips installed:

fmt_latex2e::postASP: LaTeX first run problem. Aborting ...

dvips: ! DVI file can't be opened.

Our goal is to have native versions of these tools eventually. Until then, disable these parts of the documentation install process.

This fixes [BUGID #774].

Signed-off-by Scott Garman<[email protected]>

---
  .../linuxdoc-tools-native/disable_dvips_doc.patch  |   29 ++++++++++++++++++++
  .../linuxdoc-tools-native/disable_tex_doc.patch    |   25 +++++++++++++++++
  .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb |    6 +++-
  3 files changed, 58 insertions(+), 2 deletions(-)

create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch new file +29 -0

new file mode 100644
index 0000000..7ac1a1f
@@ -0,0 +1,29 @@
+Disable building documentation which requires the dvips utility.
+This patch should be dropped once we include a native version of
+dvips.
+
+Signed-off-by: Scott Garman<[email protected]>
+diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
+--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2011-02-25 15:26:41.142917782 -0800
++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:27:25.141917472 -0800
+@@ -52,13 +52,13 @@
+ #	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
+ #fi
+
+-if [ -n "`which dvips`" ]; then
+-	echo "   + dvips">&2
+-	dvips -t letter -o ./guide.ps ./guide.dvi
+-	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
+-		gzip -fN ./guide.ps
+-	fi
+-fi
++#if [ -n "`which dvips`" ]; then
++#	echo "   + dvips">&2
++#	dvips -t letter -o ./guide.ps ./guide.dvi
++#	if [ -n "`which gzip`" -a -f ./guide.ps ]; then
++#		gzip -fN ./guide.ps
++#	fi
++#fi
+
+
+ echo "- Building info docs">&2

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch new file +25 -0

new file mode 100644
index 0000000..f47693b
@@ -0,0 +1,25 @@
+Disable building documentation which requires the latex utility.
+This patch should be dropped once we include a native version of
+latex.
+
+Signed-off-by: Scott Garman<[email protected]>
+diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh
+--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh	2009-11-09 11:58:25.000000000 -0800
++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh	2011-02-25 15:23:58.610016114 -0800
+@@ -46,11 +46,11 @@
+ 	$TMPDIR/sgml2txt -b 1 ./guide
+ fi
+
+-if [ -n "`which latex`" ]; then
+-	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
+-	echo "- Building latex docs">&2
+-	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
+-fi
++#if [ -n "`which latex`" ]; then
++#	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
++#	echo "- Building latex docs">&2
++#	$TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide
++#fi
+
+ if [ -n "`which dvips`" ]; then
+ 	echo "   + dvips">&2

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb +0 -1

index f3cd195..ed45ad9 100644
@@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe"
 
  DEPENDS = "openjade-native"
 
-PR = "r0"

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe" · line 17

Quoted 10 lines

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb +4 -1

+PR = "r1"
 
  SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \
-           file://disable_sgml2rtf.patch"
+           file://disable_sgml2rtf.patch \
+           file://disable_tex_doc.patch \
+           file://disable_dvips_doc.patch"
 
  SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563"
  SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec"

Merged into Master and Bernard

Thanks
Sau!