Openembedded Devel Discussions
 help / color / mirror / Atom feed
* [meta-oe][PATCH] libutempter: Add new recipe
@ 2014-12-04  2:13 Qian Lei
  2015-01-07 11:53 ` Martin Jansa
  0 siblings, 1 reply; 5+ messages in thread
From: Qian Lei @ 2014-12-04  2:13 UTC (permalink / raw)
  To: openembedded-devel

Libutempter provides interface for terminal emulators such as
screen and xterm to record user sessions to utmp and wtmp files.

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
 .../libutempter/libutempter_1.1.6.bb               | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb

diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
new file mode 100644
index 0000000..e1dccd6
--- /dev/null
+++ b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
@@ -0,0 +1,36 @@
+SUMMARY = "A privileged helper for utmp/wtmp updates"
+DESCRIPTION = "\
+This library provides interface for terminal emulators such as \
+screen and xterm to record user sessions to utmp and wtmp files."
+HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter"
+SECTION = "System Environment/Libraries"
+LICENSE = "GPLv2 GPLv2+ LGPLv2 MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2"
+SRC_URI[md5sum] = "b43827806923903aba2bc7cd3a2d45b7"
+SRC_URI[sha256sum] = "b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397"
+
+CFLAGS += "-DLIBEXECDIR=$(libexecdir)"
+
+do_compile() {
+    oe_runmake                      \
+        libdir=${libdir}            \
+        libexecdir=${libexecdir}    \
+}
+
+do_install() {
+    oe_runmake install              \
+        DESTDIR=${D}                \
+        libdir="${libdir}"          \
+        libexecdir="${libexecdir}"  \
+        includedir=${includedir}    \
+        mandir=${mandir}
+
+        rm -f ${D}${libdir}/*.a
+}
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN} += "${libexecdir}/utempter/utempter"
+
+FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter"
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [meta-oe][PATCH] libutempter: Add new recipe
  2014-12-04  2:13 [meta-oe][PATCH] libutempter: Add new recipe Qian Lei
@ 2015-01-07 11:53 ` Martin Jansa
  2015-01-08  9:25   ` [meta-oe][PATCH] libutempter: Fix compile error on arm Qian Lei
  0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2015-01-07 11:53 UTC (permalink / raw)
  To: openembedded-devel

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

On Thu, Dec 04, 2014 at 10:13:40AM +0800, Qian Lei wrote:
> Libutempter provides interface for terminal emulators such as
> screen and xterm to record user sessions to utmp and wtmp files.

It's failing for all MACHINEs in world builds now.

Please fix it soon, otherwise it will be blacklisted/removed from meta-oe

ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libutempter/1.1.6-r0/temp/log.do_compile.9839
Log data follows:
| DEBUG: Executing shell function do_compile
| NOTE: make -j 8 -e MAKEFLAGS= libdir=/usr/lib libexecdir=/usr/lib/libutempter
| arm-oe-linux-gnueabi-gcc  -march=armv5te -marm  -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm  -O2 -pipe -g -feliminate-unused-debug-types -DLIBEXECDIR=/usr/lib/libutempter  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed  -Wl,-z,now,-stats  utempter.c -o utempter
| arm-oe-linux-gnueabi-gcc  -march=armv5te -marm  -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm  -O2 -pipe -g -feliminate-unused-debug-types -DLIBEXECDIR=/usr/lib/libutempter   -c -fPIC iface.c -o iface.os
| arm-oe-linux-gnueabi-gcc  -march=armv5te -marm  -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm  -O2 -pipe -g -feliminate-unused-debug-types -DLIBEXECDIR=/usr/lib/libutempter   -c -o iface.o iface.c
| iface.c: In function 'utempter_add_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
|                                    ^
| iface.c:144:27: note: in expansion of macro 'UTEMPTER_DEFAULT_PATHNAME'
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "add",
|                            ^
| iface.c: In function 'utempter_remove_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
|                                    ^
| iface.c:158:27: note: in expansion of macro 'UTEMPTER_DEFAULT_PATHNAME'
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "del", 0 };
|                            ^
| iface.c:158:25: warning: pointer type mismatch in conditional expression
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "del", 0 };
|                          ^
| make: *** [iface.os] Error 1
| make: *** Waiting for unfinished jobs....
| iface.c: In function 'utempter_add_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
|                                    ^
| iface.c:144:27: note: in expansion of macro 'UTEMPTER_DEFAULT_PATHNAME'
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "add",
|                            ^
| iface.c: In function 'utempter_remove_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
|                                    ^
| iface.c:158:27: note: in expansion of macro 'UTEMPTER_DEFAULT_PATHNAME'
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "del", 0 };
|                            ^
| iface.c:158:25: warning: pointer type mismatch in conditional expression
|    { utempter_pathname ? : UTEMPTER_DEFAULT_PATHNAME, "del", 0 };
|                          ^
| make: *** [iface.o] Error 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: initial tasks run time: (user: 0.010000 sys: 0.010000 wall: 0.020000)
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: middle tasks run time: (user: 0.000000 sys: 0.000000 wall: 0.000000)
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: final tasks run time: (user: 0.000000 sys: 0.000000 wall: 0.000000)
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total run time: (user: 0.010000 sys: 0.010000 wall: 0.020000)
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total space allocated by malloc: 3207168 bytes
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total bytes mapped for read: 36264230
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: maximum bytes mapped for read at one time: 36264230
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: archive libraries: 7
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total archive members: 5668
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: loaded archive members: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: lib groups: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total lib groups members: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: loaded lib groups members: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: output file size: 18452 bytes
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: symbol table entries: 6765; buckets: 12011
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: symbol table stringpool entries: 3410; buckets: 12011
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: symbol table stringpool Stringdata structures: 47
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: section name pool entries: 41; buckets: 47
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: section name pool Stringdata structures: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: output symbol name pool entries: 62; buckets: 79
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: output symbol name pool Stringdata structures: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: dynamic name pool entries: 25; buckets: 79
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: dynamic name pool Stringdata structures: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .rodata merged constants size: 4; input: 1; output: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .rodata merged strings input bytes: 24
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .rodata merged strings input strings: 2
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .rodata merged strings entries: 3; buckets: 11
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .rodata merged strings Stringdata structures: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .comment merged strings input bytes: 90
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .comment merged strings input strings: 5
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .comment merged strings entries: 2; buckets: 11
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .comment merged strings Stringdata structures: 1
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .debug_str merged strings input bytes: 2485
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .debug_str merged strings input strings: 185
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .debug_str merged strings entries: 168; buckets: 199
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: .debug_str merged strings Stringdata structures: 3
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total free lists: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: total free list nodes: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: calls to Free_list::remove: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: nodes visited: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: calls to Free_list::allocate: 0
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.1/ld: nodes visited: 0
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libutempter/1.1.6-r0/temp/log.do_compile.9839)
NOTE: recipe libutempter-1.1.6-r0: task do_compile: Failed

> 
> Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> ---
>  .../libutempter/libutempter_1.1.6.bb               | 36 ++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> 
> diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> new file mode 100644
> index 0000000..e1dccd6
> --- /dev/null
> +++ b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> @@ -0,0 +1,36 @@
> +SUMMARY = "A privileged helper for utmp/wtmp updates"
> +DESCRIPTION = "\
> +This library provides interface for terminal emulators such as \
> +screen and xterm to record user sessions to utmp and wtmp files."
> +HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter"
> +SECTION = "System Environment/Libraries"
> +LICENSE = "GPLv2 GPLv2+ LGPLv2 MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
> +
> +SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2"
> +SRC_URI[md5sum] = "b43827806923903aba2bc7cd3a2d45b7"
> +SRC_URI[sha256sum] = "b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397"
> +
> +CFLAGS += "-DLIBEXECDIR=$(libexecdir)"
> +
> +do_compile() {
> +    oe_runmake                      \
> +        libdir=${libdir}            \
> +        libexecdir=${libexecdir}    \
> +}
> +
> +do_install() {
> +    oe_runmake install              \
> +        DESTDIR=${D}                \
> +        libdir="${libdir}"          \
> +        libexecdir="${libexecdir}"  \
> +        includedir=${includedir}    \
> +        mandir=${mandir}
> +
> +        rm -f ${D}${libdir}/*.a
> +}
> +
> +FILES_${PN} = "${libdir}/*.so.*"
> +FILES_${PN} += "${libexecdir}/utempter/utempter"
> +
> +FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter"
> -- 
> 1.8.3.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [meta-oe][PATCH] libutempter: Fix compile error on arm
  2015-01-07 11:53 ` Martin Jansa
