diff options
| author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-12-08 06:49:44 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:36:56 +0100 |
| commit | ea518c9648d796829865fd68ccfbaa3261adaf02 (patch) | |
| tree | 9bc0b49170ab8c9804e952048d4fe943538ab479 | |
| parent | 09782f3a8a4cfe68d686f16b33c328931c8d7976 (diff) | |
| download | meta-openembedded-ea518c9648d796829865fd68ccfbaa3261adaf02.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>
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb | 7 |
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 @@ | |||
| 1 | From 088bb4cef2c93bef312b076a8c7a3c798cbf2f19 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: daicy <daicy@cn.fujitsu.com> | ||
| 3 | Date: Tue, 8 Dec 2015 11:45:01 +0900 | ||
| 4 | Subject: [PATCH] Makefile.am: Error Fix | ||
| 5 | |||
| 6 | Do not compile man dir since error always occur. | ||
| 7 | | sed: file filenames.sed line 3: unterminated `s' command | ||
| 8 | | make[2]: *** [sessreg.1] Error 1 | ||
| 9 | It is not a good way.But can remove it from PNBLACKLIST. | ||
| 10 | |||
| 11 | Upstream-Status: pending | ||
| 12 | |||
| 13 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
| 14 | --- | ||
| 15 | Makefile.am | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/Makefile.am b/Makefile.am | ||
| 19 | index cddffd0..94f7048 100644 | ||
| 20 | --- a/Makefile.am | ||
| 21 | +++ b/Makefile.am | ||
| 22 | @@ -18,7 +18,7 @@ | ||
| 23 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| 24 | # PERFORMANCE OF THIS SOFTWARE. | ||
| 25 | |||
| 26 | -SUBDIRS = man | ||
| 27 | +#SUBDIRS = man | ||
| 28 | bin_PROGRAMS = sessreg | ||
| 29 | |||
| 30 | AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) | ||
| 31 | -- | ||
| 32 | 1.8.4.2 | ||
| 33 | |||
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 | |||
| 3 | SUMMARY = "a simple program for managing utmp/wtmp entries" | 3 | SUMMARY = "a simple program for managing utmp/wtmp entries" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" |
| 6 | 6 | SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" | |
| 7 | SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" | 7 | SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" |
| 8 | SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" | 8 | SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" |
| 9 | |||
| 10 | # | sed: file filenames.sed line 3: unterminated `s' command | ||
| 11 | # | make[2]: *** [sessreg.1] Error 1 | ||
| 12 | # | make[2]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sessreg/1.1.0-r0/build/man' | ||
| 13 | PNBLACKLIST[sessreg] ?= "BROKEN: fails to generate man pages" | ||
