[meta-oe][PATCH] system-setup-keyboard: add new recipe

[meta-oe][PATCH] system-setup-keyboard: add new recipe

[Li xin]

system-setup-keyboard is a daemon to monitor the keyboard layout
configured in /etc/sysconfig/keyboard and transfer this into
the matching xorg.conf.d snippet.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 ...modify-path-of-python-and-add-v-parameter.patch | 30 ++++++++++++++++++++++
 .../system-setup-keyboard_0.8.8.bb                 | 26 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
 create mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb

diff --git a/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch b/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
new file mode 100644
index 0000000..4b56935
--- /dev/null
+++ b/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
@@ -0,0 +1,30 @@
+From 3d2bbd78e5583ef4290b3a64e4ecc19bebd4a698 Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst@cn.fujitsu.com>
+Date: Tue, 11 Nov 2014 14:20:29 +0900
+Subject: [PATCH] modify path of python and add -v parameter
+
+fix error: ImportError: No module named system_config_keyboard.keyboard_models
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 55c5b60..c528f36 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@ MAN_SECTION=1
+ all: system-setup-keyboard
+ 
+ keyboards.h:
+-	python get_layouts.py > keyboards.h
++	/usr/bin/python -v get_layouts.py > keyboards.h
+ 
+ system-setup-keyboard: keyboards.h system-setup-keyboard.c
+ 	$(CC) system-setup-keyboard.c `pkg-config --cflags --libs glib-2.0` $(CFLAGS) -o system-setup-keyboard
+-- 
+1.8.4.2
+
diff --git a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
new file mode 100644
index 0000000..3b34167
--- /dev/null
+++ b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
@@ -0,0 +1,26 @@
+SUMMARY = "xorg.conf keyboard layout callout"
+DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard layout configured in\
+/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d snippet."
+
+HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git"
+SECTION = "Applications/System"
+
+SRC_URI = " \
+    https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz \
+    file://0001-modify-path-of-python-and-add-v-parameter.patch \
+"
+SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0"
+SRC_URI[sha256sum] = "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2"
+
+DEPENDS = "glib-2.0"
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+    install -d ${D}/etc/X11/xorg.conf.d
+    touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf
+}
+
+FILES_${PN} += "${systemd_unitdir}/system/${PN}.service"
-- 
1.8.4.2

Re: [meta-oe][PATCH] system-setup-keyboard: add new recipe

[Martin Jansa]

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

On Fri, Dec 12, 2014 at 05:31:35PM +0800, Li xin wrote:
> system-setup-keyboard is a daemon to monitor the keyboard layout
> configured in /etc/sysconfig/keyboard and transfer this into
> the matching xorg.conf.d snippet.

Fails to build in world:
| # /usr/lib/python2.7/encodings/ascii.pyc matches
/usr/lib/python2.7/encodings/ascii.py
| import encodings.ascii # precompiled from
/usr/lib/python2.7/encodings/ascii.pyc
| Python 2.7.3 (default, Feb 27 2014, 19:58:35)
| [GCC 4.6.3] on linux2
| Type "help", "copyright", "credits" or "license" for more information.
| Traceback (most recent call last):
|   File "get_layouts.py", line 28, in <module>
|     import system_config_keyboard.keyboard_models
| ImportError: No module named system_config_keyboard.keyboard_models

| make: *** [keyboards.h] Error 1
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.


