All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb
@ 2013-03-05  5:26 Khem Raj
  2013-03-05  5:26 ` [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5 Khem Raj
  2013-03-13 16:36 ` [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Martin Jansa
  0 siblings, 2 replies; 4+ messages in thread
From: Khem Raj @ 2013-03-05  5:26 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/tcsh/files/07_nls.patch   |   14 ------
 .../tcsh/files/cross-compile.patch                 |   12 -----
 .../tcsh/files/fix-make-catalogs.patch             |   27 ----------
 .../tcsh/files/tcsh-6.17.02-multibyte.patch        |   18 ++++---
 meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb      |   53 --------------------
 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb      |   49 ++++++++++++++++++
 6 files changed, 59 insertions(+), 114 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/tcsh/files/07_nls.patch
 delete mode 100644 meta-oe/recipes-extended/tcsh/files/cross-compile.patch
 delete mode 100644 meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
 delete mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
 create mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb

diff --git a/meta-oe/recipes-extended/tcsh/files/07_nls.patch b/meta-oe/recipes-extended/tcsh/files/07_nls.patch
deleted file mode 100644
index fe7845f..0000000
--- a/meta-oe/recipes-extended/tcsh/files/07_nls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Franz Pletz <fpletz@franz-pletz.org>
-Description: Fixes NLS build bug
-
---- a/nls/Makefile.in
-+++ b/nls/Makefile.in
-@@ -2,7 +2,7 @@
- 
- LOCALES=	C et finnish french german greek italian ja pl russian \
- 		spanish ukrainian
--GENCAT=		gencat
-+GENCAT=		gencat --new
- INSTALL=	ginstall
- 
- datarootdir=@datarootdir@
diff --git a/meta-oe/recipes-extended/tcsh/files/cross-compile.patch b/meta-oe/recipes-extended/tcsh/files/cross-compile.patch
deleted file mode 100644
index 06dcfda..0000000
--- a/meta-oe/recipes-extended/tcsh/files/cross-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -git a/Makefile.in b/Makefile.in
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -446,7 +446,7 @@
- 
- gethost:  gethost.c sh.err.h tc.const.h sh.h
- 	rm -f gethost
--	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-+	${BUILD_CC} -o gethost ${BUILD_LDFLAGS} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
- 
- tc.defs.c:	gethost host.defs
- 	@rm -f $@.tmp
diff --git a/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch b/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
deleted file mode 100644
index 43001f1..0000000
--- a/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: christos <christos>
-Date:   Thu May 13 18:39:02 2010 +0000
-
-    add a rule to make catalogs and propagate ${MAKE} instead of hard-coding make.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -687,7 +687,7 @@ shar:
- 	rm -rf tcsh-${VERSION}
- 
- catalogs:
--	@(cd nls; make catalogs)
-+	@(cd nls; ${MAKE})
- 
- tcsh-${VERSION}.tar.Z:
- 	rm -rf tcsh-${VERSION} 
---- a/nls/Makefile.in
-+++ b/nls/Makefile.in
-@@ -18,7 +18,7 @@ install:	$(INSTALLED)
- 	$(INSTALL) $< $@
- 
- %.cat:
--	$(GENCAT) $@ $(@:%.cat=%)/*set*
-+	cat $(@:%.cat=%)/charset $(@:%.cat=%)/set* | $(GENCAT) $@ 
- 
- clean:
- 	$(RM) $(CATALOGS)
diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
index 7f3e926..3dd420a 100644
--- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
+++ b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
@@ -1,16 +1,18 @@
 Author:  Jean-Luc Leger <reiga@dspnet.fr.eu.org>
 Description: fix broken globbing expansion
 Debian-Bug: #603545
---- a/tc.str.c
-+++ b/tc.str.c
-@@ -104,8 +104,9 @@ rt_mbtowc(Char *pwc, const char *s, size_t n)
- 
-     memset (&mb, 0, sizeof mb);
-     ret = mbrtowc(&tmp, s, n, &mb);
+Index: tcsh-6.18.01/tc.str.c
+===================================================================
+--- tcsh-6.18.01.orig/tc.str.c	2012-01-10 13:34:31.000000000 -0800
++++ tcsh-6.18.01/tc.str.c	2013-02-26 13:12:13.429153489 -0800
+@@ -122,8 +122,9 @@
+ #else
+     ret = mbtowc(&tmp, s, n);
+ #endif
 -    if (ret > 0) {
 +    if (ret >= 0)
  	*pwc = tmp;
-+    if (ret > 0) {
- #ifdef UTF16_STRINGS
++    if (ret >= 0) {
+ #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC)
  	if (tmp >= 0xd800 && tmp <= 0xdbff) {
  	    /* UTF-16 surrogate pair.  Fetch second half and compute
diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
deleted file mode 100644
index c4c78f4..0000000
--- a/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
- The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
- It includes all features of 4.4BSD C shell, plus a command-line editor, \
- programmable word completion, spelling correction and more."
-
-HOMEPAGE = "http://www.tcsh.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
-SECTION = "base"
-
-SRC_URI = " \
-	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_6.17.02.orig.tar.gz;name=tarball \
-	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_6.17.02-4.diff.gz;name=diffs \
-	file://01_build.1.patch \
-	file://01_build.2.patch \
-	file://01_build.3.patch \
-	file://07_nls.patch \
-	file://15_no-strip.patch \
-	file://disable-test-notty.patch \
-	file://disable-test-nice.patch \
-	file://fix-make-catalogs.patch \
-	file://disable-lexical.at-31.patch \
-	file://12_unknown_lscolors.patch \
-	file://tcsh-6.17.02-multibyte.patch \
-	file://disable-broken-test.patch \
-	file://cross-compile.patch \
-"
-
-inherit autotools
-
-do_install_append () {
-	oe_runmake install.man DESTDIR=${D}
-
-	install -d ${D}${base_bindir}
-	ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
-
-	install -d ${D}${sysconfdir}/csh/login.d
-	install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
-	install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
-}
-
-FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
-
-
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-echo /usr/bin/tcsh >> $D/etc/shells
-}
-
-SRC_URI[tarball.md5sum] = "ad6e89ddb654972b4c2a8bad06778625"
-SRC_URI[tarball.sha256sum] = "8c675729810eb49102b68e09be4f3f592dfa0be2c238f0d0a58e5c1147da7dd8"
-SRC_URI[diffs.md5sum] = "735286c36a83a043015b30871c7ab6b6"
-SRC_URI[diffs.sha256sum] = "61c0b0f7ebbc07544551f56b66c6e78def702c2197307e960898182b340ffe67"
diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
new file mode 100644
index 0000000..d85fba8
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
+ The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
+ It includes all features of 4.4BSD C shell, plus a command-line editor, \
+ programmable word completion, spelling correction and more."
+
+HOMEPAGE = "http://www.tcsh.org/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
+SECTION = "base"
+
+SRC_URI = " \
+	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \
+	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \
+	file://01_build.1.patch \
+	file://01_build.2.patch \
+	file://01_build.3.patch \
+	file://15_no-strip.patch \
+	file://disable-test-notty.patch \
+	file://disable-test-nice.patch \
+	file://disable-lexical.at-31.patch \
+	file://12_unknown_lscolors.patch \
+	file://tcsh-6.17.02-multibyte.patch \
+	file://disable-broken-test.patch \
+"
+SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a"
+SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8"
+SRC_URI[diffs.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9"
+SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c"
+
+inherit autotools
+
+do_install_append () {
+	oe_runmake install.man DESTDIR=${D}
+
+	install -d ${D}${base_bindir}
+	ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
+
+	install -d ${D}${sysconfdir}/csh/login.d
+	install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
+	install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
+}
+
+FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
+
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+echo /usr/bin/tcsh >> $D/etc/shells
+}
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5
  2013-03-05  5:26 [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Khem Raj
@ 2013-03-05  5:26 ` Khem Raj
  2013-03-13 16:37   ` Martin Jansa
  2013-03-13 16:36 ` [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Martin Jansa
  1 sibling, 1 reply; 4+ messages in thread
From: Khem Raj @ 2013-03-05  5:26 UTC (permalink / raw)
  To: openembedded-devel

Disable parallel make it does not work all the time
Fix build with kernel-headers from 3.8

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../bridge-utils/bridge-utils/kernel-headers.patch |   22 ++++++++++++++++++++
 .../bridge-utils/bridge-utils_1.4.bb               |    6 ------
 .../bridge-utils/bridge-utils_1.5.bb               |   11 ++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
 delete mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
 create mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb

diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
new file mode 100644
index 0000000..de36f05
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
@@ -0,0 +1,22 @@
+include missing kernel header
+
+Fixes errors like
+
+| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
+| In file included from ../libbridge/libbridge.h:24:0,
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: bridge-utils-1.5/libbridge/libbridge.h
+===================================================================
+--- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-28 17:52:54.000000000 -0700
++++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-04 21:16:25.781188309 -0800
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+ 
+ #include <sys/socket.h>
++#include <linux/in6.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
deleted file mode 100644
index 00a5815..0000000
--- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require bridge-utils.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
-
-SRC_URI[md5sum] = "0182fcac3a2b307113bbec34e5f1c673"
-SRC_URI[sha256sum] = "876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933"
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
new file mode 100644
index 0000000..04f863b
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
@@ -0,0 +1,11 @@
+require bridge-utils.inc
+
+SRC_URI += "file://kernel-headers.patch"
+
+PARALLEL_MAKE = ""
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
+
+SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238"
+SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"
+
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb
  2013-03-05  5:26 [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Khem Raj
  2013-03-05  5:26 ` [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5 Khem Raj
@ 2013-03-13 16:36 ` Martin Jansa
  1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2013-03-13 16:36 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 9508 bytes --]

On Mon, Mar 04, 2013 at 09:26:37PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-oe/recipes-extended/tcsh/files/07_nls.patch   |   14 ------
>  .../tcsh/files/cross-compile.patch                 |   12 -----
>  .../tcsh/files/fix-make-catalogs.patch             |   27 ----------
>  .../tcsh/files/tcsh-6.17.02-multibyte.patch        |   18 ++++---
>  meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb      |   53 --------------------
>  meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb      |   49 ++++++++++++++++++
>  6 files changed, 59 insertions(+), 114 deletions(-)
>  delete mode 100644 meta-oe/recipes-extended/tcsh/files/07_nls.patch
>  delete mode 100644 meta-oe/recipes-extended/tcsh/files/cross-compile.patch
>  delete mode 100644 meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
>  delete mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
>  create mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb

Applied, thanks!

> 
> diff --git a/meta-oe/recipes-extended/tcsh/files/07_nls.patch b/meta-oe/recipes-extended/tcsh/files/07_nls.patch
> deleted file mode 100644
> index fe7845f..0000000
> --- a/meta-oe/recipes-extended/tcsh/files/07_nls.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Author: Franz Pletz <fpletz@franz-pletz.org>
> -Description: Fixes NLS build bug
> -
> ---- a/nls/Makefile.in
> -+++ b/nls/Makefile.in
> -@@ -2,7 +2,7 @@
> - 
> - LOCALES=	C et finnish french german greek italian ja pl russian \
> - 		spanish ukrainian
> --GENCAT=		gencat
> -+GENCAT=		gencat --new
> - INSTALL=	ginstall
> - 
> - datarootdir=@datarootdir@
> diff --git a/meta-oe/recipes-extended/tcsh/files/cross-compile.patch b/meta-oe/recipes-extended/tcsh/files/cross-compile.patch
> deleted file mode 100644
> index 06dcfda..0000000
> --- a/meta-oe/recipes-extended/tcsh/files/cross-compile.patch
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -diff -git a/Makefile.in b/Makefile.in
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -446,7 +446,7 @@
> - 
> - gethost:  gethost.c sh.err.h tc.const.h sh.h
> - 	rm -f gethost
> --	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
> -+	${BUILD_CC} -o gethost ${BUILD_LDFLAGS} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
> - 
> - tc.defs.c:	gethost host.defs
> - 	@rm -f $@.tmp
> diff --git a/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch b/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
> deleted file mode 100644
> index 43001f1..0000000
> --- a/meta-oe/recipes-extended/tcsh/files/fix-make-catalogs.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -Author: christos <christos>
> -Date:   Thu May 13 18:39:02 2010 +0000
> -
> -    add a rule to make catalogs and propagate ${MAKE} instead of hard-coding make.
> -
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -687,7 +687,7 @@ shar:
> - 	rm -rf tcsh-${VERSION}
> - 
> - catalogs:
> --	@(cd nls; make catalogs)
> -+	@(cd nls; ${MAKE})
> - 
> - tcsh-${VERSION}.tar.Z:
> - 	rm -rf tcsh-${VERSION} 
> ---- a/nls/Makefile.in
> -+++ b/nls/Makefile.in
> -@@ -18,7 +18,7 @@ install:	$(INSTALLED)
> - 	$(INSTALL) $< $@
> - 
> - %.cat:
> --	$(GENCAT) $@ $(@:%.cat=%)/*set*
> -+	cat $(@:%.cat=%)/charset $(@:%.cat=%)/set* | $(GENCAT) $@ 
> - 
> - clean:
> - 	$(RM) $(CATALOGS)
> diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
> index 7f3e926..3dd420a 100644
> --- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
> +++ b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
> @@ -1,16 +1,18 @@
>  Author:  Jean-Luc Leger <reiga@dspnet.fr.eu.org>
>  Description: fix broken globbing expansion
>  Debian-Bug: #603545
> ---- a/tc.str.c
> -+++ b/tc.str.c
> -@@ -104,8 +104,9 @@ rt_mbtowc(Char *pwc, const char *s, size_t n)
> - 
> -     memset (&mb, 0, sizeof mb);
> -     ret = mbrtowc(&tmp, s, n, &mb);
> +Index: tcsh-6.18.01/tc.str.c
> +===================================================================
> +--- tcsh-6.18.01.orig/tc.str.c	2012-01-10 13:34:31.000000000 -0800
> ++++ tcsh-6.18.01/tc.str.c	2013-02-26 13:12:13.429153489 -0800
> +@@ -122,8 +122,9 @@
> + #else
> +     ret = mbtowc(&tmp, s, n);
> + #endif
>  -    if (ret > 0) {
>  +    if (ret >= 0)
>   	*pwc = tmp;
> -+    if (ret > 0) {
> - #ifdef UTF16_STRINGS
> ++    if (ret >= 0) {
> + #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC)
>   	if (tmp >= 0xd800 && tmp <= 0xdbff) {
>   	    /* UTF-16 surrogate pair.  Fetch second half and compute
> diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
> deleted file mode 100644
> index c4c78f4..0000000
> --- a/meta-oe/recipes-extended/tcsh/tcsh_6.17.02.bb
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
> - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
> - It includes all features of 4.4BSD C shell, plus a command-line editor, \
> - programmable word completion, spelling correction and more."
> -
> -HOMEPAGE = "http://www.tcsh.org/"
> -LICENSE = "BSD"
> -LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
> -SECTION = "base"
> -
> -SRC_URI = " \
> -	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_6.17.02.orig.tar.gz;name=tarball \
> -	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_6.17.02-4.diff.gz;name=diffs \
> -	file://01_build.1.patch \
> -	file://01_build.2.patch \
> -	file://01_build.3.patch \
> -	file://07_nls.patch \
> -	file://15_no-strip.patch \
> -	file://disable-test-notty.patch \
> -	file://disable-test-nice.patch \
> -	file://fix-make-catalogs.patch \
> -	file://disable-lexical.at-31.patch \
> -	file://12_unknown_lscolors.patch \
> -	file://tcsh-6.17.02-multibyte.patch \
> -	file://disable-broken-test.patch \
> -	file://cross-compile.patch \
> -"
> -
> -inherit autotools
> -
> -do_install_append () {
> -	oe_runmake install.man DESTDIR=${D}
> -
> -	install -d ${D}${base_bindir}
> -	ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
> -
> -	install -d ${D}${sysconfdir}/csh/login.d
> -	install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
> -	install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
> -}
> -
> -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
> -
> -
> -pkg_postinst_${PN} () {
> -#!/bin/sh -e
> -echo /usr/bin/tcsh >> $D/etc/shells
> -}
> -
> -SRC_URI[tarball.md5sum] = "ad6e89ddb654972b4c2a8bad06778625"
> -SRC_URI[tarball.sha256sum] = "8c675729810eb49102b68e09be4f3f592dfa0be2c238f0d0a58e5c1147da7dd8"
> -SRC_URI[diffs.md5sum] = "735286c36a83a043015b30871c7ab6b6"
> -SRC_URI[diffs.sha256sum] = "61c0b0f7ebbc07544551f56b66c6e78def702c2197307e960898182b340ffe67"
> diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
> new file mode 100644
> index 0000000..d85fba8
> --- /dev/null
> +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
> @@ -0,0 +1,49 @@
> +DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
> + The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
> + It includes all features of 4.4BSD C shell, plus a command-line editor, \
> + programmable word completion, spelling correction and more."
> +
> +HOMEPAGE = "http://www.tcsh.org/"
> +LICENSE = "BSD"
> +LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
> +SECTION = "base"
> +
> +SRC_URI = " \
> +	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \
> +	${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \
> +	file://01_build.1.patch \
> +	file://01_build.2.patch \
> +	file://01_build.3.patch \
> +	file://15_no-strip.patch \
> +	file://disable-test-notty.patch \
> +	file://disable-test-nice.patch \
> +	file://disable-lexical.at-31.patch \
> +	file://12_unknown_lscolors.patch \
> +	file://tcsh-6.17.02-multibyte.patch \
> +	file://disable-broken-test.patch \
> +"
> +SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a"
> +SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8"
> +SRC_URI[diffs.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9"
> +SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c"
> +
> +inherit autotools
> +
> +do_install_append () {
> +	oe_runmake install.man DESTDIR=${D}
> +
> +	install -d ${D}${base_bindir}
> +	ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
> +
> +	install -d ${D}${sysconfdir}/csh/login.d
> +	install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
> +	install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
> +}
> +
> +FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
> +
> +
> +pkg_postinst_${PN} () {
> +#!/bin/sh -e
> +echo /usr/bin/tcsh >> $D/etc/shells
> +}
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5
  2013-03-05  5:26 ` [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5 Khem Raj
@ 2013-03-13 16:37   ` Martin Jansa
  0 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2013-03-13 16:37 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 3466 bytes --]

On Mon, Mar 04, 2013 at 09:26:38PM -0800, Khem Raj wrote:
> Disable parallel make it does not work all the time
> Fix build with kernel-headers from 3.8

Applied, thanks!

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../bridge-utils/bridge-utils/kernel-headers.patch |   22 ++++++++++++++++++++
>  .../bridge-utils/bridge-utils_1.4.bb               |    6 ------
>  .../bridge-utils/bridge-utils_1.5.bb               |   11 ++++++++++
>  3 files changed, 33 insertions(+), 6 deletions(-)
>  create mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
>  delete mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
>  create mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
> 
> diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
> new file mode 100644
> index 0000000..de36f05
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
> @@ -0,0 +1,22 @@
> +include missing kernel header
> +
> +Fixes errors like
> +
> +| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
> +| In file included from ../libbridge/libbridge.h:24:0,
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +
> +Index: bridge-utils-1.5/libbridge/libbridge.h
> +===================================================================
> +--- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-28 17:52:54.000000000 -0700
> ++++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-04 21:16:25.781188309 -0800
> +@@ -20,6 +20,7 @@
> + #define _LIBBRIDGE_H
> + 
> + #include <sys/socket.h>
> ++#include <linux/in6.h>
> + #include <linux/if.h>
> + #include <linux/if_bridge.h>
> + 
> diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
> deleted file mode 100644
> index 00a5815..0000000
> --- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require bridge-utils.inc
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
> -
> -SRC_URI[md5sum] = "0182fcac3a2b307113bbec34e5f1c673"
> -SRC_URI[sha256sum] = "876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933"
> diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
> new file mode 100644
> index 0000000..04f863b
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
> @@ -0,0 +1,11 @@
> +require bridge-utils.inc
> +
> +SRC_URI += "file://kernel-headers.patch"
> +
> +PARALLEL_MAKE = ""
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
> +
> +SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238"
> +SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"
> +
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-13 16:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05  5:26 [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Khem Raj
2013-03-05  5:26 ` [meta-oe][PATCH 2/2] bridge-utils: Upgrade to 1.5 Khem Raj
2013-03-13 16:37   ` Martin Jansa
2013-03-13 16:36 ` [meta-oe][PATCH 1/2] tcsh: Upgrade tcsh_6.17.02.bb -> tcsh_6.18.01.bb Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.