[meta-oe][PATCH 0/4] Small changes 20120328

[meta-oe][PATCH 0/4] Small changes 20120328

[Martin Jansa]

The following changes since commit faf10fc6f3651b687ded55b660ae62520e105512:

  xbmc: update from rc2 to final release (2012-03-26 15:05:47 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull2
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull2

Martin Jansa (4):
  linux-kexecboot-3.2: upgrade to 3.2.12
  keymaps: import systemd support from meta-shr layer
  kernel.bbclass: touch .scmversion also in ${S}
  xinput-calibrator: add systemd service

 .../recipes-kernel/linux/linux-kexecboot_3.2.bb    |    8 ++++----
 meta-oe/classes/kernel.bbclass                     |    2 +-
 .../recipes-bsp/keymaps/keymaps/keymaps.service    |    9 +++++++++
 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend   |    8 ++++++++
 .../xinput-calibrator/xinput-calibrator.service    |   11 +++++++++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   11 ++++++++---
 6 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
 create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service

-- 
1.7.8.5

[meta-oe][PATCH 1/4] linux-kexecboot-3.2: upgrade to 3.2.12

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-kernel/linux/linux-kexecboot_3.2.bb    |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb b/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
index 5492183..8cb19aa 100644
--- a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
+++ b/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
@@ -1,13 +1,13 @@
 require linux-kexecboot.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 S = "${WORKDIR}/linux-${PV}"
 
 SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.9.bz2;apply=yes;name=stablepatch \
+           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.12.bz2;apply=yes;name=stablepatch \
            "
 
 SRC_URI[kernel.md5sum] = "7ceb61f87c097fc17509844b71268935"
 SRC_URI[kernel.sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
-SRC_URI[stablepatch.md5sum] = "4610f3e62a5446422d1e81a90ab3cd06"
-SRC_URI[stablepatch.sha256sum] = "7836685dee161a4ffaf887b8e2f8dd3cb7712e690d0942fefb1db09bb6ad3871"
+SRC_URI[stablepatch.md5sum] = "377a6d731cd246aaa0c0f6a432b7aece"
+SRC_URI[stablepatch.sha256sum] = "c6991964901ef7797cca09ff9d1b4ed7abda27e2796ad55cad09a266eaaebb5d"
-- 
1.7.8.5

[meta-oe][PATCH 2/4] keymaps: import systemd support from meta-shr layer

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-bsp/keymaps/keymaps/keymaps.service    |    9 +++++++++
 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend   |    8 ++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend

diff --git a/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
new file mode 100644
index 0000000..414ad0c
--- /dev/null
+++ b/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Loads custom keymap if available
+ConditionPathExists=/etc/keymap-2.6.map
+
+[Service]
+ExecStart=/usr/bin/loadkeys /etc/keymap-2.6.map
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
new file mode 100644
index 0000000..b144e9f
--- /dev/null
+++ b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PRINC := "${@int(PRINC) + 4}"
+
+SRC_URI += " file://keymaps.service"
+
+inherit systemd
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
-- 
1.7.8.5

[meta-oe][PATCH 3/4] kernel.bbclass: touch .scmversion also in ${S}

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 9ce2f44..578a02f 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -212,7 +212,7 @@ kernel_do_configure() {
 	# $ scripts/setlocalversion . => +
 	# $ make kernelversion => 2.6.37
 	# $ make kernelrelease => 2.6.37+
-	touch ${B}/.scmversion
+	touch ${B}/.scmversion ${S}/.scmversion
 
 	# Copy defconfig to .config if .config does not exist. This allows
 	# recipes to manage the .config themselves in do_configure_prepend().
-- 
1.7.8.5

[meta-oe][PATCH 4/4] xinput-calibrator: add systemd service

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xinput-calibrator/xinput-calibrator.service    |   11 +++++++++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   11 ++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service

diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
new file mode 100644
index 0000000..e23bfc4
--- /dev/null
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Loads xinput calibration data
+ConditionPathExists=/etc/pointercal.xinput
+Requires=xserver-nodm.service
+After=xserver-nodm.service
+
+[Service]
+ExecStart=/usr/bin/xinput_calibrator_once.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index e39cc44..d823e0e 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,12 +4,14 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
 DEPENDS = "virtual/libx11 libxi"
 
-PR = "r3"
+PR = "r4"
 
-inherit autotools
+inherit autotools systemd
 
 SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
-           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch"
+           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch \
+           file://xinput-calibrator.service \
+"
 SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
 SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
 
@@ -23,5 +25,8 @@ do_install_append() {
         install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
 }
 
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
+
 RDEPENDS_${PN} = "xinput"
 RRECOMMENDS_${PN} = "pointercal-xinput"
-- 
1.7.8.5

[meta-oe][PATCH 0/6] Small changes 20120328 - 2 more patches

[Martin Jansa]

Added 2 more patches for kernel.bbclass, first 4 are the same - not resent

The following changes since commit faf10fc6f3651b687ded55b660ae62520e105512:

  xbmc: update from rc2 to final release (2012-03-26 15:05:47 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull2
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull2

Martin Jansa (5):
  linux-kexecboot-3.2: upgrade to 3.2.12
  keymaps: import systemd support from meta-shr layer
  kernel.bbclass: touch .scmversion also in ${S}
  xinput-calibrator: add systemd service
  kernel.bbclass: unify white spaces

Richard Purdie (1):
  kernel.bbclass: Allow do_compile_kernelmodules to use PARALLEL_MAKE

 .../recipes-kernel/linux/linux-kexecboot_3.2.bb    |    8 +-
 meta-oe/classes/kernel.bbclass                     |   80 ++++++++++----------
 .../recipes-bsp/keymaps/keymaps/keymaps.service    |    9 ++
 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend   |    8 ++
 .../xinput-calibrator/xinput-calibrator.service    |   11 +++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |   11 ++-
 6 files changed, 80 insertions(+), 47 deletions(-)
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
 create mode 100644 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
 create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service

-- 
1.7.8.5

[meta-oe][PATCH 5/6] kernel.bbclass: Allow do_compile_kernelmodules to use PARALLEL_MAKE

[Martin Jansa]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Without this we don't take advantage of any configured multiple CPU
cores which seems a shame.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 578a02f..1ef8e2a 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -96,7 +96,7 @@ kernel_do_compile() {
 do_compile_kernelmodules() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+		oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	else
 		bbnote "no modules to compile"
 	fi
-- 
1.7.8.5

[meta-oe][PATCH 6/6] kernel.bbclass: unify white spaces

[Martin Jansa]

* indentation was with spaces and tabs, unify to use tabs instead of
  spaces, because "python populate_packages" expects tabs (or 8 spaces)
  and we're doing populate_packages_preppend here

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/kernel.bbclass |   78 ++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 1ef8e2a..cfcd5e9 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -11,20 +11,20 @@ INITRAMFS_IMAGE ?= ""
 INITRAMFS_TASK ?= ""
 
 python __anonymous () {
-    kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
-    if kerneltype == 'uImage':
-    	depends = d.getVar("DEPENDS", True)
-    	depends = "%s u-boot-mkimage-native" % depends
-    	d.setVar("DEPENDS", depends)
+	kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
+	if kerneltype == 'uImage':
+		depends = d.getVar("DEPENDS", True)
+		depends = "%s u-boot-mkimage-native" % depends
+		d.setVar("DEPENDS", depends)
 
-    image = d.getVar('INITRAMFS_IMAGE', True)
-    if image:
-    	d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
+	image = d.getVar('INITRAMFS_IMAGE', True)
+	if image:
+		d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
 
-    machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
+	machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
 
-    if machine_kernel_pr:
-    	d.setVar('PR', machine_kernel_pr)
+	if machine_kernel_pr:
+		d.setVar('PR', machine_kernel_pr)
 }
 
 inherit kernel-arch deploy
@@ -96,7 +96,7 @@ kernel_do_compile() {
 do_compile_kernelmodules() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+		oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	else
 		bbnote "no modules to compile"
 	fi
@@ -120,7 +120,7 @@ kernel_do_install() {
 
 	#
 	# Install various kernel output (zImage, map file, config, module support files)
-	#	
+	#
 	install -d ${D}/${KERNEL_IMAGEDEST}
 	install -d ${D}/boot
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
@@ -193,7 +193,7 @@ kernel_do_install() {
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
 	           arch/powerpc/boot/mktree"
 	for entry in $bin_files; do
-	        rm -f $kerneldir/$entry
+		rm -f $kerneldir/$entry
 	done
 }
 
@@ -391,10 +391,10 @@ python populate_packages_prepend () {
 		return deps
 	
 	def get_dependencies(file, pattern, format):
-                # file no longer includes PKGD
+		# file no longer includes PKGD
 		file = file.replace(d.getVar('PKGD', True) or '', '', 1)
-                # instead is prefixed with /lib/modules/${KERNEL_VERSION}
-                file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
+		# instead is prefixed with /lib/modules/${KERNEL_VERSION}
+		file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
 
 		if module_deps.has_key(file):
 			import re
@@ -498,34 +498,34 @@ python populate_packages_prepend () {
 do_sizecheck() {
 	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
 		size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
-        	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+		if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
 			rm ${KERNEL_OUTPUT}
-                	die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-        	fi
-    	fi
+			die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+		fi
+	fi
 }
 
 addtask sizecheck before do_install after do_compile
 
 do_uboot_mkimage() {
-    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-        ENTRYPOINT=${UBOOT_ENTRYPOINT}
-        if test -n "${UBOOT_ENTRYSYMBOL}"; then
-            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
-                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
-        fi
-        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
-            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
-            rm -f linux.bin
-        else
-            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-            rm -f linux.bin.gz
-            gzip -9 linux.bin
-            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
-            rm -f linux.bin.gz
-        fi
-    fi
+	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+		ENTRYPOINT=${UBOOT_ENTRYPOINT}
+		if test -n "${UBOOT_ENTRYSYMBOL}"; then
+			ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+				awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+		fi
+		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+			rm -f linux.bin
+		else
+			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+			rm -f linux.bin.gz
+			gzip -9 linux.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+			rm -f linux.bin.gz
+		fi
+	fi
 }
 
 addtask uboot_mkimage before do_install after do_compile
-- 
1.7.8.5