License checksum changes but no explanation. Ross
On 21 November 2017 at 00:07, Armin Kuster <[email protected]> wrote: > From: Armin Kuster <[email protected]> > > forward ported patch > > Signed-off-by: Armin Kuster <[email protected]> > --- > .../libassuan-add-pkgconfig-support.patch | 77 > +++++++++++----------- > .../{libassuan_2.4.3.bb => libassuan_2.4.4.bb} | 11 ++-- > 2 files changed, 45 insertions(+), 43 deletions(-) > rename meta/recipes-support/libassuan/{libassuan_2.4.3.bb => > libassuan_2.4.4.bb} (67%) > > diff --git > a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch > b/meta/recipes-support/libassuan/libassuan/libassuan- > add-pkgconfig-support.patch > index b6ccdda..525b076 100644 > --- a/meta/recipes-support/libassuan/libassuan/libassuan- > add-pkgconfig-support.patch > +++ b/meta/recipes-support/libassuan/libassuan/libassuan- > add-pkgconfig-support.patch > @@ -6,32 +6,15 @@ Upstream-Status: Denied > Signed-off-by: Chen Qi <[email protected]> > Signed-off-by: Constantin Musca <[email protected]> > > -Index: libassuan-2.1.2/Makefile.am > -=================================================================== > ---- libassuan-2.1.2.orig/Makefile.am > -+++ libassuan-2.1.2/Makefile.am > -@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz > - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) > - GITLOG_TO_CHANGELOG=gitlog-to-changelog > - > -+pkgconfigdir = $(libdir)/pkgconfig > -+pkgconfig_DATA = libassuan.pc > -+ > - EXTRA_DIST = autogen.sh autogen.rc README.GIT > \ > - ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ > - tests/ChangeLog-2011 contrib/ChangeLog-2011 \ > -- build-aux/git-log-footer build-aux/git-log-fix > -+ build-aux/git-log-footer build-aux/git-log-fix > libassuan.pc.in > - > - SUBDIRS = m4 src doc tests > - > -Index: libassuan-2.1.2/libassuan.pc.in > +forward ported to 2.4.4 > +Signed-off-by: Armin Kuster <[email protected]> > + > +Index: libassuan-2.4.4/libassuan.pc.in > =================================================================== > --- /dev/null > -+++ libassuan-2.1.2/libassuan.pc.in > -@@ -0,0 +1,14 @@ > -+prefix=@prefix@ > -+exec_prefix=@exec_prefix@ > ++++ libassuan-2.4.4/libassuan.pc.in > +@@ -0,0 +1,13 @@ > ++prefix=@exec_prefix@ > +libdir=@libdir@ > +includedir=@includedir@ > +api_version=@LIBASSUAN_CONFIG_API_VERSION@ > @@ -44,24 +27,42 @@ Index: libassuan-2.1.2/libassuan.pc.in > +Libs: -L${libdir} -lassuan > +Libs.private: -lgpg-error > +Cflags: -I${includedir} > -Index: libassuan-2.1.2/configure.ac > +Index: libassuan-2.4.4/Makefile.am > =================================================================== > ---- libassuan-2.1.2.orig/configure.ac > -+++ libassuan-2.1.2/configure.ac > -@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile]) > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc > + # (A suitable gitlog-to-changelog script can be found in GnuPG master.) > + GITLOG_TO_CHANGELOG=gitlog-to-changelog > + > ++pkgconfigdir = $(libdir)/pkgconfig > ++pkgconfig_DATA = libassuan.pc > ++ > + EXTRA_DIST = autogen.sh autogen.rc README.GIT VERSION \ > + ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ > + tests/ChangeLog-2011 contrib/ChangeLog-2011 \ > +- build-aux/git-log-footer build-aux/git-log-fix > ++ build-aux/git-log-footer build-aux/git-log-fix > libassuan.pc.in > + > + if BUILD_DOC > + doc = doc > +Index: 2.4.4-r0/libassuan-2.4.4/configure.ac > +=================================================================== > +--- a/configure.ac > ++++ b/configure.ac > +@@ -485,6 +485,7 @@ AC_CONFIG_FILES([doc/Makefile]) > AC_CONFIG_FILES([tests/Makefile]) > AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) > AC_CONFIG_FILES([src/versioninfo.rc]) > -- > +AC_CONFIG_FILES([libassuan.pc]) > + > AC_OUTPUT > > - echo " > -Index: libassuan-2.1.2/src/libassuan.m4 > +Index: libassuan-2.4.4/src/libassuan.m4 > =================================================================== > ---- libassuan-2.1.2.orig/src/libassuan.m4 > -+++ libassuan-2.1.2/src/libassuan.m4 > -@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no. > +--- a/src/libassuan.m4 > ++++ b/src/libassuan.m4 > +@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no. > dnl > AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], > [ AC_REQUIRE([AC_CANONICAL_HOST]) > @@ -80,7 +81,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 > > tmp=ifelse([$1], ,1:0.9.2,$1) > if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then > -@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], > +@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], > min_libassuan_version="$tmp" > fi > > @@ -105,7 +106,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 > - > - if test "$major" -gt "$req_major"; then > - ok=yes > -- else > +- else > - if test "$major" -eq "$req_major"; then > - if test "$minor" -gt "$req_minor"; then > - ok=yes > @@ -134,7 +135,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 > if test "$tmp" -gt 0 ; then > AC_MSG_CHECKING([LIBASSUAN API version]) > if test "$req_libassuan_api" -eq "$tmp" ; then > -@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], > +@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], > > if test $ok = yes; then > if test x"$host" != x ; then > @@ -143,7 +144,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 > if test x"$libassuan_config_host" != xnone ; then > if test x"$libassuan_config_host" != x"$host" ; then > AC_MSG_WARN([[ > -@@ -137,12 +86,8 @@ dnl > +@@ -138,12 +87,8 @@ dnl > AC_DEFUN([AM_PATH_LIBASSUAN], > [ _AM_PATH_LIBASSUAN_COMMON($1) > if test $ok = yes; then > diff --git a/meta/recipes-support/libassuan/libassuan_2.4.3.bb > b/meta/recipes-support/libassuan/libassuan_2.4.4.bb > similarity index 67% > rename from meta/recipes-support/libassuan/libassuan_2.4.3.bb > rename to meta/recipes-support/libassuan/libassuan_2.4.4.bb > index 926c279..7921c1d 100644 > --- a/meta/recipes-support/libassuan/libassuan_2.4.3.bb > +++ b/meta/recipes-support/libassuan/libassuan_2.4.4.bb > @@ -7,17 +7,18 @@ LICENSE_${PN} = "LGPLv2.1+" > LICENSE_${PN}-doc = "GPLv3+" > LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ > file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 > \ > - file://src/assuan.c;endline=20;md5= > 0f465544183405055ec179869fc5b5ba \ > - file://src/assuan-defs.h;endline=20;md5= > 20cd55535260ca1779edae5c7b80b21e" > + file://src/assuan.c;endline=20;md5= > ab92143a5a2adabd06d7994d1467ea5c\ > + file://src/assuan-defs.h;endline=20;md5= > 15d950c83e82978e35b35e790d7e4d39" > > DEPENDS = "libgpg-error" > > UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"; > SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ > - file://libassuan-add-pkgconfig-support.patch" > + file://libassuan-add-pkgconfig-support.patch \ > + " > > -SRC_URI[md5sum] = "8e01a7c72d3e5d154481230668e6eb5a" > -SRC_URI[sha256sum] = "22843a3bdb256f59be49842abf24da > 76700354293a066d82ade8134bb5aa2b71" > +SRC_URI[md5sum] = "52385ec8d34f258bf10165d32c486002" > +SRC_URI[sha256sum] = "9e69a102272324de0bb56025779f84 > fd44901afcc6eac51505f6a63ea5737ca1" > > BINCONFIG = "${bindir}/libassuan-config" > > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core >
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
