[PATCH 0/2] gnupg build fixes

[PATCH 0/2] gnupg build fixes

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The yocto autobuilder was having problems generating rootfs for a bunch
of machines which this patchset was seen to fix.

The first patch adds a missing dependency that the second removes; the
patches are staged this way to easily allow the second to be reverted
if the CCID driver option is wanted, in which case the missing dependency
will still be there.

The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:
  Cristian Iorga (1):
        ltp: Add patch to correct failing build

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/poky-master-gnupg-dependency-fix.v1
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/poky-master-gnupg-dependency-fix.v1

Tom Zanussi (2):
  gnupg: add libusb to DEPENDS
  gnupg: disable CCID driver

 meta/recipes-support/gnupg/gnupg_2.0.19.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

[PATCH 1/2] gnupg: add libusb to DEPENDS

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

gnupg apparently depends on libusb:

| error: Failed dependencies:
| 	 libusb-0.1-4 >= 0.1.3 is needed by gnupg-2.0.18-r1.core2

So add libusb to gnupg DEPENDS.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/recipes-support/gnupg/gnupg_2.0.19.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
index 1d19fe3..9a0f160 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
-PR = "r0"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
+PR = "r1"
 
 inherit autotools gettext
 
-- 
1.7.0.4

[PATCH 2/2] gnupg: disable CCID driver

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The CCID driver driver is apparently unnecessary, so disable it.

Also remove the associated libusb dependency, since that won't be
needed either.

According to Scott Garman <scott.a.garman@intel.com>:

I'd just note that the CCID smartcard reader is a specific piece of
hardware that is unlikely to be used in a majority of our use cases.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/recipes-support/gnupg/gnupg_2.0.19.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
index 9a0f160..d014f03 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
-PR = "r1"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
+PR = "r2"
 
 inherit autotools gettext
 
@@ -15,6 +15,7 @@ SRC_URI[md5sum] = "6a8589381ca1b0c1a921e9955f42b016"
 SRC_URI[sha256sum] = "efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622"
 
 EXTRA_OECONF = "--disable-ldap \
+		--disable-ccid-driver \
 		--with-zlib=${STAGING_LIBDIR}/.. \
 		--with-bzip2=${STAGING_LIBDIR}/.. \
                 --with-readline=${STAGING_LIBDIR}/.. \
-- 
1.7.0.4

Re: [PATCH 1/2] gnupg: add libusb to DEPENDS

[Flanagan, Elizabeth]

On Wed, Jun 6, 2012 at 6:53 AM,  <tom.zanussi@intel.com> wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> gnupg apparently depends on libusb:
>
> | error: Failed dependencies:
> |        libusb-0.1-4 >= 0.1.3 is needed by gnupg-2.0.18-r1.core2
>
> So add libusb to gnupg DEPENDS.
>
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>  meta/recipes-support/gnupg/gnupg_2.0.19.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> index 1d19fe3..9a0f160 100644
> --- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> +++ b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> @@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
>                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
>
> -DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
> -PR = "r0"
> +DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"

I'm seeing an additional DEPENDS needed here, curl:

| ksutil.c:43:23: fatal error: curl/curl.h: No such file or directory
| compilation terminated.
| make[2]: *** [gpg2keys_finger-ksutil.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
| In file included from gpgkeys_finger.c:46:0:
| ksutil.h:35:ERROR: Function failed: do_compile (see
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86-64/build/build/tmp/work/x86_64-poky-linux/gnupg-2.0.19-r2/temp/log.do_compile.11537
for further information)
| 23: fatal error: curl/curl.h: No such file or directory
| compilation terminated.
| make[2]: *** [gpg2keys_finger-gpgkeys_finger.o] Error 1
| gpgkeys_hkp.c: In function 'srv_replace':
| gpgkeys_hkp.c:510:7: warning: variable 'srvcount' set but not used
[-Wunused-but-set-variable]
| make[2]: Leaving directory
`/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86-64/build/build/tmp/work/x86_64-poky-linux/gnupg-2.0.19-r2/gnupg-2.0.19/keyserver'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory
`/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86-64/build/build/tmp/work/x86_64-poky-linux/gnupg-2.0.19-r2/gnupg-2.0.19'
| make: *** [all] Error 2
| ERROR: oe_runmake failed

> +PR = "r1"
>
>  inherit autotools gettext
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



-- 
Elizabeth Flanagan
Yocto Project
Build and Release

Re: [PATCH 1/2] gnupg: add libusb to DEPENDS

[Flanagan, Elizabeth]

On Wed, Jun 6, 2012 at 6:53 AM,  <tom.zanussi@intel.com> wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> gnupg apparently depends on libusb:
>
> | error: Failed dependencies:
> |        libusb-0.1-4 >= 0.1.3 is needed by gnupg-2.0.18-r1.core2
>
> So add libusb to gnupg DEPENDS.
>
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>  meta/recipes-support/gnupg/gnupg_2.0.19.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> index 1d19fe3..9a0f160 100644
> --- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> +++ b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
> @@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
>                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
>
> -DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
> -PR = "r0"
> +DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
> +PR = "r1"
>
>  inherit autotools gettext
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


Merged into OE-Core

Thanks

-b


-- 
Elizabeth Flanagan
Yocto Project
Build and Release

Re: [PATCH 0/2] gnupg build fixes

[Flanagan, Elizabeth]

On Wed, Jun 6, 2012 at 6:52 AM,  <tom.zanussi@intel.com> wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> The yocto autobuilder was having problems generating rootfs for a bunch
> of machines which this patchset was seen to fix.
>
> The first patch adds a missing dependency that the second removes; the
> patches are staged this way to easily allow the second to be reverted
> if the CCID driver option is wanted, in which case the missing dependency
> will still be there.
>
> The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:
>  Cristian Iorga (1):
>        ltp: Add patch to correct failing build
>
> are available in the git repository at:
>
>  git://git.yoctoproject.org/poky-contrib.git tzanussi/poky-master-gnupg-dependency-fix.v1
>  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/poky-master-gnupg-dependency-fix.v1
>
> Tom Zanussi (2):
>  gnupg: add libusb to DEPENDS
>  gnupg: disable CCID driver
>
>  meta/recipes-support/gnupg/gnupg_2.0.19.bb |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



Merged into OE-Core

Thanks

-b

-- 
Elizabeth Flanagan
Yocto Project
Build and Release