Skip to contentSkip to conversation

A couple of fixes

PATCH In review Saul Wold 3 participants 7 messages Feb 24, 2012 – Feb 28, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover A couple of fixes

Richard,

These patches address a couple of issues, the gnupg fixes the GPLv2 version of that recipe, it was orignally pushed (by me as a mistake, got pulled too soon). This version is correct and builds.

The syslinux change removes about 60 WARNINGS by packaging the remaining files in syslinux-misc

Sau!

The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:

scripts/hob: Launch the new hob (2012-02-24 18:05:46 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (2):
gnupg: Update checksum, fix configure and compliation issues
syslinux: Package unpackaged files in -misc

 meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    3 ++-
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
Signature · 1 line
1.7.7.6
author
#1 lore raw

PATCH 1/2 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]

Signed-off-by Saul Wold <[email protected]>
---
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
 2 files changed, 26 insertions(+), 8 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 +9 -8
index daea5aa..f033659 100644
@@ -5,18 +5,18 @@ SECTION = "console/utils"
 
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
-           file://mips_gcc4.4.patch"
+           file://configure.patch \
+           file://mips_gcc4.4.patch \
+           file://curl_typeof_fix_backport.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 +73,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.7.6
#2 lore raw

Re: [PATCH 1/2] gnupg: Update checksum, fix configure and compliation issues

Quoted 4 lines · Saul Wold

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.

BTW: those checksums matches gnupg_1.4.10 which is available in oe-classic and there is also similar patch (like mpfr from today) for thumb issues in gnupg/mpi/longlong.h.

Maybe it would be worth updating from there if there isn't reason to hold on 1.4.7.

Cheers,

Quoted 81 lines

[YOCTO #1966]

Signed-off-by Saul Wold <[email protected]>
---
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
 2 files changed, 26 insertions(+), 8 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 +9 -8
index daea5aa..f033659 100644
@@ -5,18 +5,18 @@ SECTION = "console/utils"
 
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
-           file://mips_gcc4.4.patch"
+           file://configure.patch \
+           file://mips_gcc4.4.patch \
+           file://curl_typeof_fix_backport.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 +73,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 · 7 lines
1.7.7.6


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#3 lore raw

Re: [PATCH 1/2] gnupg: Update checksum, fix configure and compliation issues

Quoted 10 lines · Martin Jansa
Quoted 4 lines · Saul Wold

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.

BTW: those checksums matches gnupg_1.4.10 which is available in oe-classic and there is also similar patch (like mpfr from today) for thumb issues in gnupg/mpi/longlong.h.

I am kind of suprised and confused by this, how could the 1.4.10 which is a GPLv3 license have the same checksum as the 1.4.7 version. I just verified (again) the md5sum of the 1.4.7 version and it's correct.

I also have the long-long-thumb.patch in this version, or is the same as the oe-classic version.

Are you suggesting I need something else?

Quoted 3 lines

Maybe it would be worth updating from there if there isn't reason to hold on 1.4.7.

We need 1.4.7 because it's the last GPLv2 version.

Sau!

Quoted 90 lines

Cheers,

Quoted 77 lines

[YOCTO #1966]

Signed-off-by Saul Wold<[email protected]>
---
  .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
  meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
  2 files changed, 26 insertions(+), 8 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 +9 -9
index daea5aa..f033659 100644
@@ -5,18 +5,18 @@ SECTION = "console/utils"
 
  LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PR = "r4"
+PR = "r5"
 
  SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
             file://long-long-thumb.patch \
-           file://mips_gcc4.4.patch"
+           file://configure.patch \
+           file://mips_gcc4.4.patch \
+           file://curl_typeof_fix_backport.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 +73,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
--

1.7.7.6

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#4 lore raw

Re: [PATCH 1/2] gnupg: Update checksum, fix configure and compliation issues

Quoted 7 lines · Saul Wold
Quoted 6 lines · Martin Jansa
Quoted 4 lines · Saul Wold

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.

Quoted 7 lines
Quoted 4 lines

BTW: those checksums matches gnupg_1.4.10 which is available in oe-classic and there is also similar patch (like mpfr from today) for thumb issues in gnupg/mpi/longlong.h.

I am kind of suprised and confused by this, how could the 1.4.10 which is a GPLv3 license have the same checksum as the 1.4.7 version. I just verified (again) the md5sum of the 1.4.7 version and it's correct.

I meant that those old (wrong) checksums were from 1.4.10 version, so I wanted to point it out in case someone wanted to actually upgrade gnupg recipe and forgot "git mv", but if 1.4.7 is last GPLv2 then someone probably downgraded recipe from 1.4.10 to 1.4.7 and just forgot to update checksums.

Quoted 2 lines

I also have the long-long-thumb.patch in this version, or is the same as the oe-classic version.

Ah sorry I haven't looked carefully enough.. yeah it's the same as oe-classic has.

Quoted 1 line

Are you suggesting I need something else?

You're fine.. I need coffee or sleep :).

Quoted 4 lines
Quoted 3 lines

Maybe it would be worth updating from there if there isn't reason to hold on 1.4.7.

We need 1.4.7 because it's the last GPLv2 version.

Cheers,

Quoted 85 lines
Quoted 85 lines
Quoted 74 lines
Signed-off-by Saul Wold<[email protected]>
---
  .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
  meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
  2 files changed, 26 insertions(+), 8 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 +9 -9
index daea5aa..f033659 100644
@@ -5,18 +5,18 @@ SECTION = "console/utils"
 
  LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PR = "r4"
+PR = "r5"
 
  SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
             file://long-long-thumb.patch \
-           file://mips_gcc4.4.patch"
+           file://configure.patch \
+           file://mips_gcc4.4.patch \
+           file://curl_typeof_fix_backport.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 +73,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
--

1.7.7.6

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#5 lore raw

PATCH 2/2 syslinux: Package unpackaged files in -misc

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-devtools/syslinux/syslinux_4.03.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/syslinux/syslinux_4.03.bb +2 -1
index 97bf7ce..862ea8b 100644
@@ -46,7 +46,7 @@ do_install() {
 	install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
 }
 
-PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux"
+PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
 
 RDEPENDS_${PN} += "mtools"
 

@@ -58,5 +58,6 @@ FILES_${PN}-isolinux = "${libdir}/${PN}/isolinux.bin"
 FILES_${PN}-pxelinux = "${libdir}/${PN}/pxelinux.0"
 FILES_${PN}-dev += "${datadir}/${PN}/com32/lib*${SOLIBS} ${datadir}/${PN}/com32/include ${datadir}/${PN}/com32/com32.ld"
 FILES_${PN}-staticdev += "${datadir}/${PN}/com32/lib*.a"
+FILES_${PN}-misc = "${libdir}/${PN}/* ${bindir}/*"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
1.7.7.6
#6 lore raw

Re: [PATCH 2/2] syslinux: Package unpackaged files in -misc

Quoted 1 line · Saul Wold
Signed-off-by Saul Wold <[email protected]>

This missed a PR bump and broke autobuilder; can you send a patch bumping PR please?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br