@ 2015-01-08  9:25   ` Qian Lei
  2015-01-08 11:17     ` Martin Jansa
  0 siblings, 1 reply; 5+ messages in thread
From: Qian Lei @ 2015-01-08  9:25 UTC (permalink / raw)
  To: openembedded-devel

| iface.c: In function 'utempter_add_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
 .../libutempter/0001-Modify-macro.patch            | 28 ++++++++++++++++++++++
 .../libutempter/libutempter-pierelro.patch         | 23 ++++++++++++++++++
 .../libutempter/libutempter_1.1.6.bb               | 11 ++++-----
 3 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
 create mode 100644 meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch

diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
new file mode 100644
index 0000000..b5c518f
--- /dev/null
+++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
@@ -0,0 +1,28 @@
+From fe0721e3f533b54ed2f916365c0458aa2069c924 Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst@cn.fujitsu.com>
+Date: Thu, 8 Jan 2015 16:34:09 +0900
+Subject: [PATCH] Remove macro and use hardcode.
+
+Upstream-Status: Pending
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+
+---
+ iface.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iface.c b/iface.c
+index 5951d81..928ebfd 100644
+--- a/iface.c
++++ b/iface.c
+@@ -43,7 +43,7 @@
+        __result; }))
+ #endif
+ 
+-#define	UTEMPTER_DEFAULT_PATHNAME	LIBEXECDIR "/utempter/utempter"
++#define	UTEMPTER_DEFAULT_PATHNAME	"/usr/lib/libutempter/utempter/utempter"
+ 
+ static const char *utempter_pathname;
+ static int saved_fd = -1;
+-- 
+1.8.4.2
+
diff --git a/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch b/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch
new file mode 100644
index 0000000..c30a92d
--- /dev/null
+++ b/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch
@@ -0,0 +1,23 @@
+Port from fedora20
+
+Upstream-Status: Pending
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+
+diff -up libutempter-1.1.6/Makefile.pierelro libutempter-1.1.6/Makefile
+--- libutempter-1.1.6/Makefile.pierelro	2010-11-04 18:14:53.000000000 +0100
++++ libutempter-1.1.6/Makefile	2013-01-24 15:58:06.241865564 +0100
+@@ -52,11 +52,12 @@ all: $(TARGETS)
+ 	$(COMPILE.c) -fPIC $< $(OUTPUT_OPTION)
+ 
+ $(PROJECT): utempter.c
+-	$(LINK.c) -Wl,-z,now,-stats $(LDLIBS) $< $(OUTPUT_OPTION)
++	$(LINK.c) -pie -fPIE -Wl,-z,relro,-z,now,-stats $(LDLIBS) \
++		$< $(OUTPUT_OPTION)
+ 
+ $(SHAREDLIB): iface.os $(MAP)
+ 	$(LINK.o) -shared \
+-		-Wl,-soname,$(SONAME),--version-script=$(MAP),-z,defs,-stats \
++		-Wl,-soname,$(SONAME),--version-script=$(MAP),-z,relro,-z,defs,-stats \
+ 		-lc $< $(OUTPUT_OPTION)
+ 
+ $(STATICLIB): iface.o
diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
index e1dccd6..6df0f19 100644
--- a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
+++ b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
@@ -4,15 +4,15 @@ This library provides interface for terminal emulators such as \
 screen and xterm to record user sessions to utmp and wtmp files."
 HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter"
 SECTION = "System Environment/Libraries"
