* [PATCH 1/2] linuxdoc-tools-native: new recipe v0.99.6
2011-02-25 1:07 [PATCH 0/2] build libuser documentation Scott Garman
@ 2011-02-25 1:07 ` Scott Garman
2011-02-25 1:07 ` [PATCH 2/2] libuser: enable documentation Scott Garman
2011-02-25 17:30 ` [PATCH 0/2] build libuser documentation Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Scott Garman @ 2011-02-25 1:07 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
This package includes utilities such as sgml2html and sgml2txt,
which are used by other packages (e.g, libuser) for building
documentation.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
.../linuxdoc-tools-native/disable_sgml2rtf.patch | 49 ++++++++++++++++++++
.../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb | 21 ++++++++
2 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
new file mode 100644
index 0000000..0fcaceb
--- /dev/null
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
@@ -0,0 +1,49 @@
+The build of sgml2rtf is problematic due to the way it wants to
+link to a shared library version of flex. Flex only ships with a
+static lib. Rather than diverging from upstream flex, simply skip
+building this un-needed utility.
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in
+--- linuxdoc-tools-0.9.66.orig//Makefile.in 2009-11-09 11:58:25.000000000 -0800
++++ linuxdoc-tools-0.9.66/Makefile.in 2011-02-24 15:37:46.556937051 -0800
+@@ -40,7 +40,7 @@
+ pkgdata_ddir = $(DESTDIR)$(pkgdatadir)
+ tex_ddir = $(DESTDIR)$(texdir)
+
+-progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
++progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck
+
+ OPTIMIZE = -O
+
+@@ -64,9 +64,9 @@
+ @echo "Compiling preprocessor (in sgmlpre/)..."
+ ( cd sgmlpre ; \
+ $(MAKE) CFLAGS="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 )
+- @echo "Compiling RTF conversion tools (in rtf-fix/)..."
+- ( cd rtf-fix ; \
+- $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 )
++# @echo "Compiling RTF conversion tools (in rtf-fix/)..."
++# ( cd rtf-fix ; \
++# $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 )
+ @echo "making man pages in genman ..."
+ if [ ! -d genman ]; then mkdir genman ; fi
+ for ii in man/* ; do \
+@@ -109,7 +109,7 @@
+
+ # -- Install auxiliary programs
+ mkdir -p $(auxbin_ddir)
+- for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \
++ for ii in sgmlpre/sgmlpre; do \
+ bn=`basename $$ii`; \
+ $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \
+ done
+@@ -198,7 +198,7 @@
+
+ clean::
+ -rm -f *~ bin/*~ bin/linuxdoc
+- for d in $(DDIRS) $(MDIRS) rtf-fix; do $(MAKE) -C $$d clean; done
++ for d in $(DDIRS) $(MDIRS); do $(MAKE) -C $$d clean; done
+ (cd sgmlpre ; rm -f sgmlpre.o sgmlpre)
+ -rm -rf genman/
+
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb
new file mode 100644
index 0000000..f3cd195
--- /dev/null
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Convert LinuxDoc SGML source into other formats"
+DESCRIPTION = "Convert LinuxDoc SGML source into other formats"
+HOMEPAGE = "http://packages.debian.org/linuxdoc-tools"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe"
+
+DEPENDS = "openjade-native"
+
+PR = "r0"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \
+ file://disable_sgml2rtf.patch"
+
+SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563"
+SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec"
+
+inherit autotools native
+
+do_configure () {
+ oe_runconf
+}
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] libuser: enable documentation
2011-02-25 1:07 [PATCH 0/2] build libuser documentation Scott Garman
2011-02-25 1:07 ` [PATCH 1/2] linuxdoc-tools-native: new recipe v0.99.6 Scott Garman
@ 2011-02-25 1:07 ` Scott Garman
2011-02-25 17:30 ` [PATCH 0/2] build libuser documentation Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Scott Garman @ 2011-02-25 1:07 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
Added popt to DEPENDS. This fixes the following build error:
apps/luserdel.c:25:18: fatal error: popt.h: No such file or directory
Remove patch and configure flag which had disabled doc generation
Add docbook-utils-native and linuxdoc-tools-native to DEPENDS
This fixes [BUGID #213]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
.../libuser/libuser-0.57.1/disable-sgml-doc.patch | 18 ------------------
meta/recipes-extended/libuser/libuser_0.57.1.bb | 9 ++++-----
2 files changed, 4 insertions(+), 23 deletions(-)
delete mode 100644 meta/recipes-extended/libuser/libuser-0.57.1/disable-sgml-doc.patch
diff --git a/meta/recipes-extended/libuser/libuser-0.57.1/disable-sgml-doc.patch b/meta/recipes-extended/libuser/libuser-0.57.1/disable-sgml-doc.patch
deleted file mode 100644
index a2017c5..0000000
--- a/meta/recipes-extended/libuser/libuser-0.57.1/disable-sgml-doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Disable generating docs from sgml, which requries linuxdoc-tools.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-Index: libuser-0.56.16/docs/Makefile.am
-===================================================================
---- libuser-0.56.16.orig/docs/Makefile.am 2010-08-12 13:29:43.000000000 +0800
-+++ libuser-0.56.16/docs/Makefile.am 2010-08-12 13:29:51.000000000 +0800
-@@ -14,8 +14,8 @@
-
- sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
-+# cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
-
- sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
-+# cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
index d2e7c3a..2dd3f11 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
@@ -11,15 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
SECTION = "base"
-SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
- file://disable-sgml-doc.patch;patch=1"
+SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
-PR = "r0"
+PR = "r1"
-DEPENDS = "gettext libpam glib-2.0 xz-native"
+DEPENDS = "gettext popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
-EXTRA_OECONF += "--disable-gtk-doc --without-python"
+EXTRA_OECONF += "--without-python"
inherit autotools
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] build libuser documentation
2011-02-25 1:07 [PATCH 0/2] build libuser documentation Scott Garman
2011-02-25 1:07 ` [PATCH 1/2] linuxdoc-tools-native: new recipe v0.99.6 Scott Garman
2011-02-25 1:07 ` [PATCH 2/2] libuser: enable documentation Scott Garman
@ 2011-02-25 17:30 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-02-25 17:30 UTC (permalink / raw)
To: Scott Garman; +Cc: poky
On 02/24/2011 05:07 PM, Scott Garman wrote:
> From: Scott Garman<scott.a.garman@intel.com>
>
> Hi Saul,
>
> This pull request fixes bug #213, allowing the documentation for
> libuser to be generated.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: sgarman/libuser-fix
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/libuser-fix
>
> Thanks,
> Scott Garman<scott.a.garman@intel.com>
> ---
>
>
> Scott Garman (2):
> linuxdoc-tools-native: new recipe v0.99.6
> libuser: enable documentation
>
> .../linuxdoc-tools-native/disable_sgml2rtf.patch | 49 ++++++++++++++++++++
> .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb | 21 ++++++++
> .../libuser/libuser-0.57.1/disable-sgml-doc.patch | 18 -------
> meta/recipes-extended/libuser/libuser_0.57.1.bb | 9 ++--
> 4 files changed, 74 insertions(+), 23 deletions(-)
> create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
> create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb
> delete mode 100644 meta/recipes-extended/libuser/libuser-0.57.1/disable-sgml-doc.patch
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Merged into Master
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread