Skip to contentSkip to conversation

gnupg: Update checksum, fix configure and compliation issues

PATCH In review Saul Wold 3 participants 3 messages Feb 10, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 gnupg: Update checksum, fix configure and compliation issues

This recipe was added, but did not have the correct checksum information for the LIC_FILES_CHKSUM or the SRC_URI. Also disable Documetnation for now due to older autotools issue.

[YOCTO #1966]

---
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   12 ++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file +17 -0
new file mode 100644
index 0000000..e005ac6
@@ -0,0 +1,17 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: gnupg-1.4.7/configure.ac
+===================================================================
+--- gnupg-1.4.7.orig/configure.ac
++++ gnupg-1.4.7/configure.ac
+@@ -827,7 +827,6 @@ else
+   AC_SUBST(USE_NLS)
+   AC_SUBST(USE_INCLUDED_LIBINTL)
+   AC_SUBST(BUILD_INCLUDED_LIBINTL)
+-  AM_PO_SUBDIRS
+ fi
+ 
+ if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
meta/recipes-support/gnupg/gnupg_1.4.7.bb +6 -6
index daea5aa..26683df 100644
@@ -5,18 +5,17 @@ SECTION = "console/utils"
 
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
 PR = "r4"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
+           file://configure.patch \
            file://mips_gcc4.4.patch"
 
-SRC_URI[md5sum] = "dcf7ed712997888d616e029637bfc303"
-SRC_URI[sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
-
-S = "${WORKDIR}/gnupg-${PV}"
+SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c"
+SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d"
 
 inherit autotools gettext
 
@@ -73,7 +72,8 @@ EXTRA_OECONF = "--disable-ldap \
 		--with-bzip2=${STAGING_LIBDIR}/.. \
 		--disable-selinux-support \
                 --with-readline=${STAGING_LIBDIR}/.. \
-                ac_cv_sys_symbol_underscore=yes"
+                ac_cv_sys_symbol_underscore=no \
+		"
 
 do_install () {
 	autotools_do_install
Signature · 1 line
1.7.6.5
#1 lore raw

Am Freitag, den 10.02.2012, 00:30 -0800 schrieb Saul Wold:

In the summary there should be comp*i*lation.

Quoted 3 lines

This recipe was added, but did not have the correct checksum information for the LIC_FILES_CHKSUM or the SRC_URI.

How could that happen?

Quoted 1 line

Also disable Documetnation for now due to older autotools issue.

docum*en*tation

meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch

Quoted 16 lines

[YOCTO #1966]

---
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   12 ++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file +0 -0
new file mode 100644
index 0000000..e005ac6
@@ -0,0 +1,17 @@

Could you please describe the problem here. PO sounds like translation to me.

Quoted 22 lines
meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file +17 -0
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: gnupg-1.4.7/configure.ac
+===================================================================
+--- gnupg-1.4.7.orig/configure.ac
++++ gnupg-1.4.7/configure.ac
+@@ -827,7 +827,6 @@ else
+   AC_SUBST(USE_NLS)
+   AC_SUBST(USE_INCLUDED_LIBINTL)
+   AC_SUBST(BUILD_INCLUDED_LIBINTL)
+-  AM_PO_SUBDIRS
+ fi
+ 
+ if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
meta/recipes-support/gnupg/gnupg_1.4.7.bb +0 -0
index daea5aa..26683df 100644

meta/recipes-support/gnupg/gnupg_1.4.7.bb SECTION = "console/utils" · line 10

Quoted 7 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +1 -1
@@ -5,18 +5,17 @@ SECTION = "console/utils"
 
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
 PR = "r4"

Should that be increased? I know the package did not work before but the content should have changed nevertheless.

Quoted 16 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +3 -4
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
+           file://configure.patch \
            file://mips_gcc4.4.patch"
 
-SRC_URI[md5sum] = "dcf7ed712997888d616e029637bfc303"
-SRC_URI[sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
-
-S = "${WORKDIR}/gnupg-${PV}"
+SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c"
+SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d"
 
 inherit autotools gettext
 

meta/recipes-support/gnupg/gnupg_1.4.7.bb EXTRA_OECONF = "--disable-ldap \ · line 76

Quoted 6 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +2 -1
@@ -73,7 +72,8 @@ EXTRA_OECONF = "--disable-ldap \
 		--with-bzip2=${STAGING_LIBDIR}/.. \
 		--disable-selinux-support \
                 --with-readline=${STAGING_LIBDIR}/.. \
-                ac_cv_sys_symbol_underscore=yes"
+                ac_cv_sys_symbol_underscore=no \
+		"

Does that belong to the documentation change?

meta/recipes-support/gnupg/gnupg_1.4.7.bb EXTRA_OECONF = "--disable-ldap \ · line 79

Quoted 3 lines
meta/recipes-support/gnupg/gnupg_1.4.7.bb +0 -0
 do_install () {
 	autotools_do_install

Thanks,

Paul

#2 lore raw
In reply to Saul Wold
Quoted 6 lines · Saul Wold
meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file +6 -0
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: gnupg-1.4.7/configure.ac

meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch line 16

Quoted 10 lines
meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file +10 -0
+===================================================================
+--- gnupg-1.4.7.orig/configure.ac
++++ gnupg-1.4.7/configure.ac
+@@ -827,7 +827,6 @@ else
+   AC_SUBST(USE_NLS)
+   AC_SUBST(USE_INCLUDED_LIBINTL)
+   AC_SUBST(BUILD_INCLUDED_LIBINTL)
+-  AM_PO_SUBDIRS
+ fi
+

could you describe the error ?