aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2015-12-08 06:49:44 +0300
committerArmin Kuster <akuster808@gmail.com>2015-12-20 14:17:57 -0800
commitcc33b97f152607f989c258384216c93cb3cf4822 (patch)
treea223b0c33ff152671713992d10b0b5ca78838f11
parentc5b295aa9b2ce5d8f3f39d27dac4b0a9c608a5c2 (diff)
downloadmeta-openembedded-contrib-cc33b97f152607f989c258384216c93cb3cf4822.tar.gz
sessreg: add a patch to avoid build errors.
Do not build man dir since it is always build failed. This is not a good way,but can remove sessreg form PNBLACKLIST. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch33
-rw-r--r--meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb7
2 files changed, 34 insertions, 6 deletions
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
new file mode 100644
index 0000000000..207285373c
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
@@ -0,0 +1,33 @@
+From 088bb4cef2c93bef312b076a8c7a3c798cbf2f19 Mon Sep 17 00:00:00 2001
+From: daicy <daicy@cn.fujitsu.com>
+Date: Tue, 8 Dec 2015 11:45:01 +0900
+Subject: [PATCH] Makefile.am: Error Fix
+
+Do not compile man dir since error always occur.
+ | sed: file filenames.sed line 3: unterminated `s' command
+ | make[2]: *** [sessreg.1] Error 1
+It is not a good way.But can remove it from PNBLACKLIST.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cddffd0..94f7048 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+
+-SUBDIRS = man
++#SUBDIRS = man
+ bin_PROGRAMS = sessreg
+
+ AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS)
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb
index 2ae25b324a..2e25b7d91b 100644
--- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb
+++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb
@@ -3,11 +3,6 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
SUMMARY = "a simple program for managing utmp/wtmp entries"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185"
-
+SRC_URI += "file://0001-Makefile.am-Error-Fix.patch"
SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9"
SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c"
-
-# | sed: file filenames.sed line 3: unterminated `s' command
-# | make[2]: *** [sessreg.1] Error 1
-# | make[2]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sessreg/1.1.0-r0/build/man'
-PNBLACKLIST[sessreg] ?= "BROKEN: fails to generate man pages"