3 Fixes for RC2 (LSB, Docs, and ADT)

PATCH New Saul Wold 1 participant 4 messages Mar 5, 2011

lore

Share & tools

lore

Saul Wold

author

2011-03-05 06:21 UTC #0 lore raw

cover 3 Fixes for RC2 (LSB, Docs, and ADT)

From: Saul Wold <[email protected]>

Richard:

These 3 fixes would like to get into bernard for RC2 build and stability.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: distro/oe-core
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core

Thanks,
Saul Wold <[email protected]>
---

Lianhao Lu (1):
toolchain-script.bbclass: Added --sysroot to LDFLAGS.

Saul Wold (1):
task-poky-lsb: Remove new eglibc-* packages

Scott Garman (1):
linuxdoc-tools-native: Fix build error with txt documentation

 meta/classes/toolchain-scripts.bbclass             |    2 +
 meta/recipes-core/meta/meta-environment.bb         |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb           |    2 +-
 .../linuxdoc-tools-native/disable_txt_doc.patch    |   32 ++++++++++++++++++++
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb |    3 +-
 meta/recipes-extended/tasks/task-poky-lsb.bb       |   13 ++++----
 6 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch

Saul Wold

author

2011-03-05 06:23 UTC #1 lore raw

PATCH 1/3 task-poky-lsb: Remove new eglibc-* packages

From: Saul Wold <[email protected]>

Remove the new eglibc packages that were part of another patch and did not get cleanup here.

(From OE-Core rev: bddd9012d2a6393afceef752389d0006f2e47681)

Signed-off-by Saul Wold <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-extended/tasks/task-poky-lsb.bb |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

meta/recipes-extended/tasks/task-poky-lsb.bb +7 -6

index 65b7565..42fd8e0 100644
@@ -163,7 +163,6 @@ RDEPENDS_task-poky-lsb-graphic-add = "\
     libx11-locale \
     xorg-minimal-fonts \
     gdk-pixbuf \
-
 "
 
 RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\

@@ -183,13 +182,15 @@ RDEPENDS_task-poky-lsb-runtime-add = "\
     liburi-perl \
     libxml-parser-perl \
     libxml-perl \
+    eglibc-localedata-posix \
     eglibc-extra-nss \
-    eglibc-localedatas \
-    eglibc-gconvs \
-    eglibc-charmaps \
-    eglibc-binarys \
     eglibc-pcprofile \
     eglibc-pic \
     eglibc-utils \
-
 "
+
+#    eglibc-localedatas \
+#    eglibc-gconvs \
+#    eglibc-charmaps \
+#    eglibc-binarys \
+#

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-05 06:21 UTC #2 lore raw

PATCH 2/3 toolchain-script.bbclass: Added --sysroot to LDFLAGS.

In reply to Saul Wold

From: Lianhao Lu <[email protected]>

[YOCTO #808] Added --sysroot to LDFALGS in environment files.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/classes/toolchain-scripts.bbclass     |    2 ++
 meta/recipes-core/meta/meta-environment.bb |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

meta/classes/toolchain-scripts.bbclass +2 -0

index 2b9cfac..998ff14 100644
@@ -24,6 +24,7 @@ toolchain_create_sdk_env_script () {
 	fi
 	echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
 	echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
+	echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
 	echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script

@@ -83,6 +84,7 @@ toolchain_create_sdk_env_script_for_installer () {
 	fi
 	echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
+	echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script

meta/recipes-core/meta/meta-environment.bb +1 -1

index 0b88260..d2dc544 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 EXCLUDE_FROM_WORLD = "1"

meta/recipes-core/meta/meta-toolchain.bb +1 -1

index 2443b38..92936b6 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-05 06:21 UTC #3 lore raw

PATCH 3/3 linuxdoc-tools-native: Fix build error with txt documentation

In reply to Saul Wold

From: Scott Garman <[email protected]>

Disable building txt documentation. This is a temporary workaround, as I have found an Ubuntu 10.10 system which throws errors during building this that I'd like to ultimately fix. The error manifests itself from the end of LinuxDocTools.pm with the following messages during do_install:

| - Building txt docs
| Processing file ./guide
| troff: fatal error: can't find macro file s
|  fmt_txt::postASP: Empty output file, error when calling groff. Aborting...

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

---
 .../linuxdoc-tools-native/disable_txt_doc.patch    |   32 ++++++++++++++++++++
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb |    3 +-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch new file +32 -0

new file mode 100644
index 0000000..17c7670
@@ -0,0 +1,32 @@
+Disable building txt documentation. This is a temporary workaround,
+as I have found an Ubuntu 10.10 system which throws errors during
+building this that I'd like to ultimately fix. The error manifests
+itself from the end of LinuxDocTools.pm with the following messages
+during do_install:
+
+| - Building txt docs
+| Processing file ./guide
+| troff: fatal error: can't find macro file s
+|  fmt_txt::postASP: Empty output file, error when calling groff. Aborting...
+
+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-03-04 17:37:24.788923998 -0800
+@@ -40,11 +40,11 @@
+ 
+ chmod u+x $TMPDIR/linuxdoc
+ 
+-if [ -n "`which groff`" ]; then
+-	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
+-	echo "- Building txt docs" >&2
+-	$TMPDIR/sgml2txt -b 1 ./guide
+-fi
++#if [ -n "`which groff`" ]; then
++#	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
++#	echo "- Building txt docs" >&2
++#	$TMPDIR/sgml2txt -b 1 ./guide
++#fi
+ 
+ if [ -n "`which latex`" ]; then
+ 	ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex

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

index ed45ad9..fbe9219 100644
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe"
 
 DEPENDS = "openjade-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \
            file://disable_sgml2rtf.patch \
+           file://disable_txt_doc.patch \
            file://disable_tex_doc.patch \
            file://disable_dvips_doc.patch"

Signature · 1 line

1.7.1.1