| Submitter | Saul Wold |
|---|---|
| Date | Feb. 10, 2012, 8:30 a.m. |
| Message ID | <1328862631-30998-1-git-send-email-sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/21129/ |
| State | New |
| Headers | show |
Comments
Am Freitag, den 10.02.2012, 00:30 -0800 schrieb Saul Wold: In the summary there should be comp*i*lation. > 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? > Also disable Documetnation for now due to older autotools issue. docum*en*tation > > [YOCTO #1966] > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > .../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 > > diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch > new file mode 100644 > index 0000000..e005ac6 > --- /dev/null > +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch > @@ -0,0 +1,17 @@ Could you please describe the problem here. PO sounds like translation to me. > + > +Upstream-Status: Inappropriate [configuration] > + > +Signed-off-by: Saul Wold <sgw@linux.intel.com> > + > +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 > diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb > index daea5aa..26683df 100644 > --- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb > +++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb > @@ -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. > > 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 \ > + " Does that belong to the documentation change? > > do_install () { > autotools_do_install Thanks, Paul
On Fri, Feb 10, 2012 at 12:30 AM, Saul Wold <sgw@linux.intel.com> wrote: > + > +Upstream-Status: Inappropriate [configuration] > + > +Signed-off-by: Saul Wold <sgw@linux.intel.com> > + > +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 > + could you describe the error ?
Patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch new file mode 100644 index 0000000..e005ac6 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch @@ -0,0 +1,17 @@ + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +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 diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb index daea5aa..26683df 100644 --- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb @@ -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
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] Signed-off-by: Saul Wold <sgw@linux.intel.com> --- .../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