> 
> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> ---
>  ...modify-path-of-python-and-add-v-parameter.patch | 30 ++++++++++++++++++++++
>  .../system-setup-keyboard_0.8.8.bb                 | 26 +++++++++++++++++++
>  2 files changed, 56 insertions(+)
>  create mode 100644 meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
>  create mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
> 
> diff --git a/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch b/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
> new file mode 100644
> index 0000000..4b56935
> --- /dev/null
> +++ b/meta-oe/recipes-support/system-setup-keyboard/files/0001-modify-path-of-python-and-add-v-parameter.patch
> @@ -0,0 +1,30 @@
> +From 3d2bbd78e5583ef4290b3a64e4ecc19bebd4a698 Mon Sep 17 00:00:00 2001
> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> +Date: Tue, 11 Nov 2014 14:20:29 +0900
> +Subject: [PATCH] modify path of python and add -v parameter
> +
> +fix error: ImportError: No module named system_config_keyboard.keyboard_models
> +
> +Upstream-Status: pending
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 55c5b60..c528f36 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -5,7 +5,7 @@ MAN_SECTION=1
> + all: system-setup-keyboard
> + 
> + keyboards.h:
> +-	python get_layouts.py > keyboards.h
> ++	/usr/bin/python -v get_layouts.py > keyboards.h
> + 
> + system-setup-keyboard: keyboards.h system-setup-keyboard.c
> + 	$(CC) system-setup-keyboard.c `pkg-config --cflags --libs glib-2.0` $(CFLAGS) -o system-setup-keyboard
> +-- 
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
> new file mode 100644
> index 0000000..3b34167
> --- /dev/null
> +++ b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
> @@ -0,0 +1,26 @@
> +SUMMARY = "xorg.conf keyboard layout callout"
> +DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard layout configured in\
> +/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d snippet."
> +
> +HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git"
> +SECTION = "Applications/System"
> +
> +SRC_URI = " \
> +    https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz \
> +    file://0001-modify-path-of-python-and-add-v-parameter.patch \
> +"
> +SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0"
> +SRC_URI[sha256sum] = "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860"
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2"
> +
> +DEPENDS = "glib-2.0"
> +
> +do_install() {
> +    oe_runmake install DESTDIR=${D}
> +    install -d ${D}/etc/X11/xorg.conf.d
> +    touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf
> +}
> +
> +FILES_${PN} += "${systemd_unitdir}/system/${PN}.service"
> -- 
> 1.8.4.2
> 
> -- 
> _______________________________________________
> 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 --]

[meta-oe][patch v2][PATCH 0/2] system-setup-keyboard: add new recipe

[Li xin]

this patch add system-setup-keyboard to meta-oe and also add it's depends
system-config-keyboard.

Li xin (2):
  system-config-keyboard: add new recipe
  system-setup-keyboard: add new recipe

 .../system-config-keyboard_1.4.0.bb                | 27 ++++++++++++++++++++++
 .../system-setup-keyboard_0.8.8.bb                 | 27 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
 create mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb

-- 
1.8.4.2

[meta-oe][PATCH 1/2] system-config-keyboard: add new recipe

[Li xin]

a graphical user interface that allows the user to
change the default keyboard of the system.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 .../system-config-keyboard_1.4.0.bb                | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb

diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
new file mode 100644
index 0000000..eaca96d
--- /dev/null
+++ b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "a graphical user interface that allows the user to \
+change the default keyboard of the system"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2"
+SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72"
+SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284"
+inherit python-dir
+DEPENDS = "intltool"
+
+EXTRA_OEMAKE = " \
+    PYTHON='${STAGING_BINDIR_NATIVE}'/python-native/python \
+    PYTHON_SITELIB=${PYTHON_SITEPACKAGES_DIR} \
+"
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+do_install_append_class-native() {
+    rm -rf ${D}/usr
+}
+
+FILES_${PN} += " \
+   ${libdir}/python${PYTHON_BASEVERSION}/* \
+   ${datadir}/* \
+"
+BBCLASSEXTEND = "native"
-- 
1.8.4.2

[meta-oe][PATCH 2/2] system-setup-keyboard: add new recipe

[Li xin]

system-setup-keyboard is a daemon to monitor the keyboard layout
configured in /etc/sysconfig/keyboard and transfer this into
the matching xorg.conf.d snippet.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 .../system-setup-keyboard_0.8.8.bb                 | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb

diff --git a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
new file mode 100644
index 0000000..ca71f63
--- /dev/null
+++ b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
@@ -0,0 +1,27 @@
+SUMMARY = "xorg.conf keyboard layout callout"
+DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard layout configured in \
+/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d snippet."
+
+HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git"
+SECTION = "Applications/System"
+
+SRC_URI = "https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz"
+SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0"
+SRC_URI[sha256sum] = "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2"
+
+DEPENDS = "glib-2.0 python-native system-config-keyboard-native"
+
+do_compile() {
+    ${STAGING_BINDIR_NATIVE}/python-native/python -v get_layouts.py > keyboards.h
+    oe_runmake
+}
+do_install() {
+    oe_runmake install DESTDIR=${D}
+    install -d ${D}/etc/X11/xorg.conf.d
+    touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf
+}
+
+FILES_${PN} += "${systemd_unitdir}/system/${PN}.service"
-- 
1.8.4.2

Re: [meta-oe][PATCH 2/2] system-setup-keyboard: add new recipe

[Martin Jansa]

I think you should just inherit python-native

On Tue, Jan 20, 2015 at 9:02 AM, Li xin <lixin.fnst@cn.fujitsu.com> wrote:

> system-setup-keyboard is a daemon to monitor the keyboard layout
> configured in /etc/sysconfig/keyboard and transfer this into
> the matching xorg.conf.d snippet.
>
> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> ---
>  .../system-setup-keyboard_0.8.8.bb                 | 27
> ++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>  create mode 100644 meta-oe/recipes-support/system-setup-keyboard/
> system-setup-keyboard_0.8.8.bb
>
> diff --git a/meta-oe/recipes-support/system-setup-keyboard/
> system-setup-keyboard_0.8.8.bb
> b/meta-oe/recipes-support/system-setup-keyboard/
> system-setup-keyboard_0.8.8.bb
> new file mode 100644
> index 0000000..ca71f63
> --- /dev/null
> +++ b/meta-oe/recipes-support/system-setup-keyboard/
> system-setup-keyboard_0.8.8.bb
> @@ -0,0 +1,27 @@
> +SUMMARY = "xorg.conf keyboard layout callout"
> +DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard
> layout configured in \
> +/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d
> snippet."
> +
> +HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git"
> +SECTION = "Applications/System"
> +
> +SRC_URI = "
> https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz"
> +SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0"
> +SRC_URI[sha256sum] =
> "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860"
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2"
> +
> +DEPENDS = "glib-2.0 python-native system-config-keyboard-native"
> +
> +do_compile() {
> +    ${STAGING_BINDIR_NATIVE}/python-native/python -v get_layouts.py >
> keyboards.h
> +    oe_runmake
> +}
> +do_install() {
> +    oe_runmake install DESTDIR=${D}
> +    install -d ${D}/etc/X11/xorg.conf.d
> +    touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf
> +}
> +
> +FILES_${PN} += "${systemd_unitdir}/system/${PN}.service"
> --
> 1.8.4.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

[meta-oe][PATCH v3] system-setup-keyboard: add new recipe

[Li xin]

system-setup-keyboard is a daemon to monitor the keyboard layout
configured in /etc/sysconfig/keyboard and transfer this into the
matching xorg.conf.d snippet.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 .../system-setup-keyboard_0.8.8.bb                 | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb

diff --git a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
new file mode 100644
index 0000000..8a80e11
--- /dev/null
+++ b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb
@@ -0,0 +1,29 @@
+SUMMARY = "xorg.conf keyboard layout callout"
+DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard layout configured in \
+/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d snippet."
+
+HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git"
+SECTION = "Applications/System"
+
+SRC_URI = "https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz"
+SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0"
+SRC_URI[sha256sum] = "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2"
+
+inherit pythonnative
+
+DEPENDS = "glib-2.0 system-config-keyboard-native"
+
+do_compile_prepend() {
+    ${PYTHON} -v get_layouts.py > keyboards.h
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+    install -d ${D}/etc/X11/xorg.conf.d
+    touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf
+}
+
+FILES_${PN} += "${systemd_unitdir}/system/${PN}.service"
-- 
1.8.4.2