[meta-oe][PATCH 0/5] Pending patches on O.S. Systems tree

[meta-oe][PATCH 0/5] Pending patches on O.S. Systems tree

[Otavio Salvador]

The following changes since commit 7da05acc4665dcfcd008e6ce698169b8e9503b33:

  udev-extra-rules: remove modprobe rule, it has moved back to udev (2011-05-31 20:37:45 +0200)

are available in the git repository at:
  git://github.com/OSSystems/meta-oe master
  https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (5):
  inih: bump SRCREV
  freerdp: bump SRCREV to 20110530 snapshot
  udev-extra-rules: refactor mount.sh script
  ccid: add 1.4.4 version recipe
  pcsc-lite: rdepends on ccid and drop init script

 meta-oe/recipes-core/udev/udev-extra-rules.bb      |    2 +-
 .../recipes-core/udev/udev-extra-rules/mount.sh    |   28 +++++++------------
 meta-oe/recipes-support/ccid/ccid_1.4.4.bb         |   18 ++++++++++++
 meta-oe/recipes-support/freerdp/freerdp_git.bb     |    4 +-
 meta-oe/recipes-support/inih/libinih_git.bb        |    4 +-
 .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb   |   15 ++--------
 6 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 meta-oe/recipes-support/ccid/ccid_1.4.4.bb

-- 
1.7.2.5

[meta-oe][PATCH 1/5] inih: bump SRCREV

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-support/inih/libinih_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb
index 4807bc7..f750bdb 100644
--- a/meta-oe/recipes-support/inih/libinih_git.bb
+++ b/meta-oe/recipes-support/inih/libinih_git.bb
@@ -6,10 +6,10 @@ PKGV = "${GITPKGVTAG}"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde"
 
-PR = "r0"
+PR = "r1"
 
 # The github repository provides a cmake and pkg-config integration
-SRCREV = "715cb4dc3d56714d7d53dcd94ae4b41c950119a7"
+SRCREV = "af230b4c7ef2529413ffc37cee513ef8f35c9598"
 SRC_URI = "git://github.com/OSSystems/inih.git;protocol=git"
 
 S = "${WORKDIR}/git"
-- 
1.7.2.5

[meta-oe][PATCH 2/5] freerdp: bump SRCREV to 20110530 snapshot

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index e135902..a5f158a 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -7,9 +7,9 @@ inherit gitpkgv
 
 PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
-SRCREV = "f5aef3be8fac9a02b0c7bbb5424831a7b285e7bb"
+SRCREV = "dd759622a097474114ce425021ef52d0aa5d3957"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git"
 
 S = "${WORKDIR}/git"
-- 
1.7.2.5

[meta-oe][PATCH 3/5] udev-extra-rules: refactor mount.sh script

[Otavio Salvador]

Avoids a fork for using cat and do a whitespace cleanup.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/udev/udev-extra-rules.bb      |    2 +-
 .../recipes-core/udev/udev-extra-rules/mount.sh    |   28 +++++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb
index f114b1a..dfd4080 100644
--- a/meta-oe/recipes-core/udev/udev-extra-rules.bb
+++ b/meta-oe/recipes-core/udev/udev-extra-rules.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Extra udev rules"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
        file://automount.rules \
diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh b/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
index 81bcfba..67c2b4b 100644
--- a/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
+++ b/meta-oe/recipes-core/udev/udev-extra-rules/mount.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Called from udev
-# Attemp to mount any added block devices 
+# Attemp to mount any added block devices
 # and remove any removed devices
 #
 
@@ -10,7 +10,7 @@ PMOUNT="/usr/bin/pmount"
 UMOUNT="/bin/umount"
 name="`basename "$DEVNAME"`"
 
-for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+for line in `grep -v ^# /etc/udev/mount.blacklist`
 do
 	if ( echo "$DEVNAME" | grep -q "$line" )
 	then
@@ -19,9 +19,9 @@ do
 	fi
 done
 