-LICENSE = "GPLv2 GPLv2+ LGPLv2 MIT"
+LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2"
+SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2 \
+           file://0001-Modify-macro.patch \
+           file://libutempter-pierelro.patch"
 SRC_URI[md5sum] = "b43827806923903aba2bc7cd3a2d45b7"
 SRC_URI[sha256sum] = "b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397"
 
-CFLAGS += "-DLIBEXECDIR=$(libexecdir)"
-
 do_compile() {
     oe_runmake                      \
         libdir=${libdir}            \
@@ -27,10 +27,9 @@ do_install() {
         includedir=${includedir}    \
         mandir=${mandir}
 
-        rm -f ${D}${libdir}/*.a
+    rm -f ${D}${libdir}/*.a
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN} += "${libexecdir}/utempter/utempter"
-
 FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter"
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [meta-oe][PATCH] libutempter: Fix compile error on arm
  2015-01-08  9:25   ` [meta-oe][PATCH] libutempter: Fix compile error on arm Qian Lei
@ 2015-01-08 11:17     ` Martin Jansa
  2015-01-09  3:01       ` [meta-oe][PATCH v2] libutempter: Fix compile error Qian Lei
  0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2015-01-08 11:17 UTC (permalink / raw)
  To: openembedded-devel

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

On Thu, Jan 08, 2015 at 05:25:47PM +0800, Qian Lei wrote:
> | iface.c: In function 'utempter_add_record':
> | <command-line>:0:12: error: expected expression before '/' token
> | iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
> |  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"

The issue exists on all architectures so drop "on arm"

> Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> ---
>  .../libutempter/0001-Modify-macro.patch            | 28 ++++++++++++++++++++++
>  .../libutempter/libutempter-pierelro.patch         | 23 ++++++++++++++++++
>  .../libutempter/libutempter_1.1.6.bb               | 11 ++++-----
>  3 files changed, 56 insertions(+), 6 deletions(-)
>  create mode 100644 meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
>  create mode 100644 meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch
> 
> diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
> new file mode 100644
> index 0000000..b5c518f
> --- /dev/null
> +++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Modify-macro.patch
> @@ -0,0 +1,28 @@
> +From fe0721e3f533b54ed2f916365c0458aa2069c924 Mon Sep 17 00:00:00 2001
> +From: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +Date: Thu, 8 Jan 2015 16:34:09 +0900
> +Subject: [PATCH] Remove macro and use hardcode.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +
> +---
> + iface.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/iface.c b/iface.c
> +index 5951d81..928ebfd 100644
> +--- a/iface.c
> ++++ b/iface.c
> +@@ -43,7 +43,7 @@
> +        __result; }))
> + #endif
> + 
> +-#define	UTEMPTER_DEFAULT_PATHNAME	LIBEXECDIR "/utempter/utempter"
> ++#define	UTEMPTER_DEFAULT_PATHNAME	"/usr/lib/libutempter/utempter/utempter"

This hardcodes /usr/lib which won't work for people with different
layout.

> + static const char *utempter_pathname;
> + static int saved_fd = -1;
> +-- 
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch b/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch
> new file mode 100644
> index 0000000..c30a92d
> --- /dev/null
> +++ b/meta-oe/recipes-support/libutempter/libutempter/libutempter-pierelro.patch
> @@ -0,0 +1,23 @@
> +Port from fedora20
> +
> +Upstream-Status: Pending
> +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +
> +diff -up libutempter-1.1.6/Makefile.pierelro libutempter-1.1.6/Makefile
> +--- libutempter-1.1.6/Makefile.pierelro	2010-11-04 18:14:53.000000000 +0100
> ++++ libutempter-1.1.6/Makefile	2013-01-24 15:58:06.241865564 +0100
> +@@ -52,11 +52,12 @@ all: $(TARGETS)
> + 	$(COMPILE.c) -fPIC $< $(OUTPUT_OPTION)
> + 
> + $(PROJECT): utempter.c
> +-	$(LINK.c) -Wl,-z,now,-stats $(LDLIBS) $< $(OUTPUT_OPTION)
> ++	$(LINK.c) -pie -fPIE -Wl,-z,relro,-z,now,-stats $(LDLIBS) \
> ++		$< $(OUTPUT_OPTION)
> + 
> + $(SHAREDLIB): iface.os $(MAP)
> + 	$(LINK.o) -shared \
> +-		-Wl,-soname,$(SONAME),--version-script=$(MAP),-z,defs,-stats \
> ++		-Wl,-soname,$(SONAME),--version-script=$(MAP),-z,relro,-z,defs,-stats \
> + 		-lc $< $(OUTPUT_OPTION)
> + 
> + $(STATICLIB): iface.o
> diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> index e1dccd6..6df0f19 100644
> --- a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> +++ b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
> @@ -4,15 +4,15 @@ This library provides interface for terminal emulators such as \
>  screen and xterm to record user sessions to utmp and wtmp files."
>  HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter"
>  SECTION = "System Environment/Libraries"
> -LICENSE = "GPLv2 GPLv2+ LGPLv2 MIT"
> +LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT"

This was already applied in master a while ago with:

commit ba3105e6055cce009e6f54c01885768ef72d81c5
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Fri Dec 26 17:21:34 2014 -0200

    libutempter: Fix license format QA error


>  LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
>  
> -SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2"
> +SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2 \
> +           file://0001-Modify-macro.patch \
> +           file://libutempter-pierelro.patch"
>  SRC_URI[md5sum] = "b43827806923903aba2bc7cd3a2d45b7"
>  SRC_URI[sha256sum] = "b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397"
>  
> -CFLAGS += "-DLIBEXECDIR=$(libexecdir)"
> -
>  do_compile() {
>      oe_runmake                      \
>          libdir=${libdir}            \
> @@ -27,10 +27,9 @@ do_install() {
>          includedir=${includedir}    \
>          mandir=${mandir}
>  
> -        rm -f ${D}${libdir}/*.a
> +    rm -f ${D}${libdir}/*.a
>  }
>  
>  FILES_${PN} = "${libdir}/*.so.*"
>  FILES_${PN} += "${libexecdir}/utempter/utempter"
> -
>  FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter"
> -- 
> 1.8.3.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [meta-oe][PATCH v2] libutempter: Fix compile error
  2015-01-08 11:17     ` Martin Jansa
@ 2015-01-09  3:01       ` Qian Lei
  0 siblings, 0 replies; 5+ messages in thread
From: Qian Lei @ 2015-01-09  3:01 UTC (permalink / raw)
  To: openembedded-devel

| iface.c: In function 'utempter_add_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
|  #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
 .../libutempter/0001-Fix-macro-error.patch         | 36 ++++++++++++++++++++++
 .../libutempter/libutempter_1.1.6.bb               | 10 +++---
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch

diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch
new file mode 100644
index 0000000..8140ea3
--- /dev/null
+++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch
@@ -0,0 +1,36 @@
+From fc2bd592ad17d1c2a2a989750e69dfaedc28c633 Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst@cn.fujitsu.com>
+Date: Fri, 9 Jan 2015 10:40:29 +0800
+Subject: [PATCH] Fix macro error
+
+compile error when build on almost all architectures.
+
+Upstream-Status: Pending
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+---
+ iface.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/iface.c b/iface.c
+index 5951d81..27793f0 100644
+--- a/iface.c
++++ b/iface.c
+@@ -43,7 +43,14 @@
+        __result; }))
+ #endif
+ 
+-#define	UTEMPTER_DEFAULT_PATHNAME	LIBEXECDIR "/utempter/utempter"
++#ifdef  LIBEXECDIR
++#  define CAT_PATH(DIR1,DIR2)           DIR1##DIR2
++#  define RAW_UTEMPTER_PATH             CAT_PATH(LIBEXECDIR,/utempter/utempter)
++#else
++#  define RAW_UTEMPTER_PATH             /usr/lib/libtempter/utempter/utempter
++#endif
++#define STR_PATH(RAW_STR)               #RAW_STR
++#define UTEMPTER_DEFAULT_PATHNAME       STR_PATH(RAW_UTEMPTER_PATH)
+ 
+ static const char *utempter_pathname;
+ static int saved_fd = -1;
+-- 
+1.8.3.1
+
diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
index 30a6896..f84e649 100644
--- a/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
+++ b/meta-oe/recipes-support/libutempter/libutempter_1.1.6.bb
@@ -7,16 +7,17 @@ SECTION = "System Environment/Libraries"
 LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2"
+SRC_URI = "ftp://ftp.altlinux.org/pub/people/ldv/utempter/${BP}.tar.bz2 \
+           file://0001-Fix-macro-error.patch"
 SRC_URI[md5sum] = "b43827806923903aba2bc7cd3a2d45b7"
 SRC_URI[sha256sum] = "b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397"
 
-CFLAGS += "-DLIBEXECDIR=$(libexecdir)"
+CFLAGS += "-DLIBEXECDIR=${libexecdir}"
 
 do_compile() {
     oe_runmake                      \
         libdir=${libdir}            \
-        libexecdir=${libexecdir}    \
+        libexecdir=${libexecdir}
 }
 
 do_install() {
@@ -27,10 +28,9 @@ do_install() {
         includedir=${includedir}    \
         mandir=${mandir}
 
-        rm -f ${D}${libdir}/*.a
+    rm -f ${D}${libdir}/*.a
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN} += "${libexecdir}/utempter/utempter"
-
 FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter"
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-01-09  3:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-04  2:13 [meta-oe][PATCH] libutempter: Add new recipe Qian Lei
2015-01-07 11:53 ` Martin Jansa
2015-01-08  9:25   ` [meta-oe][PATCH] libutempter: Fix compile error on arm Qian Lei
2015-01-08 11:17     ` Martin Jansa
2015-01-09  3:01       ` [meta-oe][PATCH v2] libutempter: Fix compile error Qian Lei

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox