Skip to contentSkip to conversation

fix when len(TMPDIR) = 410

PATCH New Robert Yang 1 participant 3 messages Sep 17, 2015

lore
Share & tools
lore
#0 lore raw

cover fix when len(TMPDIR) = 410

len(TMPDIR) = 410 is supported by oe-core, the world build will be OK after the 2 patches.

// Robert

The following changes since commit f0189829498e30231d826c9f55aad73e622d076e:

qemu: Update to upstream patches (2015-09-14 11:22:02 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/long
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=oem

Robert Yang (2):
ccache: fix file name too long
bind: fix too long error from gen

 .../0001-lib-dns-gen.c-fix-too-long-error.patch    |   34 ++++++++++++++++++++
 meta/recipes-connectivity/bind/bind_9.10.2-P4.bb   |    1 +
 meta/recipes-devtools/ccache/ccache_3.2.3.bb       |    4 ++-
 .../0002-dev.mk.in-fix-file-name-too-long.patch    |   32 ++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
 create mode 100644 meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 ccache: fix file name too long

The all_cppflags change paths to filename which cause file name too long error when the path is longer than NAME_MAX (usually 255). Strip srcdir to fix the problem.

[YOCTO #8313]

---
 meta/recipes-devtools/ccache/ccache_3.2.3.bb       |    4 ++-
 .../0002-dev.mk.in-fix-file-name-too-long.patch    |   32 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
meta/recipes-devtools/ccache/ccache_3.2.3.bb +3 -1
index 357df75..97f557a 100644
@@ -5,4 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1"
 
 SRCREV = "4cad46e8ee0053144bb00919f0dadd20c1f87013"
 
-SRC_URI += "file://0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch"
+SRC_URI += "file://0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch \
+            file://0002-dev.mk.in-fix-file-name-too-long.patch \
+"
meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch new file +32 -0
new file mode 100644
index 0000000..837cfad
@@ -0,0 +1,32 @@
+From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Wed, 16 Sep 2015 19:45:40 -0700
+Subject: [PATCH] dev.mk.in: fix file name too long
+
+The all_cppflags change paths to filename which cause file name too long
+error when the path is longer than NAME_MAX (usually 255). Strip srcdir
+to fix the problem.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ dev.mk.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dev.mk.in b/dev.mk.in
+index 1261ad3..ec55ac4 100644
+--- a/dev.mk.in
++++ b/dev.mk.in
+@@ -1,7 +1,7 @@
+ # GNU make syntax reigns in this file.
+ 
+ all_cflags += -Werror
+-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d
++all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d
+ 
+ ASCIIDOC = asciidoc
+ GPERF = gperf
+-- 
+1.7.9.5
+
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 bind: fix too long error from gen

In reply to Robert Yang

gen.c uses 512 as the path length which is a little short when build in deep dir, and cause "too long" error, use PATH_MAX if defined.

---
 .../0001-lib-dns-gen.c-fix-too-long-error.patch    |   34 ++++++++++++++++++++
 meta/recipes-connectivity/bind/bind_9.10.2-P4.bb   |    1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch new file +34 -0
new file mode 100644
index 0000000..1ed858c
@@ -0,0 +1,34 @@
+From 5bc3167a8b714ec0c4a3f1c7f3b9411296ec0a23 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Wed, 16 Sep 2015 20:23:47 -0700
+Subject: [PATCH] lib/dns/gen.c: fix too long error
+
+The 512 is a little short when build in deep dir, and cause "too long"
+error, use PATH_MAX if defined.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ lib/dns/gen.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/dns/gen.c b/lib/dns/gen.c
+index 51a0435..3d7214f 100644
+--- a/lib/dns/gen.c
++++ b/lib/dns/gen.c
+@@ -148,7 +148,11 @@ static const char copyright[] =
+ #define TYPECLASSBUF (TYPECLASSLEN + 1)
+ #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d"
+ #define ATTRIBUTESIZE 256
++#ifdef PATH_MAX
++#define DIRNAMESIZE PATH_MAX
++#else
+ #define DIRNAMESIZE 512
++#endif
+ 
+ static struct cc {
+ 	struct cc *next;
+-- 
+1.7.9.5
+
meta/recipes-connectivity/bind/bind_9.10.2-P4.bb +1 -0
index efae289..1e1e726 100644
@@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://0001-build-use-pkg-config-to-find-libxml2.patch \
            file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
            file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \
+           file://0001-lib-dns-gen.c-fix-too-long-error.patch \
            "
 
 SRC_URI[md5sum] = "8b1f5064837756c938eadc1537dec5c7"
Signature · 1 line
1.7.9.5