-automount() {	
+automount() {
 	! test -d "/media/$name" && mkdir -p "/media/$name"
-	
+
 	if ! $MOUNT -t auto -o async,relatime $DEVNAME "/media/$name"
 	then
 		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
@@ -31,7 +31,7 @@ automount() {
 		touch "/tmp/.automount-$name"
 	fi
 }
-	
+
 rm_dir() {
 	# We do not want to rm -r populated directories
 	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
@@ -46,27 +46,19 @@ if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
 	if [ -x "$PMOUNT" ]; then
 		$PMOUNT $DEVNAME 2> /dev/null
 	elif [ -x $MOUNT ]; then
-    		$MOUNT $DEVNAME 2> /dev/null
+			$MOUNT $DEVNAME 2> /dev/null
 	fi
-	
-	# If the device isn't mounted at this point, it isn't configured in fstab
-	# 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
-	# 	    its true device name so this would break. If the rootfs is mounted on two places
-	#	    during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
-	#	    to /etc/udev/mount.blacklist via postinst 
 
-	cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount 
-	
+	# Avoid remounting devices (e.g: rootfs)
+	awk '{print $1}' /proc/mounts | grep -q "^$DEVNAME$" || automount
 fi
 
-
-
 if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
-	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+	for mnt in `grep "$DEVNAME" /proc/mounts | cut -f 2 -d " " `
 	do
 		$UMOUNT -l $mnt
 	done
-	
+
 	# Remove empty directories from auto-mounter
 	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
 fi
-- 
1.7.2.5

[meta-oe][PATCH 4/5] ccid: add 1.4.4 version recipe

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-support/ccid/ccid_1.4.4.bb |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/ccid/ccid_1.4.4.bb

diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.4.bb b/meta-oe/recipes-support/ccid/ccid_1.4.4.bb
new file mode 100644
index 0000000..734e854
--- /dev/null
+++ b/meta-oe/recipes-support/ccid/ccid_1.4.4.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Generic USB CCID smart card reader driver"
+HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+PR = "r0"
+
+DEPENDS = "virtual/libusb0 pcsc-lite"
+RDEPENDS_${PN} = "pcsc-lite"
+
+SRC_URI = "https://alioth.debian.org/frs/download.php/3579/ccid-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "79ef91103bcdd99a3b31cb5c5721a829"
+SRC_URI[sha256sum] = "953e430d2e37a67b99041f584249085656d73e72390dfe40589f4dd5c367edd0"
+
+inherit autotools
+
+FILES_${PN} += "${libdir}/pcsc/"
+FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug"
-- 
1.7.2.5

[meta-oe][PATCH 5/5] pcsc-lite: rdepends on ccid and drop init script

[Otavio Salvador]

We use auto-start feature by default as it is provided by ccid and
works out of box for most use cases.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb   |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
index 7d235d6..14a0ba0 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://pcsclite.alioth.debian.org/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c8e551349dc346258274f0007679e149"
 DEPENDS = "udev"
-PR = "r0"
+RDEPENDS += "ccid"
+PR = "r1"
 
-SRC_URI = "https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${PV}.tar.bz2 \
-           file://pcscd.init "
+SRC_URI = "https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "47e7055cfc14399fdaa1b7a4aa06e5aa"
 SRC_URI[sha256sum] = "41f13d552eaa2c3978fbb6f2125e81903a0767011d999052fd1a6ee03880b398"
@@ -21,15 +21,6 @@ EXTRA_OECONF = " \
 
 S = "${WORKDIR}/pcsc-lite-${PV}"
 
-do_install() {
-	oe_runmake DESTDIR="${D}" install
-	install -d "${D}/${sysconfdir}/init.d"
-	install -m 755 "${WORKDIR}/pcscd.init" "${D}/${sysconfdir}/init.d/pcscd"
-
-	# handle vars values
-	sed -i 's,/usr/sbin,${sbindir},g;s,/var,${localstatedir},g' "${D}/${sysconfdir}/init.d/pcscd"
-}
-
 PACKAGES =+ "${PN}-lib"
 
 INITSCRIPT_NAME = "pcscd"
-- 
1.7.2.5

Re: [meta-oe][PATCH 0/5] Pending patches on O.S. Systems tree

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'll push these if the test builds succeed. Tomorrow is a national
holiday over here, so it might take till the TSC meeting before it
actually gets out.

On 01-06-11 22:16, Otavio Salvador wrote:
> The following changes since commit 7da05acc4665dcfcd008e6ce698169b8e9503b33:
> 
>   udev-extra-rules: remove modprobe rule, it has moved back to udev (2011-05-31 20:37:45 +0200)
> 
> are available in the git repository at:
>   git://github.com/OSSystems/meta-oe master
>   https://github.com/OSSystems/meta-oe/tree/master
> 
> Otavio Salvador (5):
>   inih: bump SRCREV
>   freerdp: bump SRCREV to 20110530 snapshot
>   udev-extra-rules: refactor mount.sh script
>   ccid: add 1.4.4 version recipe
>   pcsc-lite: rdepends on ccid and drop init script
> 
>  meta-oe/recipes-core/udev/udev-extra-rules.bb      |    2 +-
>  .../recipes-core/udev/udev-extra-rules/mount.sh    |   28 +++++++------------
>  meta-oe/recipes-support/ccid/ccid_1.4.4.bb         |   18 ++++++++++++
>  meta-oe/recipes-support/freerdp/freerdp_git.bb     |    4 +-
>  meta-oe/recipes-support/inih/libinih_git.bb        |    4 +-
>  .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb   |   15 ++--------
>  6 files changed, 36 insertions(+), 35 deletions(-)
>  create mode 100644 meta-oe/recipes-support/ccid/ccid_1.4.4.bb
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN5rbDMkyGM64RGpERAi2eAJ9RT1yCnJB73pPWeniDwPPpEyI+ZgCfePsh
ug+ynDRgA+IKa9UIDB1Gmio=
=J7Fo
-----END PGP SIGNATURE-----