* [PATCH 0/6] Packages upgrade
@ 2014-12-23 5:09 Hongxu Jia
2014-12-23 5:09 ` [PATCH 1/6] libxml2: upgrade to 2.9.2 Hongxu Jia
` (5 more replies)
0 siblings, 6 replies; 16+ messages in thread
From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 15de188692d2572d897799424e2a22eab24c78e2:
kernel-devsrc: Ensure we have a dependency on the actual source (2014-12-21 13:52:17 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/upgrade-packages
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-packages
Hongxu Jia (6):
libxml2: upgrade to 2.9.2
directfb: upgrade to 1.7.6
apr-util: upgrade to 1.5.4
pax-utils: upgrade to 0.9.2
ppp: upgrade 2.4.7
groff: upgrade 1.22.3
.../ppp/{ppp_2.4.6.bb => ppp_2.4.7.bb} | 4 +-
meta/recipes-core/libxml/libxml2.inc | 6 +-
.../configure.ac-fix-cross-compiling-warning.patch | 45 +++
.../libxml/libxml2/python-sitepackages-dir.patch | 17 +-
.../libxml/{libxml2_2.9.1.bb => libxml2_2.9.2.bb} | 4 +-
.../{pax-utils_0.8.1.bb => pax-utils_0.9.2.bb} | 4 +-
...off-1.22.2-correct-man.local-install-path.patch | 32 --
...off-1.22.3-correct-man.local-install-path.patch | 45 +++
.../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 6 +-
.../directfb/directfb/fixsepbuild.patch | 19 --
.../rename-no-instrument-function-macro.patch | 345 ---------------------
.../{directfb_1.7.4.bb => directfb_1.7.6.bb} | 8 +-
.../apr/{apr-util_1.5.3.bb => apr-util_1.5.4.bb} | 4 +-
13 files changed, 120 insertions(+), 419 deletions(-)
rename meta/recipes-connectivity/ppp/{ppp_2.4.6.bb => ppp_2.4.7.bb} (96%)
create mode 100644 meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
rename meta/recipes-core/libxml/{libxml2_2.9.1.bb => libxml2_2.9.2.bb} (62%)
rename meta/recipes-devtools/pax-utils/{pax-utils_0.8.1.bb => pax-utils_0.9.2.bb} (83%)
delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch
rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (90%)
delete mode 100644 meta/recipes-graphics/directfb/directfb/fixsepbuild.patch
delete mode 100644 meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
rename meta/recipes-graphics/directfb/{directfb_1.7.4.bb => directfb_1.7.6.bb} (58%)
rename meta/recipes-support/apr/{apr-util_1.5.3.bb => apr-util_1.5.4.bb} (93%)
--
1.9.1
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH 1/6] libxml2: upgrade to 2.9.2 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-23 5:09 ` [PATCH 2/6] directfb: upgrade to 1.7.6 Hongxu Jia ` (4 subsequent siblings) 5 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core - Rebase python-sitepackages-dir.patch to 2.9.2 - Drop libxml2-CVE-2014-3660.patch which has been merged to 2.9.2. - Add configure.ac-fix-cross-compiling-warning.patch to fix cross compilation failure. - Tweak do_configure_prepend, use configure.ac to instead of configure.in - Add cmake files to ${PN}-dev Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-core/libxml/libxml2.inc | 6 +-- .../configure.ac-fix-cross-compiling-warning.patch | 45 ++++++++++++++++++++++ .../libxml/libxml2/python-sitepackages-dir.patch | 17 ++++++-- .../libxml/{libxml2_2.9.1.bb => libxml2_2.9.2.bb} | 4 +- 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch rename meta/recipes-core/libxml/{libxml2_2.9.1.bb => libxml2_2.9.2.bb} (62%) diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index c729c19..1314bbf 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -21,7 +21,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://libxml2-CVE-2014-0191-fix.patch \ file://python-sitepackages-dir.patch \ file://libxml-m4-use-pkgconfig.patch \ - file://libxml2-CVE-2014-3660.patch \ + file://configure.ac-fix-cross-compiling-warning.patch \ " BINCONFIG = "${bindir}/xml2-config" @@ -34,7 +34,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { - sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in + sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac } do_configure_prepend_class-nativesdk () { @@ -66,7 +66,7 @@ PACKAGES += "${PN}-utils ${PN}-python" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" FILES_${PN}-utils += "${bindir}/*" FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch new file mode 100644 index 0000000..2f8079b --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch @@ -0,0 +1,45 @@ +configure.ac: fix cross compiling warning + +There is a warning while cross compiling which triggered a +failure by do_qa_configure +... +|configure:12652: checking for gzread in -lz +|configure:12677: mips-poky-linux-gcc -meb -mabi=32 -mhard-float + -L/lib conftest.c -lz >&5 +|ld: warning: library search path "/lib" is unsafe for cross-compilation +... + +While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9a90600..0bac8a4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -391,8 +391,6 @@ if test "$with_zlib" = "no"; then + echo "Disabling compression support" + else + AC_CHECK_HEADERS(zlib.h, +- [SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-L${Z_DIR}/lib" + AC_CHECK_LIB(z, gzread,[ + AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) + WITH_ZLIB=1 +@@ -406,8 +404,7 @@ else + esac] + else + Z_LIBS="-lz" +- fi]) +- LDFLAGS="${SAVE_LDFLAGS}"]) ++ fi])) + fi + + AC_SUBST(Z_CFLAGS) +-- +1.9.1 + diff --git a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch index a697ddf..e83c832 100644 --- a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch +++ b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch @@ -4,12 +4,18 @@ The python binary used when building for nativesdk doesn't give us the correct path here so we need to be able to specify it ourselves. Upstream-Status: Inappropriate [config] - Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- a/configure.in -+++ b/configure.in -@@ -743,7 +743,8 @@ dnl +Rebase to 2.9.2 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -813,7 +813,8 @@ dnl PYTHON_VERSION= PYTHON_INCLUDES= @@ -19,3 +25,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> PYTHON_TESTS= pythondir= if test "$with_python" != "no" ; then +-- +1.9.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.1.bb b/meta/recipes-core/libxml/libxml2_2.9.2.bb similarity index 62% rename from meta/recipes-core/libxml/libxml2_2.9.1.bb rename to meta/recipes-core/libxml/libxml2_2.9.2.bb index 0b6ac5d..f0cfa59 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.1.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.2.bb @@ -2,7 +2,7 @@ require libxml2.inc SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar" -SRC_URI[libtar.md5sum] = "9c0cfef285d5c4a5c80d00904ddab380" -SRC_URI[libtar.sha256sum] = "fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb" +SRC_URI[libtar.md5sum] = "9e6a9aca9d155737868b3dc5fd82f788" +SRC_URI[libtar.sha256sum] = "5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc" SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/6] directfb: upgrade to 1.7.6 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia 2014-12-23 5:09 ` [PATCH 1/6] libxml2: upgrade to 2.9.2 Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-25 22:02 ` Richard Purdie 2014-12-23 5:09 ` [PATCH 3/6] apr-util: upgrade to 1.5.4 Hongxu Jia ` (3 subsequent siblings) 5 siblings, 1 reply; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core - Drop fixsepbuild.patch which has been merged to 1.7.6 - Drop obsolete rename-no-instrument-function-macro.patch Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- .../directfb/directfb/fixsepbuild.patch | 19 -- .../rename-no-instrument-function-macro.patch | 345 --------------------- .../{directfb_1.7.4.bb => directfb_1.7.6.bb} | 8 +- 3 files changed, 3 insertions(+), 369 deletions(-) delete mode 100644 meta/recipes-graphics/directfb/directfb/fixsepbuild.patch delete mode 100644 meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch rename meta/recipes-graphics/directfb/{directfb_1.7.4.bb => directfb_1.7.6.bb} (58%) diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch deleted file mode 100644 index 94a9ba5..0000000 --- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix out of tree builds - -Upstream-Status: Pending - -RP 2013/03/21 - -Index: DirectFB-1.6.1/configure.in -=================================================================== ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 -@@ -111,7 +111,7 @@ - AC_PATH_TOOL(FLUXCOMP, fluxcomp) - AC_SUBST(FLUXCOMP) - if test -z "$FLUXCOMP"; then -- if ! test -e src/core/CoreDFB.cpp; then -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then - AC_MSG_ERROR([ - *** DirectFB compilation requires fluxcomp *** - diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch deleted file mode 100644 index 443df5a..0000000 --- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch +++ /dev/null @@ -1,345 +0,0 @@ -Rename __no_instrument_function__ macro to avoid conficting redefinitions -of the same symbol. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: DirectFB-1.6.1/lib/direct/clock.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 -@@ -36,28 +36,28 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_millis( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_millis( void ) - { -Index: DirectFB-1.6.1/lib/direct/debug.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 -@@ -48,7 +48,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_log( DirectLogDomain *domain, - unsigned int debug_level, /* 1-9, 0 = info */ -@@ -63,7 +63,7 @@ - va_end( ap ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at( DirectLogDomain *domain, - const char *format, ... ) -@@ -77,7 +77,7 @@ - - #endif /* DIRECT_BUILD_DEBUGS */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at_always( DirectLogDomain *domain, - const char *format, ... ) -@@ -93,7 +93,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_break( const char *func, - const char *file, -@@ -123,7 +123,7 @@ - direct_trap( "Break", SIGABRT ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assertion( const char *exp, - const char *func, -@@ -144,7 +144,7 @@ - direct_trap( "Assertion", SIGTRAP ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assumption( const char *exp, - const char *func, -Index: DirectFB-1.6.1/lib/direct/interface.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 -@@ -522,7 +522,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static InterfaceDesc * - allocate_interface_desc( void ) - { -@@ -543,7 +543,7 @@ - return &alloc_list[alloc_count++]; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ void - fill_interface_desc( InterfaceDesc *desc, - const void *interface_ptr, -@@ -565,7 +565,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_add( const char *func, - const char *file, -@@ -586,7 +586,7 @@ - direct_mutex_unlock( &alloc_lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_remove( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/log.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 -@@ -128,7 +128,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_printf( DirectLog *log, - const char *format, ... ) -@@ -197,7 +197,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_lock( DirectLog *log ) - { -@@ -211,7 +211,7 @@ - direct_mutex_lock( &log->lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_unlock( DirectLog *log ) - { -@@ -262,7 +262,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectLog * - direct_log_default( void ) - { -Index: DirectFB-1.6.1/lib/direct/log_domain.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 -@@ -69,7 +69,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ LogDomainEntry * - lookup_domain( const char *name, bool sub ); - -@@ -104,7 +104,7 @@ - return NULL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static DirectLogLevel - check_domain( DirectLogDomain *domain ); - -@@ -207,7 +207,7 @@ - /* FIXME: merge following */ - - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_vprintf( DirectLogDomain *domain, - DirectLogLevel level, -@@ -268,7 +268,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_log( DirectLogDomain *domain, - DirectLogLevel level, -Index: DirectFB-1.6.1/lib/direct/mem.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 -@@ -121,7 +121,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ MemDesc * - fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) - { -Index: DirectFB-1.6.1/lib/direct/messages.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 -@@ -40,7 +40,7 @@ - - #if DIRECT_BUILD_TEXT - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_info( const char *format, ... ) - { -@@ -57,7 +57,7 @@ - direct_log_printf( NULL, "(*) %s", buf ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_error( const char *format, ... ) - { -@@ -76,7 +76,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_derror( DirectResult result, const char *format, ... ) - { -@@ -95,7 +95,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_perror( int erno, const char *format, ... ) - { -@@ -114,7 +114,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_dlerror( const char *dlerr, const char *format, ... ) - { -@@ -133,7 +133,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_once( const char *func, - const char *file, -@@ -155,7 +155,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_unimplemented( const char *func, - const char *file, -@@ -166,7 +166,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_bug( const char *func, - const char *file, -@@ -188,7 +188,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_warn( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 -@@ -74,7 +74,7 @@ - - #define __inline__ inline - #define D_UNUSED __attribute__((unused)) --#define __no_instrument_function__ __attribute__((no_instrument_function)) -+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) - #define __constructor__ __attribute__((constructor)) - #define __destructor__ __attribute__((destructor)) - #define __typeof__(x) typeof(x) -Index: DirectFB-1.6.1/lib/direct/util.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 -@@ -110,7 +110,7 @@ - /* - * translates errno to DirectResult - */ --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - errno2result( int erno ) - { diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb similarity index 58% rename from meta/recipes-graphics/directfb/directfb_1.7.4.bb rename to meta/recipes-graphics/directfb/directfb_1.7.6.bb index 39b006e..d25d987 100644 --- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb +++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb @@ -1,11 +1,9 @@ require directfb.inc -RV = "1.7-4" +RV = "1.7-6" DEPENDS += "sysfsutils" -SRC_URI += "file://fixsepbuild.patch" - EXTRA_OECONF = "\ --enable-freetype=yes \ --enable-zlib \ @@ -19,5 +17,5 @@ EXTRA_OECONF = "\ LEAD_SONAME = "libdirectfb-1.7.so.0" -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" -SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" +SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512" +SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1" -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 2/6] directfb: upgrade to 1.7.6 2014-12-23 5:09 ` [PATCH 2/6] directfb: upgrade to 1.7.6 Hongxu Jia @ 2014-12-25 22:02 ` Richard Purdie 2014-12-25 22:58 ` Otavio Salvador 2014-12-26 1:42 ` Hongxu Jia 0 siblings, 2 replies; 16+ messages in thread From: Richard Purdie @ 2014-12-25 22:02 UTC (permalink / raw) To: Hongxu Jia; +Cc: Otavio Salvador, openembedded-core On Tue, 2014-12-23 at 13:09 +0800, Hongxu Jia wrote: > - Drop fixsepbuild.patch which has been merged to 1.7.6 > - Drop obsolete rename-no-instrument-function-macro.patch I think this somehow breaks qt4: https://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/144 (thanks Otavio for pointing out it was linked to directfb) Cheers, Richard > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > .../directfb/directfb/fixsepbuild.patch | 19 -- > .../rename-no-instrument-function-macro.patch | 345 --------------------- > .../{directfb_1.7.4.bb => directfb_1.7.6.bb} | 8 +- > 3 files changed, 3 insertions(+), 369 deletions(-) > delete mode 100644 meta/recipes-graphics/directfb/directfb/fixsepbuild.patch > delete mode 100644 meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch > rename meta/recipes-graphics/directfb/{directfb_1.7.4.bb => directfb_1.7.6.bb} (58%) > > diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch > deleted file mode 100644 > index 94a9ba5..0000000 > --- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch > +++ /dev/null > @@ -1,19 +0,0 @@ > -Fix out of tree builds > - > -Upstream-Status: Pending > - > -RP 2013/03/21 > - > -Index: DirectFB-1.6.1/configure.in > -=================================================================== > ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 > -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 > -@@ -111,7 +111,7 @@ > - AC_PATH_TOOL(FLUXCOMP, fluxcomp) > - AC_SUBST(FLUXCOMP) > - if test -z "$FLUXCOMP"; then > -- if ! test -e src/core/CoreDFB.cpp; then > -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then > - AC_MSG_ERROR([ > - *** DirectFB compilation requires fluxcomp *** > - > diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch > deleted file mode 100644 > index 443df5a..0000000 > --- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch > +++ /dev/null > @@ -1,345 +0,0 @@ > -Rename __no_instrument_function__ macro to avoid conficting redefinitions > -of the same symbol. > - > -Upstream-Status: Pending > -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> > - > -Index: DirectFB-1.6.1/lib/direct/clock.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 > -@@ -36,28 +36,28 @@ > - > - /**********************************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - long long > - direct_clock_get_micros( void ) > - { > - return direct_clock_get_time( DIRECT_CLOCK_SESSION ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - long long > - direct_clock_get_millis( void ) > - { > - return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - long long > - direct_clock_get_abs_micros( void ) > - { > - return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - long long > - direct_clock_get_abs_millis( void ) > - { > -Index: DirectFB-1.6.1/lib/direct/debug.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 > -@@ -48,7 +48,7 @@ > - > - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_debug_log( DirectLogDomain *domain, > - unsigned int debug_level, /* 1-9, 0 = info */ > -@@ -63,7 +63,7 @@ > - va_end( ap ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_debug_at( DirectLogDomain *domain, > - const char *format, ... ) > -@@ -77,7 +77,7 @@ > - > - #endif /* DIRECT_BUILD_DEBUGS */ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_debug_at_always( DirectLogDomain *domain, > - const char *format, ... ) > -@@ -93,7 +93,7 @@ > - > - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_break( const char *func, > - const char *file, > -@@ -123,7 +123,7 @@ > - direct_trap( "Break", SIGABRT ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_assertion( const char *exp, > - const char *func, > -@@ -144,7 +144,7 @@ > - direct_trap( "Assertion", SIGTRAP ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_assumption( const char *exp, > - const char *func, > -Index: DirectFB-1.6.1/lib/direct/interface.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 > -@@ -522,7 +522,7 @@ > - > - /**************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - static InterfaceDesc * > - allocate_interface_desc( void ) > - { > -@@ -543,7 +543,7 @@ > - return &alloc_list[alloc_count++]; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - static __inline__ void > - fill_interface_desc( InterfaceDesc *desc, > - const void *interface_ptr, > -@@ -565,7 +565,7 @@ > - > - /**************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_dbg_interface_add( const char *func, > - const char *file, > -@@ -586,7 +586,7 @@ > - direct_mutex_unlock( &alloc_lock ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_dbg_interface_remove( const char *func, > - const char *file, > -Index: DirectFB-1.6.1/lib/direct/log.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 > -@@ -128,7 +128,7 @@ > - return DR_OK; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - DirectResult > - direct_log_printf( DirectLog *log, > - const char *format, ... ) > -@@ -197,7 +197,7 @@ > - return DR_OK; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_log_lock( DirectLog *log ) > - { > -@@ -211,7 +211,7 @@ > - direct_mutex_lock( &log->lock ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_log_unlock( DirectLog *log ) > - { > -@@ -262,7 +262,7 @@ > - > - /**********************************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - DirectLog * > - direct_log_default( void ) > - { > -Index: DirectFB-1.6.1/lib/direct/log_domain.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 > -@@ -69,7 +69,7 @@ > - > - /**********************************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - static __inline__ LogDomainEntry * > - lookup_domain( const char *name, bool sub ); > - > -@@ -104,7 +104,7 @@ > - return NULL; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - static DirectLogLevel > - check_domain( DirectLogDomain *domain ); > - > -@@ -207,7 +207,7 @@ > - /* FIXME: merge following */ > - > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - DirectResult > - direct_log_domain_vprintf( DirectLogDomain *domain, > - DirectLogLevel level, > -@@ -268,7 +268,7 @@ > - return DR_OK; > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - DirectResult > - direct_log_domain_log( DirectLogDomain *domain, > - DirectLogLevel level, > -Index: DirectFB-1.6.1/lib/direct/mem.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 > -@@ -121,7 +121,7 @@ > - > - /**********************************************************************************************************************/ > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - static __inline__ MemDesc * > - fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) > - { > -Index: DirectFB-1.6.1/lib/direct/messages.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 > -@@ -40,7 +40,7 @@ > - > - #if DIRECT_BUILD_TEXT > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_info( const char *format, ... ) > - { > -@@ -57,7 +57,7 @@ > - direct_log_printf( NULL, "(*) %s", buf ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_error( const char *format, ... ) > - { > -@@ -76,7 +76,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_derror( DirectResult result, const char *format, ... ) > - { > -@@ -95,7 +95,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_perror( int erno, const char *format, ... ) > - { > -@@ -114,7 +114,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_dlerror( const char *dlerr, const char *format, ... ) > - { > -@@ -133,7 +133,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_once( const char *func, > - const char *file, > -@@ -155,7 +155,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_unimplemented( const char *func, > - const char *file, > -@@ -166,7 +166,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_bug( const char *func, > - const char *file, > -@@ -188,7 +188,7 @@ > - direct_trace_print_stack( NULL ); > - } > - > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - void > - direct_messages_warn( const char *func, > - const char *file, > -Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 > -@@ -74,7 +74,7 @@ > - > - #define __inline__ inline > - #define D_UNUSED __attribute__((unused)) > --#define __no_instrument_function__ __attribute__((no_instrument_function)) > -+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) > - #define __constructor__ __attribute__((constructor)) > - #define __destructor__ __attribute__((destructor)) > - #define __typeof__(x) typeof(x) > -Index: DirectFB-1.6.1/lib/direct/util.c > -=================================================================== > ---- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 > -+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 > -@@ -110,7 +110,7 @@ > - /* > - * translates errno to DirectResult > - */ > --__no_instrument_function__ > -+__dfb_no_instrument_function__ > - DirectResult > - errno2result( int erno ) > - { > diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb > similarity index 58% > rename from meta/recipes-graphics/directfb/directfb_1.7.4.bb > rename to meta/recipes-graphics/directfb/directfb_1.7.6.bb > index 39b006e..d25d987 100644 > --- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb > +++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb > @@ -1,11 +1,9 @@ > require directfb.inc > > -RV = "1.7-4" > +RV = "1.7-6" > > DEPENDS += "sysfsutils" > > -SRC_URI += "file://fixsepbuild.patch" > - > EXTRA_OECONF = "\ > --enable-freetype=yes \ > --enable-zlib \ > @@ -19,5 +17,5 @@ EXTRA_OECONF = "\ > > LEAD_SONAME = "libdirectfb-1.7.so.0" > > -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" > -SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" > +SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512" > +SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1" > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/6] directfb: upgrade to 1.7.6 2014-12-25 22:02 ` Richard Purdie @ 2014-12-25 22:58 ` Otavio Salvador 2014-12-26 1:42 ` Hongxu Jia 1 sibling, 0 replies; 16+ messages in thread From: Otavio Salvador @ 2014-12-25 22:58 UTC (permalink / raw) To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer On Thu, Dec 25, 2014 at 8:02 PM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Tue, 2014-12-23 at 13:09 +0800, Hongxu Jia wrote: >> - Drop fixsepbuild.patch which has been merged to 1.7.6 >> - Drop obsolete rename-no-instrument-function-macro.patch > > I think this somehow breaks qt4: > > https://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/144 > > (thanks Otavio for pointing out it was linked to directfb) Glad to know this has been narrowed down :) -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/6] directfb: upgrade to 1.7.6 2014-12-25 22:02 ` Richard Purdie 2014-12-25 22:58 ` Otavio Salvador @ 2014-12-26 1:42 ` Hongxu Jia 1 sibling, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-26 1:42 UTC (permalink / raw) To: Richard Purdie; +Cc: Otavio Salvador, openembedded-core On 12/26/2014 06:02 AM, Richard Purdie wrote: > On Tue, 2014-12-23 at 13:09 +0800, Hongxu Jia wrote: >> - Drop fixsepbuild.patch which has been merged to 1.7.6 >> - Drop obsolete rename-no-instrument-function-macro.patch > I think this somehow breaks qt4: Got it, I am working to fix it. //Hongxu > https://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/144 > > (thanks Otavio for pointing out it was linked to directfb) > > Cheers, > > Richard > >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> .../directfb/directfb/fixsepbuild.patch | 19 -- >> .../rename-no-instrument-function-macro.patch | 345 --------------------- >> .../{directfb_1.7.4.bb => directfb_1.7.6.bb} | 8 +- >> 3 files changed, 3 insertions(+), 369 deletions(-) >> delete mode 100644 meta/recipes-graphics/directfb/directfb/fixsepbuild.patch >> delete mode 100644 meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch >> rename meta/recipes-graphics/directfb/{directfb_1.7.4.bb => directfb_1.7.6.bb} (58%) >> >> diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch >> deleted file mode 100644 >> index 94a9ba5..0000000 >> --- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch >> +++ /dev/null >> @@ -1,19 +0,0 @@ >> -Fix out of tree builds >> - >> -Upstream-Status: Pending >> - >> -RP 2013/03/21 >> - >> -Index: DirectFB-1.6.1/configure.in >> -=================================================================== >> ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 >> -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 >> -@@ -111,7 +111,7 @@ >> - AC_PATH_TOOL(FLUXCOMP, fluxcomp) >> - AC_SUBST(FLUXCOMP) >> - if test -z "$FLUXCOMP"; then >> -- if ! test -e src/core/CoreDFB.cpp; then >> -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then >> - AC_MSG_ERROR([ >> - *** DirectFB compilation requires fluxcomp *** >> - >> diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch >> deleted file mode 100644 >> index 443df5a..0000000 >> --- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch >> +++ /dev/null >> @@ -1,345 +0,0 @@ >> -Rename __no_instrument_function__ macro to avoid conficting redefinitions >> -of the same symbol. >> - >> -Upstream-Status: Pending >> -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> >> - >> -Index: DirectFB-1.6.1/lib/direct/clock.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 >> -@@ -36,28 +36,28 @@ >> - >> - /**********************************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - long long >> - direct_clock_get_micros( void ) >> - { >> - return direct_clock_get_time( DIRECT_CLOCK_SESSION ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - long long >> - direct_clock_get_millis( void ) >> - { >> - return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - long long >> - direct_clock_get_abs_micros( void ) >> - { >> - return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - long long >> - direct_clock_get_abs_millis( void ) >> - { >> -Index: DirectFB-1.6.1/lib/direct/debug.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 >> -@@ -48,7 +48,7 @@ >> - >> - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_debug_log( DirectLogDomain *domain, >> - unsigned int debug_level, /* 1-9, 0 = info */ >> -@@ -63,7 +63,7 @@ >> - va_end( ap ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_debug_at( DirectLogDomain *domain, >> - const char *format, ... ) >> -@@ -77,7 +77,7 @@ >> - >> - #endif /* DIRECT_BUILD_DEBUGS */ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_debug_at_always( DirectLogDomain *domain, >> - const char *format, ... ) >> -@@ -93,7 +93,7 @@ >> - >> - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_break( const char *func, >> - const char *file, >> -@@ -123,7 +123,7 @@ >> - direct_trap( "Break", SIGABRT ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_assertion( const char *exp, >> - const char *func, >> -@@ -144,7 +144,7 @@ >> - direct_trap( "Assertion", SIGTRAP ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_assumption( const char *exp, >> - const char *func, >> -Index: DirectFB-1.6.1/lib/direct/interface.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 >> -@@ -522,7 +522,7 @@ >> - >> - /**************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - static InterfaceDesc * >> - allocate_interface_desc( void ) >> - { >> -@@ -543,7 +543,7 @@ >> - return &alloc_list[alloc_count++]; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - static __inline__ void >> - fill_interface_desc( InterfaceDesc *desc, >> - const void *interface_ptr, >> -@@ -565,7 +565,7 @@ >> - >> - /**************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_dbg_interface_add( const char *func, >> - const char *file, >> -@@ -586,7 +586,7 @@ >> - direct_mutex_unlock( &alloc_lock ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_dbg_interface_remove( const char *func, >> - const char *file, >> -Index: DirectFB-1.6.1/lib/direct/log.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 >> -@@ -128,7 +128,7 @@ >> - return DR_OK; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - DirectResult >> - direct_log_printf( DirectLog *log, >> - const char *format, ... ) >> -@@ -197,7 +197,7 @@ >> - return DR_OK; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_log_lock( DirectLog *log ) >> - { >> -@@ -211,7 +211,7 @@ >> - direct_mutex_lock( &log->lock ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_log_unlock( DirectLog *log ) >> - { >> -@@ -262,7 +262,7 @@ >> - >> - /**********************************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - DirectLog * >> - direct_log_default( void ) >> - { >> -Index: DirectFB-1.6.1/lib/direct/log_domain.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 >> -@@ -69,7 +69,7 @@ >> - >> - /**********************************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - static __inline__ LogDomainEntry * >> - lookup_domain( const char *name, bool sub ); >> - >> -@@ -104,7 +104,7 @@ >> - return NULL; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - static DirectLogLevel >> - check_domain( DirectLogDomain *domain ); >> - >> -@@ -207,7 +207,7 @@ >> - /* FIXME: merge following */ >> - >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - DirectResult >> - direct_log_domain_vprintf( DirectLogDomain *domain, >> - DirectLogLevel level, >> -@@ -268,7 +268,7 @@ >> - return DR_OK; >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - DirectResult >> - direct_log_domain_log( DirectLogDomain *domain, >> - DirectLogLevel level, >> -Index: DirectFB-1.6.1/lib/direct/mem.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 >> -@@ -121,7 +121,7 @@ >> - >> - /**********************************************************************************************************************/ >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - static __inline__ MemDesc * >> - fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) >> - { >> -Index: DirectFB-1.6.1/lib/direct/messages.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 >> -@@ -40,7 +40,7 @@ >> - >> - #if DIRECT_BUILD_TEXT >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_info( const char *format, ... ) >> - { >> -@@ -57,7 +57,7 @@ >> - direct_log_printf( NULL, "(*) %s", buf ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_error( const char *format, ... ) >> - { >> -@@ -76,7 +76,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_derror( DirectResult result, const char *format, ... ) >> - { >> -@@ -95,7 +95,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_perror( int erno, const char *format, ... ) >> - { >> -@@ -114,7 +114,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_dlerror( const char *dlerr, const char *format, ... ) >> - { >> -@@ -133,7 +133,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_once( const char *func, >> - const char *file, >> -@@ -155,7 +155,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_unimplemented( const char *func, >> - const char *file, >> -@@ -166,7 +166,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_bug( const char *func, >> - const char *file, >> -@@ -188,7 +188,7 @@ >> - direct_trace_print_stack( NULL ); >> - } >> - >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - void >> - direct_messages_warn( const char *func, >> - const char *file, >> -Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 >> -@@ -74,7 +74,7 @@ >> - >> - #define __inline__ inline >> - #define D_UNUSED __attribute__((unused)) >> --#define __no_instrument_function__ __attribute__((no_instrument_function)) >> -+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) >> - #define __constructor__ __attribute__((constructor)) >> - #define __destructor__ __attribute__((destructor)) >> - #define __typeof__(x) typeof(x) >> -Index: DirectFB-1.6.1/lib/direct/util.c >> -=================================================================== >> ---- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 >> -+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 >> -@@ -110,7 +110,7 @@ >> - /* >> - * translates errno to DirectResult >> - */ >> --__no_instrument_function__ >> -+__dfb_no_instrument_function__ >> - DirectResult >> - errno2result( int erno ) >> - { >> diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb >> similarity index 58% >> rename from meta/recipes-graphics/directfb/directfb_1.7.4.bb >> rename to meta/recipes-graphics/directfb/directfb_1.7.6.bb >> index 39b006e..d25d987 100644 >> --- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb >> +++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb >> @@ -1,11 +1,9 @@ >> require directfb.inc >> >> -RV = "1.7-4" >> +RV = "1.7-6" >> >> DEPENDS += "sysfsutils" >> >> -SRC_URI += "file://fixsepbuild.patch" >> - >> EXTRA_OECONF = "\ >> --enable-freetype=yes \ >> --enable-zlib \ >> @@ -19,5 +17,5 @@ EXTRA_OECONF = "\ >> >> LEAD_SONAME = "libdirectfb-1.7.so.0" >> >> -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" >> -SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" >> +SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512" >> +SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1" >> -- >> 1.9.1 >> > ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/6] apr-util: upgrade to 1.5.4 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia 2014-12-23 5:09 ` [PATCH 1/6] libxml2: upgrade to 2.9.2 Hongxu Jia 2014-12-23 5:09 ` [PATCH 2/6] directfb: upgrade to 1.7.6 Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-23 5:09 ` [PATCH 4/6] pax-utils: upgrade to 0.9.2 Hongxu Jia ` (2 subsequent siblings) 5 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-support/apr/{apr-util_1.5.3.bb => apr-util_1.5.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/apr/{apr-util_1.5.3.bb => apr-util_1.5.4.bb} (93%) diff --git a/meta/recipes-support/apr/apr-util_1.5.3.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb similarity index 93% rename from meta/recipes-support/apr/apr-util_1.5.3.bb rename to meta/recipes-support/apr/apr-util_1.5.4.bb index 063a787..1cd47b1 100644 --- a/meta/recipes-support/apr/apr-util_1.5.3.bb +++ b/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "71a11d037240b292f824ba1eb537b4e3" -SRC_URI[sha256sum] = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743" +SRC_URI[md5sum] = "866825c04da827c6e5f53daff5569f42" +SRC_URI[sha256sum] = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/6] pax-utils: upgrade to 0.9.2 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia ` (2 preceding siblings ...) 2014-12-23 5:09 ` [PATCH 3/6] apr-util: upgrade to 1.5.4 Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-23 5:09 ` [PATCH 5/6] ppp: upgrade 2.4.7 Hongxu Jia 2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia 5 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- .../pax-utils/{pax-utils_0.8.1.bb => pax-utils_0.9.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/pax-utils/{pax-utils_0.8.1.bb => pax-utils_0.9.2.bb} (83%) diff --git a/meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb b/meta/recipes-devtools/pax-utils/pax-utils_0.9.2.bb similarity index 83% rename from meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb rename to meta/recipes-devtools/pax-utils/pax-utils_0.9.2.bb index 79e58ba..ac14306 100644 --- a/meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb +++ b/meta/recipes-devtools/pax-utils/pax-utils_0.9.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz" -SRC_URI[md5sum] = "bc42279c5aff3682c12be40f72805cec" -SRC_URI[sha256sum] = "844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9" +SRC_URI[md5sum] = "34c41888cec67759c21333bef13e950c" +SRC_URI[sha256sum] = "578801df0661b1b7b8fed0ce4a9859239f919fd37529907681e51091a1bcb4de" RDEPENDS_${PN} += "bash" -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/6] ppp: upgrade 2.4.7 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia ` (3 preceding siblings ...) 2014-12-23 5:09 ` [PATCH 4/6] pax-utils: upgrade to 0.9.2 Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia 5 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-connectivity/ppp/{ppp_2.4.6.bb => ppp_2.4.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/ppp/{ppp_2.4.6.bb => ppp_2.4.7.bb} (96%) diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb similarity index 96% rename from meta/recipes-connectivity/ppp/ppp_2.4.6.bb rename to meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 8bc3672..92ca0c9 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -31,8 +31,8 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp@.service \ " -SRC_URI[md5sum] = "3434d2cc9327167a0723aaaa8670083b" -SRC_URI[sha256sum] = "1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d" +SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" +SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30" inherit autotools-brokensep systemd -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 6/6] groff: upgrade 1.22.3 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia ` (4 preceding siblings ...) 2014-12-23 5:09 ` [PATCH 5/6] ppp: upgrade 2.4.7 Hongxu Jia @ 2014-12-23 5:09 ` Hongxu Jia 2014-12-24 17:56 ` Saul Wold 2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia 5 siblings, 2 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-23 5:09 UTC (permalink / raw) To: openembedded-core Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- ...off-1.22.3-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 6 +-- 3 files changed, 48 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (90%) diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch deleted file mode 100644 index f7e9a74..0000000 --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -Correct the install path of man.local to fix following error: - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' - -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> -Upstream-Status: Pending - ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 -@@ -114,9 +114,9 @@ - rm -f $(DESTDIR)$(mdocdir)/$$f; \ - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ - done -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ - $(INSTALL_DATA) $(srcdir)/man.local \ -- $(DESTDIR)$(localtmacdir)/man.local -+ $(DESTDIR)$(tmacdir)/man.local - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local - -@@ -158,9 +158,9 @@ - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac - -rm -f $(DESTDIR)$(tmacdir)/www.tmac -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ - $(srcdir)/man.local; then \ -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ - fi - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ - $(srcdir)/mdoc.local; then \ diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch new file mode 100644 index 0000000..e5db6cf --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch @@ -0,0 +1,45 @@ +Correct the install path of man.local to fix following error: + + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: + warning: can't find macro file `man.local' + +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> +Upstream-Status: Pending + +Rebase to 1.22.3 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + tmac/Makefile.sub | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub +index 1506232..f1468c5 100644 +--- a/tmac/Makefile.sub ++++ b/tmac/Makefile.sub +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ + done +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ + || $(INSTALL_DATA) $(srcdir)/man.local \ +- $(DESTDIR)$(localtmacdir)/man.local ++ $(DESTDIR)$(tmacdir)/man.local + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local + +@@ -164,9 +164,9 @@ uninstall_sub: + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac + $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ + $(srcdir)/man.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ + fi + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ + $(srcdir)/mdoc.local; then \ +-- +1.9.1 + diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb similarity index 90% rename from meta/recipes-extended/groff/groff_1.22.2.bb rename to meta/recipes-extended/groff/groff_1.22.3.bb index 63f0425..e0d632f 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -9,11 +9,11 @@ PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ - file://groff-1.22.2-correct-man.local-install-path.patch \ + file://groff-1.22.3-correct-man.local-install-path.patch \ " -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" DEPENDS = "groff-native" DEPENDS_class-native = "" -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 6/6] groff: upgrade 1.22.3 2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia @ 2014-12-24 17:56 ` Saul Wold 2014-12-25 1:35 ` Hongxu Jia 2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia 1 sibling, 1 reply; 16+ messages in thread From: Saul Wold @ 2014-12-24 17:56 UTC (permalink / raw) To: Hongxu Jia, openembedded-core On 12/22/2014 09:09 PM, Hongxu Jia wrote: > Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- > ...off-1.22.3-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ Does it make more sense not to have the version in the patch name if we are going to carry it forward? > .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 6 +-- The new version of groff seems to depend on Perl now for a couple of scripts (grog and BuildFoundries), please double check your RDEPENDS. Thanks Sau! > 3 files changed, 48 insertions(+), 35 deletions(-) > delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch > rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (90%) > > diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > deleted file mode 100644 > index f7e9a74..0000000 > --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -Correct the install path of man.local to fix following error: > - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' > - > -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> > -Upstream-Status: Pending > - > ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 > -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 > -@@ -114,9 +114,9 @@ > - rm -f $(DESTDIR)$(mdocdir)/$$f; \ > - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ > - done > -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ > -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ > - $(INSTALL_DATA) $(srcdir)/man.local \ > -- $(DESTDIR)$(localtmacdir)/man.local > -+ $(DESTDIR)$(tmacdir)/man.local > - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ > - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local > - > -@@ -158,9 +158,9 @@ > - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac > - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac > - -rm -f $(DESTDIR)$(tmacdir)/www.tmac > -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ > -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ > - $(srcdir)/man.local; then \ > -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ > -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ > - fi > - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ > - $(srcdir)/mdoc.local; then \ > diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch > new file mode 100644 > index 0000000..e5db6cf > --- /dev/null > +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch > @@ -0,0 +1,45 @@ > +Correct the install path of man.local to fix following error: > + > + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: > + warning: can't find macro file `man.local' > + > +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> > +Upstream-Status: Pending > + > +Rebase to 1.22.3 > +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > +--- > + tmac/Makefile.sub | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub > +index 1506232..f1468c5 100644 > +--- a/tmac/Makefile.sub > ++++ b/tmac/Makefile.sub > +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ > + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ > + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ > + done > +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ > ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ > + || $(INSTALL_DATA) $(srcdir)/man.local \ > +- $(DESTDIR)$(localtmacdir)/man.local > ++ $(DESTDIR)$(tmacdir)/man.local > + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ > + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local > + > +@@ -164,9 +164,9 @@ uninstall_sub: > + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac > + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac > + $(RM) $(DESTDIR)$(tmacdir)/www.tmac > +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ > ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ > + $(srcdir)/man.local; then \ > +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ > ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ > + fi > + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ > + $(srcdir)/mdoc.local; then \ > +-- > +1.9.1 > + > diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb > similarity index 90% > rename from meta/recipes-extended/groff/groff_1.22.2.bb > rename to meta/recipes-extended/groff/groff_1.22.3.bb > index 63f0425..e0d632f 100644 > --- a/meta/recipes-extended/groff/groff_1.22.2.bb > +++ b/meta/recipes-extended/groff/groff_1.22.3.bb > @@ -9,11 +9,11 @@ PR = "r1" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ > - file://groff-1.22.2-correct-man.local-install-path.patch \ > + file://groff-1.22.3-correct-man.local-install-path.patch \ > " > > -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" > -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" > +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" > +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" > > DEPENDS = "groff-native" > DEPENDS_class-native = "" > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 6/6] groff: upgrade 1.22.3 2014-12-24 17:56 ` Saul Wold @ 2014-12-25 1:35 ` Hongxu Jia 0 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-25 1:35 UTC (permalink / raw) To: Saul Wold, openembedded-core On 12/25/2014 01:56 AM, Saul Wold wrote: > On 12/22/2014 09:09 PM, Hongxu Jia wrote: >> Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> ...off-1.22.2-correct-man.local-install-path.patch | 32 >> --------------- >> ...off-1.22.3-correct-man.local-install-path.patch | 45 >> ++++++++++++++++++++++ > > Does it make more sense not to have the version in the patch name if > we are going to carry it forward? > >> .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 6 +-- > > The new version of groff seems to depend on Perl now for a couple of > scripts (grog and BuildFoundries), please double check your RDEPENDS. > Got it, V2 incoming //Hongxu > Thanks > Sau! > >> 3 files changed, 48 insertions(+), 35 deletions(-) >> delete mode 100644 >> meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch >> create mode 100644 >> meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch >> rename meta/recipes-extended/groff/{groff_1.22.2.bb => >> groff_1.22.3.bb} (90%) >> >> diff --git >> a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch >> b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch >> >> deleted file mode 100644 >> index f7e9a74..0000000 >> --- >> a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch >> +++ /dev/null >> @@ -1,32 +0,0 @@ >> -Correct the install path of man.local to fix following error: >> - >> /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: >> warning: can't find macro file `man.local' >> - >> -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> >> -Upstream-Status: Pending >> - >> ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 >> 20:06:08.000000000 +0800 >> -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 >> +0800 >> -@@ -114,9 +114,9 @@ >> - rm -f $(DESTDIR)$(mdocdir)/$$f; \ >> - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ >> - done >> -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ >> -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ >> - $(INSTALL_DATA) $(srcdir)/man.local \ >> -- $(DESTDIR)$(localtmacdir)/man.local >> -+ $(DESTDIR)$(tmacdir)/man.local >> - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ >> - $(INSTALL_DATA) mdoc.local-s >> $(DESTDIR)$(localtmacdir)/mdoc.local >> - >> -@@ -158,9 +158,9 @@ >> - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac >> - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac >> - -rm -f $(DESTDIR)$(tmacdir)/www.tmac >> -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ >> -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ >> - $(srcdir)/man.local; then \ >> -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ >> -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ >> - fi >> - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ >> - $(srcdir)/mdoc.local; then \ >> diff --git >> a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch >> b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch >> >> new file mode 100644 >> index 0000000..e5db6cf >> --- /dev/null >> +++ >> b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.3-correct-man.local-install-path.patch >> @@ -0,0 +1,45 @@ >> +Correct the install path of man.local to fix following error: >> + >> + >> /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: >> + warning: can't find macro file `man.local' >> + >> +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> >> +Upstream-Status: Pending >> + >> +Rebase to 1.22.3 >> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> +--- >> + tmac/Makefile.sub | 8 ++++---- >> + 1 file changed, 4 insertions(+), 4 deletions(-) >> + >> +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub >> +index 1506232..f1468c5 100644 >> +--- a/tmac/Makefile.sub >> ++++ b/tmac/Makefile.sub >> +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) >> man.local \ >> + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ >> + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ >> + done >> +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ >> ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ >> + || $(INSTALL_DATA) $(srcdir)/man.local \ >> +- $(DESTDIR)$(localtmacdir)/man.local >> ++ $(DESTDIR)$(tmacdir)/man.local >> + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ >> + || $(INSTALL_DATA) mdoc.local-s >> $(DESTDIR)$(localtmacdir)/mdoc.local >> + >> +@@ -164,9 +164,9 @@ uninstall_sub: >> + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac >> + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac >> + $(RM) $(DESTDIR)$(tmacdir)/www.tmac >> +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ >> ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ >> + $(srcdir)/man.local; then \ >> +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ >> ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ >> + fi >> + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ >> + $(srcdir)/mdoc.local; then \ >> +-- >> +1.9.1 >> + >> diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb >> b/meta/recipes-extended/groff/groff_1.22.3.bb >> similarity index 90% >> rename from meta/recipes-extended/groff/groff_1.22.2.bb >> rename to meta/recipes-extended/groff/groff_1.22.3.bb >> index 63f0425..e0d632f 100644 >> --- a/meta/recipes-extended/groff/groff_1.22.2.bb >> +++ b/meta/recipes-extended/groff/groff_1.22.3.bb >> @@ -9,11 +9,11 @@ PR = "r1" >> LIC_FILES_CHKSUM = >> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >> >> SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ >> - file://groff-1.22.2-correct-man.local-install-path.patch \ >> + file://groff-1.22.3-correct-man.local-install-path.patch \ >> " >> >> -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" >> -SRC_URI[sha256sum] = >> "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" >> +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" >> +SRC_URI[sha256sum] = >> "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" >> >> DEPENDS = "groff-native" >> DEPENDS_class-native = "" >> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH V2 6/6] groff: upgrade 1.22.3 2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia 2014-12-24 17:56 ` Saul Wold @ 2014-12-25 2:19 ` Hongxu Jia 2014-12-25 2:23 ` Hongxu Jia 2014-12-25 8:44 ` Richard Purdie 1 sibling, 2 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-25 2:19 UTC (permalink / raw) To: openembedded-core, saul.wold Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 Refer what debian did, we add perl to RRECOMMENDS_${PN}, here is the explanation in groff 1.22.3 README: ... Additionally, producing `PDF' output directly with the `gropdf' device needs a working installation of `perl'. The same is true for some other preprocessors like `chem'. ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- .../groff-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++-- 3 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (89%) diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch deleted file mode 100644 index f7e9a74..0000000 --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -Correct the install path of man.local to fix following error: - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' - -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> -Upstream-Status: Pending - ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 -@@ -114,9 +114,9 @@ - rm -f $(DESTDIR)$(mdocdir)/$$f; \ - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ - done -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ - $(INSTALL_DATA) $(srcdir)/man.local \ -- $(DESTDIR)$(localtmacdir)/man.local -+ $(DESTDIR)$(tmacdir)/man.local - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local - -@@ -158,9 +158,9 @@ - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac - -rm -f $(DESTDIR)$(tmacdir)/www.tmac -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ - $(srcdir)/man.local; then \ -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ - fi - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ - $(srcdir)/mdoc.local; then \ diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch new file mode 100644 index 0000000..e5db6cf --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch @@ -0,0 +1,45 @@ +Correct the install path of man.local to fix following error: + + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: + warning: can't find macro file `man.local' + +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> +Upstream-Status: Pending + +Rebase to 1.22.3 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + tmac/Makefile.sub | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub +index 1506232..f1468c5 100644 +--- a/tmac/Makefile.sub ++++ b/tmac/Makefile.sub +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ + done +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ + || $(INSTALL_DATA) $(srcdir)/man.local \ +- $(DESTDIR)$(localtmacdir)/man.local ++ $(DESTDIR)$(tmacdir)/man.local + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local + +@@ -164,9 +164,9 @@ uninstall_sub: + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac + $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ + $(srcdir)/man.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ + fi + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ + $(srcdir)/mdoc.local; then \ +-- +1.9.1 + diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb similarity index 89% rename from meta/recipes-extended/groff/groff_1.22.2.bb rename to meta/recipes-extended/groff/groff_1.22.3.bb index 63f0425..bd42593 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -9,14 +9,15 @@ PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ - file://groff-1.22.2-correct-man.local-install-path.patch \ + file://groff-correct-man.local-install-path.patch \ " -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" DEPENDS = "groff-native" DEPENDS_class-native = "" +RRECOMMENDS_${PN} = "perl" inherit autotools texinfo -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH V2 6/6] groff: upgrade 1.22.3 2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia @ 2014-12-25 2:23 ` Hongxu Jia 2014-12-25 8:44 ` Richard Purdie 1 sibling, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-25 2:23 UTC (permalink / raw) To: openembedded-core, saul.wold BTW, I have already updated git repository at: git://git.pokylinux.org/poky-contrib hongxu/upgrade-packages http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-packages //Hongxu On 12/25/2014 10:19 AM, Hongxu Jia wrote: > Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 > > Refer what debian did, we add perl to RRECOMMENDS_${PN}, here is the > explanation in groff 1.22.3 README: > ... > Additionally, producing `PDF' output directly with the `gropdf' device needs > a working installation of `perl'. The same is true for some other > preprocessors like `chem'. > ... > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- > .../groff-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ > .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++-- > 3 files changed, 49 insertions(+), 35 deletions(-) > delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch > rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (89%) > > diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > deleted file mode 100644 > index f7e9a74..0000000 > --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -Correct the install path of man.local to fix following error: > - /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' > - > -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> > -Upstream-Status: Pending > - > ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 > -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 > -@@ -114,9 +114,9 @@ > - rm -f $(DESTDIR)$(mdocdir)/$$f; \ > - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ > - done > -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ > -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ > - $(INSTALL_DATA) $(srcdir)/man.local \ > -- $(DESTDIR)$(localtmacdir)/man.local > -+ $(DESTDIR)$(tmacdir)/man.local > - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ > - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local > - > -@@ -158,9 +158,9 @@ > - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac > - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac > - -rm -f $(DESTDIR)$(tmacdir)/www.tmac > -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ > -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ > - $(srcdir)/man.local; then \ > -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ > -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ > - fi > - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ > - $(srcdir)/mdoc.local; then \ > diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch > new file mode 100644 > index 0000000..e5db6cf > --- /dev/null > +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch > @@ -0,0 +1,45 @@ > +Correct the install path of man.local to fix following error: > + > + /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: > + warning: can't find macro file `man.local' > + > +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> > +Upstream-Status: Pending > + > +Rebase to 1.22.3 > +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > +--- > + tmac/Makefile.sub | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub > +index 1506232..f1468c5 100644 > +--- a/tmac/Makefile.sub > ++++ b/tmac/Makefile.sub > +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ > + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ > + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ > + done > +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ > ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ > + || $(INSTALL_DATA) $(srcdir)/man.local \ > +- $(DESTDIR)$(localtmacdir)/man.local > ++ $(DESTDIR)$(tmacdir)/man.local > + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ > + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local > + > +@@ -164,9 +164,9 @@ uninstall_sub: > + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac > + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac > + $(RM) $(DESTDIR)$(tmacdir)/www.tmac > +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ > ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ > + $(srcdir)/man.local; then \ > +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ > ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ > + fi > + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ > + $(srcdir)/mdoc.local; then \ > +-- > +1.9.1 > + > diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb > similarity index 89% > rename from meta/recipes-extended/groff/groff_1.22.2.bb > rename to meta/recipes-extended/groff/groff_1.22.3.bb > index 63f0425..bd42593 100644 > --- a/meta/recipes-extended/groff/groff_1.22.2.bb > +++ b/meta/recipes-extended/groff/groff_1.22.3.bb > @@ -9,14 +9,15 @@ PR = "r1" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ > - file://groff-1.22.2-correct-man.local-install-path.patch \ > + file://groff-correct-man.local-install-path.patch \ > " > > -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" > -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" > +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" > +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" > > DEPENDS = "groff-native" > DEPENDS_class-native = "" > +RRECOMMENDS_${PN} = "perl" > > inherit autotools texinfo > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 6/6] groff: upgrade 1.22.3 2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia 2014-12-25 2:23 ` Hongxu Jia @ 2014-12-25 8:44 ` Richard Purdie 2014-12-25 9:05 ` Hongxu Jia 1 sibling, 1 reply; 16+ messages in thread From: Richard Purdie @ 2014-12-25 8:44 UTC (permalink / raw) To: Hongxu Jia; +Cc: saul.wold, openembedded-core On Thu, 2014-12-25 at 10:19 +0800, Hongxu Jia wrote: > Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 > > Refer what debian did, we add perl to RRECOMMENDS_${PN}, here is the > explanation in groff 1.22.3 README: > ... > Additionally, producing `PDF' output directly with the `gropdf' device needs > a working installation of `perl'. The same is true for some other > preprocessors like `chem'. > ... > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- > .../groff-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ > .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++-- > 3 files changed, 49 insertions(+), 35 deletions(-) > delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch > create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch > rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (89%) Given the original error message, if you build this on a machine with /bin/perl, does it not still give an error at rootfs time? Do we need to correctly set the path to perl in the recipe? Cheers, Richard ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 6/6] groff: upgrade 1.22.3 2014-12-25 8:44 ` Richard Purdie @ 2014-12-25 9:05 ` Hongxu Jia 0 siblings, 0 replies; 16+ messages in thread From: Hongxu Jia @ 2014-12-25 9:05 UTC (permalink / raw) To: Richard Purdie; +Cc: saul.wold, openembedded-core On 12/25/2014 04:44 PM, Richard Purdie wrote: > On Thu, 2014-12-25 at 10:19 +0800, Hongxu Jia wrote: >> Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 >> >> Refer what debian did, we add perl to RRECOMMENDS_${PN}, here is the >> explanation in groff 1.22.3 README: >> ... >> Additionally, producing `PDF' output directly with the `gropdf' device needs >> a working installation of `perl'. The same is true for some other >> preprocessors like `chem'. >> ... >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- >> .../groff-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ >> .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++-- >> 3 files changed, 49 insertions(+), 35 deletions(-) >> delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch >> create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch >> rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (89%) > Given the original error message, if you build this on a machine > with /bin/perl, does it not still give an error at rootfs time? > > Do we need to correctly set the path to perl in the recipe? Got it, I will fix it. V3 incoming //Hongxu > Cheers, > > Richard > > ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-12-26 1:42 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-12-23 5:09 [PATCH 0/6] Packages upgrade Hongxu Jia 2014-12-23 5:09 ` [PATCH 1/6] libxml2: upgrade to 2.9.2 Hongxu Jia 2014-12-23 5:09 ` [PATCH 2/6] directfb: upgrade to 1.7.6 Hongxu Jia 2014-12-25 22:02 ` Richard Purdie 2014-12-25 22:58 ` Otavio Salvador 2014-12-26 1:42 ` Hongxu Jia 2014-12-23 5:09 ` [PATCH 3/6] apr-util: upgrade to 1.5.4 Hongxu Jia 2014-12-23 5:09 ` [PATCH 4/6] pax-utils: upgrade to 0.9.2 Hongxu Jia 2014-12-23 5:09 ` [PATCH 5/6] ppp: upgrade 2.4.7 Hongxu Jia 2014-12-23 5:09 ` [PATCH 6/6] groff: upgrade 1.22.3 Hongxu Jia 2014-12-24 17:56 ` Saul Wold 2014-12-25 1:35 ` Hongxu Jia 2014-12-25 2:19 ` [PATCH V2 " Hongxu Jia 2014-12-25 2:23 ` Hongxu Jia 2014-12-25 8:44 ` Richard Purdie 2014-12-25 9:05 ` Hongxu Jia
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.