diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch')
-rw-r--r-- | external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch | 93 |
1 files changed, 68 insertions, 25 deletions
diff --git a/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch index a9a3ab8a..4b1e5b8e 100644 --- a/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch +++ b/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch @@ -1,3 +1,8 @@ +From cb3af8fb072f8999dbb5160bdc95a102b02fd37a Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Fri, 30 Sep 2016 16:49:55 +0800 +Subject: [PATCH] kbd: create ptest sub-package + Upstream-Status: Inappropriate [embedded specific] kbd is out of source built, then the value of $(srcdir) is relative path of @@ -13,38 +18,61 @@ run as expected. Signed-off-by: Kai Kang <kai.kang@windriver.com> -Index: kbd-2.0.4/tests/Makefile.am -=================================================================== ---- kbd-2.0.4.orig/tests/Makefile.am -+++ kbd-2.0.4/tests/Makefile.am -@@ -1,7 +1,7 @@ - AM_CPPFLAGS = \ - -I$(srcdir)/../src/libkeymap \ +--- + tests/Makefile.am | 4 ++-- + tests/alt-is-meta.in | 2 +- + tests/dumpkeys-bkeymap.in | 4 ++-- + tests/dumpkeys-fulltable.in | 2 +- + tests/dumpkeys-mktable.in | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8d0ab69..5147c28 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -7,8 +7,8 @@ AM_CPPFLAGS = \ -I$(builddir)/../src/libkeymap \ -- -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" -+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" - - AM_CFLAGS = $(CHECK_CFLAGS) - LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ -Index: kbd-2.0.4/tests/alt-is-meta.in -=================================================================== ---- kbd-2.0.4.orig/tests/alt-is-meta.in -+++ kbd-2.0.4/tests/alt-is-meta.in -@@ -7,8 +7,8 @@ cd "$cwd" + -I$(srcdir)/../src/libkbdfile \ + -I$(builddir)/../src/libkbdfile \ +- -DDATADIR=\"$(srcdir)\" \ +- -DABS_DATADIR=\"$(realpath $(srcdir))\" \ ++ -DDATADIR=\".\" \ ++ -DABS_DATADIR=\"/usr/lib/kbd/ptest/tests\" \ + -DBUILDDIR=\"$(builddir)\" + + AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS) +diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in +index 3a1441f..d829f2e 100755 +--- a/tests/alt-is-meta.in ++++ b/tests/alt-is-meta.in +@@ -7,7 +7,7 @@ cd "$cwd" rc=0 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" --./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$? --cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$? -+./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$? -+cmp -s "./alt-is-meta.output" "$temp" || rc=$? +-datadir="@DATADIR@/data/alt-is-meta" ++datadir="./data/alt-is-meta" + + ./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$? + cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$? +diff --git a/tests/dumpkeys-bkeymap.in b/tests/dumpkeys-bkeymap.in +index 03d4ca2..d1d0e26 100755 +--- a/tests/dumpkeys-bkeymap.in ++++ b/tests/dumpkeys-bkeymap.in +@@ -9,8 +9,8 @@ temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" + + datadir="@DATADIR@" + +-./libkeymap-bkeymap "$datadir/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? +-cmp -s "$datadir/data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$? ++./libkeymap-bkeymap ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? ++cmp -s "./data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$? if [ "$rc" != 0 ]; then printf 'failed\n' -Index: kbd-2.0.4/tests/dumpkeys-fulltable.in -=================================================================== ---- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in -+++ kbd-2.0.4/tests/dumpkeys-fulltable.in +diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in +index a3a5ece..67a73ef 100755 +--- a/tests/dumpkeys-fulltable.in ++++ b/tests/dumpkeys-fulltable.in @@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" cd "$cwd" @@ -54,3 +82,18 @@ Index: kbd-2.0.4/tests/dumpkeys-fulltable.in check_keymap() { local kmap temp rc +diff --git a/tests/dumpkeys-mktable.in b/tests/dumpkeys-mktable.in +index 0f17c40..7e5161d 100755 +--- a/tests/dumpkeys-mktable.in ++++ b/tests/dumpkeys-mktable.in +@@ -7,8 +7,8 @@ cd "$cwd" + rc=0 + temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" + +-./libkeymap-mktable "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? +-cmp -s "@DATADIR@/data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$? ++./libkeymap-mktable ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? ++cmp -s "./data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$? + + if [ "$rc" != 0 ]; then + printf 'failed\n' |