[PATCH 00/26] Upstream version check fixes for various recipes

[PATCH 00/26] Upstream version check fixes for various recipes

[Alexander Kanavin]

This patchset contains various recipe fixes that allow upstream version checks.
It also updates recipes that fetch sources from Google Code (about to shut down)
to use alternatives. Please see individual commits for what is fixed and why.

The following changes since commit 3aeeda88e236f3da577adc20597dab38a66157c5:

  wget.py: fix incorrect regexes (2015-07-30 14:47:12 +0300)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/recipe-reporting-fixes
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/recipe-reporting-fixes

Alexander Kanavin (26):
  libproxy: update SRC_URI to not use Google Code
  fotowall: update SRC_URI to use github instead of qt-apps.org
  distcc: update SRC_URI to not use Google Code
  adt-installer: update SRC_URI to not use Google Code
  ossp-uuid: update SRC_URI to not use Google Code
  eglinfo: change version from 1.0 to 1.0.0 to match the upstream git
    tag
  gptfdisk: use tarballs instead of git for fetching source code
  libmad: use ftp instead of sourceforge for consistency with libid3tag
  lsb: set PV to 1.4 to match upstream tarball version
  linux-yocto-dev: only numeric characters are allowed in package
    versions taken from git
  nss: reorder SRC_URI lines to fix upstream version check
  pseudo: fix upstream SRC_URI to enable upstream version check
  oprofile: reorder SRC_URI lines to fix upstream version check
  puzzles: switch svn for git, as upstream has done the same
  syslinux: drop v6.xx/ from directory path in SRC_URI
  shared-mime-info: reorder SRC_URI lines to fix upstream version check
  tremor: switch SRC_URI from svn to tarballs on debian mirrors
  x264: only numeric characters are allowed in package versions taken
    from git
  xf86-video-omapfb: switch SRC_URI to debian git repo
  stress: use developer's website for SRC_URI
  systemd: remove PV from the recipe
  unzip,zip: fix PV to allow upstream version check
  guilt-native: set PV in the recipe to allow upstream version check
  distrodata.bbclass: do not skip -native recipes in checkpkg task
  distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before
    comparing versions in checkpkg
  distrodata.bbclass: drop the manual upstream version check logic

 meta/classes/distrodata.bbclass                    | 27 ++-----------------
 meta/recipes-core/systemd/systemd_219.bb           |  2 --
 meta/recipes-devtools/distcc/distcc_3.1.bb         |  3 ++-
 .../fdisk/{gptfdisk_git.bb => gptfdisk_0.8.10.bb}  |  8 +++---
 meta/recipes-devtools/guilt/guilt-native_git.bb    |  2 +-
 .../installer/adt-installer_1.0.bb                 |  2 +-
 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb |  2 +-
 meta/recipes-devtools/pseudo/pseudo_1.6.7.bb       |  2 +-
 meta/recipes-devtools/syslinux/syslinux_6.03.bb    |  2 +-
 meta/recipes-extended/lsb/lsb_4.1.bb               |  1 +
 meta/recipes-extended/stress/stress_1.0.4.bb       |  2 +-
 meta/recipes-extended/unzip/unzip_6.0.bb           |  3 ++-
 meta/recipes-extended/zip/zip.inc                  |  3 ++-
 .../{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb}     |  0
 .../{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb}   |  0
 .../xorg-driver/xf86-video-omapfb_git.bb           |  2 +-
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |  2 +-
 meta/recipes-kernel/oprofile/oprofile.inc          |  2 +-
 meta/recipes-kernel/oprofile/oprofile_1.0.0.bb     |  6 ++---
 meta/recipes-multimedia/libmad/libmad_0.15.1b.bb   |  2 +-
 .../obsolete_automake_macros.patch                 |  0
 .../tremor-arm-thumb2.patch                        |  0
 .../tremor/{tremor_20120314.bb => tremor_18153.bb} |  6 +++--
 meta/recipes-multimedia/x264/x264_git.bb           |  2 +-
 meta/recipes-qt/qt-apps/fotowall_0.9.bb            |  3 ++-
 .../puzzles/files/puzzles_x32_abi_time.patch       | 30 ----------------------
 .../puzzles/{puzzles_r10286.bb => puzzles_git.bb}  |  7 ++---
 meta/recipes-support/libproxy/libproxy_0.4.11.bb   |  7 +++--
 meta/recipes-support/nss/nss.inc                   |  2 +-
 meta/recipes-support/nss/nss_3.17.3.bb             |  6 ++---
 .../shared-mime-info/shared-mime-info_1.4.bb       |  2 +-
 31 files changed, 44 insertions(+), 94 deletions(-)
 rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb => gptfdisk_0.8.10.bb} (75%)
 rename meta/recipes-graphics/eglinfo/{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb} (100%)
 rename meta/recipes-graphics/eglinfo/{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb} (100%)
 rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/obsolete_automake_macros.patch (100%)
 rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/tremor-arm-thumb2.patch (100%)
 rename meta/recipes-multimedia/tremor/{tremor_20120314.bb => tremor_18153.bb} (66%)
 delete mode 100644 meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
 rename meta/recipes-sato/puzzles/{puzzles_r10286.bb => puzzles_git.bb} (89%)

-- 
2.1.4

[PATCH 01/26] libproxy: update SRC_URI to not use Google Code

[Alexander Kanavin]

Google Code is shutting down soon, so libproxy tarball is now fetched
from Debian mirrors

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/libproxy/libproxy_0.4.11.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index 9d388d6..06d0b9b 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 DEPENDS = "gconf glib-2.0"
 
-SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.zip \
+SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \
            file://0001-test-Include-sys-select.h-for-select.patch \
           "
-
-SRC_URI[md5sum] = "06be230b8b612e64997f8f15af6373aa"
-SRC_URI[sha256sum] = "3175abcb49c0b37fd82c697927783bf7d53de3884a8559bc594e59caa09bdb04"
+SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84"
+SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b"
 
 inherit cmake pkgconfig
 
-- 
2.1.4

Re: [PATCH 01/26] libproxy: update SRC_URI to not use Google Code

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1836 bytes --]

On Thu, Jul 30, 2015 at 04:31:30PM +0300, Alexander Kanavin wrote:
> Google Code is shutting down soon, so libproxy tarball is now fetched
> from Debian mirrors
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-support/libproxy/libproxy_0.4.11.bb | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
> index 9d388d6..06d0b9b 100644
> --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
> +++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
> @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
>  
>  DEPENDS = "gconf glib-2.0"
>  
> -SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.zip \
> +SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \
>             file://0001-test-Include-sys-select.h-for-select.patch \
>            "
> -
> -SRC_URI[md5sum] = "06be230b8b612e64997f8f15af6373aa"
> -SRC_URI[sha256sum] = "3175abcb49c0b37fd82c697927783bf7d53de3884a8559bc594e59caa09bdb04"
> +SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84"
> +SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b"

Why has debian mirror different checksums?

Include the diff in commit message and warn premirror maintainers that
they need to drop old file (otherwise it will fail) - which is very
annoying.

>  
>  inherit cmake pkgconfig
>  
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 01/26] libproxy: update SRC_URI to not use Google Code

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

On 30 July 2015 at 15:29, Martin Jansa <martin.jansa@gmail.com> wrote:

> Why has debian mirror different checksums?
>

Ones a zip, the other is tar.gz.

Ross

[-- Attachment #2: Type: text/html, Size: 576 bytes --]

Re: [PATCH 01/26] libproxy: update SRC_URI to not use Google Code

[Alexander Kanavin]

On 07/30/2015 05:29 PM, Martin Jansa wrote:

>> -SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.zip \
>> +SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \
>>              file://0001-test-Include-sys-select.h-for-select.patch \
>>             "
>> -
>> -SRC_URI[md5sum] = "06be230b8b612e64997f8f15af6373aa"
>> -SRC_URI[sha256sum] = "3175abcb49c0b37fd82c697927783bf7d53de3884a8559bc594e59caa09bdb04"
>> +SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84"
>> +SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b"
>
> Why has debian mirror different checksums?
>
> Include the diff in commit message and warn premirror maintainers that
> they need to drop old file (otherwise it will fail) - which is very
> annoying.

I guess this is not needed because they are in fact two different 
filenames/formats?


Alex

Re: [PATCH 01/26] libproxy: update SRC_URI to not use Google Code

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

On 30 July 2015 at 16:12, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> I guess this is not needed because they are in fact two different
> filenames/formats?
>

Correct.

Ross

[-- Attachment #2: Type: text/html, Size: 621 bytes --]

[PATCH 02/26] fotowall: update SRC_URI to use github instead of qt-apps.org

[Alexander Kanavin]

GitHub is where upstream development is happening, so we are more likely
to find out about new releases from there

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-qt/qt-apps/fotowall_0.9.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 48dcc02..587b074 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -10,7 +10,8 @@ SECTION = "x11/apps"
 
 PR = "r4"
 
-SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
+SRCREV = "06d5a4142c599604d9a9fd64727b6945eb8cd3da"
+SRC_URI = "git://github.com/enricoros/fotowall.git \
            file://ExportWizard-depends-on-ui_wizard.patch \
            "
 
-- 
2.1.4

Re: [PATCH 02/26] fotowall: update SRC_URI to use github instead of qt-apps.org

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]

On Thu, Jul 30, 2015 at 04:31:31PM +0300, Alexander Kanavin wrote:
> GitHub is where upstream development is happening, so we are more likely
> to find out about new releases from there
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-qt/qt-apps/fotowall_0.9.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> index 48dcc02..587b074 100644
> --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> @@ -10,7 +10,8 @@ SECTION = "x11/apps"
>  
>  PR = "r4"
>  
> -SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
> +SRCREV = "06d5a4142c599604d9a9fd64727b6945eb8cd3da"
> +SRC_URI = "git://github.com/enricoros/fotowall.git \
>             file://ExportWizard-depends-on-ui_wizard.patch \
>             "

So it doesn't need SRC_URI checksums anymore.. drop:
SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"


>  
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 02/26] fotowall: update SRC_URI to use github instead of qt-apps.org

[Alexander Kanavin]

On 07/30/2015 05:29 PM, Martin Jansa wrote:
      "
>
> So it doesn't need SRC_URI checksums anymore.. drop:
> SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
> SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"

Done.

Alex

[PATCH 03/26] distcc: update SRC_URI to not use Google Code

[Alexander Kanavin]

Google Code is shutting down soon and distcc has moved to github.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/distcc/distcc_3.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index e4b9313..b598c77 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -17,13 +17,14 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
 
 RRECOMMENDS_${PN} = "avahi-daemon"
 
-SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "git://github.com/distcc/distcc.git \
            file://separatebuilddir.patch \
            file://0001-zeroconf-Include-fcntl.h.patch \
            file://default \
            file://distccmon-gnome.desktop \
            file://distcc \
            file://distcc.service"
+SRCREV = "9a172d3d20042754a30c0cd9a5d63fd1a8120c31"
 
 SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
 SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
-- 
2.1.4

Re: [PATCH 03/26] distcc: update SRC_URI to not use Google Code

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

On Thu, Jul 30, 2015 at 04:31:32PM +0300, Alexander Kanavin wrote:
> Google Code is shutting down soon and distcc has moved to github.
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-devtools/distcc/distcc_3.1.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
> index e4b9313..b598c77 100644
> --- a/meta/recipes-devtools/distcc/distcc_3.1.bb
> +++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
> @@ -17,13 +17,14 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
>  
>  RRECOMMENDS_${PN} = "avahi-daemon"
>  
> -SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
> +SRC_URI = "git://github.com/distcc/distcc.git \
>             file://separatebuilddir.patch \
>             file://0001-zeroconf-Include-fcntl.h.patch \
>             file://default \
>             file://distccmon-gnome.desktop \
>             file://distcc \
>             file://distcc.service"
> +SRCREV = "9a172d3d20042754a30c0cd9a5d63fd1a8120c31"
>  
>  SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
>  SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"

drop

> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

[PATCH 04/26] adt-installer: update SRC_URI to not use Google Code

[Alexander Kanavin]

Google Code is shutting down and opkg tarballs are now available
from yoctoproject.org

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/installer/adt-installer_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 07070b5..c871e42 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -38,7 +38,7 @@ ADT_DIR = "${WORKDIR}/adt-installer/"
 S = "${WORKDIR}/opkg-${PV}"
 
 PV = "0.2.0"
-SRC_URI = "https://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
+SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
            file://wget_cache.patch \
            file://adt_installer \
            file://scripts/adt_installer_internal \
-- 
2.1.4

[PATCH 05/26] ossp-uuid: update SRC_URI to not use Google Code

[Alexander Kanavin]

Google Code is shutting down so tarballs will be fetched from a Debian mirror
instead

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index 33bed75..08926ba 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6a
 
 PR = "r2"
 
-SRC_URI = "http://gnome-build-stage-1.googlecode.com/files/uuid-1.6.2.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \
 	   file://0001-Change-library-name.patch \
 	   file://0002-uuid-preserve-m-option-status-in-v-option-handling.patch \
 	   file://0003-Fix-whatis-entries.patch \
-- 
2.1.4

[PATCH 06/26] eglinfo: change version from 1.0 to 1.0.0 to match the upstream git tag

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/eglinfo/{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb}  | 0
 .../recipes-graphics/eglinfo/{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-graphics/eglinfo/{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb} (100%)
 rename meta/recipes-graphics/eglinfo/{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb} (100%)

diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
similarity index 100%
rename from meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
rename to meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
similarity index 100%
rename from meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
rename to meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
-- 
2.1.4

Re: [PATCH 06/26] eglinfo: change version from 1.0 to 1.0.0 to match the upstream git tag

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]

On Thu, Jul 30, 2015 at 04:31:35PM +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-graphics/eglinfo/{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb}  | 0
>  .../recipes-graphics/eglinfo/{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb} | 0
>  2 files changed, 0 insertions(+), 0 deletions(-)
>  rename meta/recipes-graphics/eglinfo/{eglinfo-fb_1.0.bb => eglinfo-fb_1.0.0.bb} (100%)
>  rename meta/recipes-graphics/eglinfo/{eglinfo-x11_1.0.bb => eglinfo-x11_1.0.0.bb} (100%)
> 
> diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
> similarity index 100%
> rename from meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb
> rename to meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
> diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
> similarity index 100%
> rename from meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
> rename to meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb

Why don't you set PV in eglinfo.inc and rename them to _git.bb?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 06/26] eglinfo: change version from 1.0 to 1.0.0 to match the upstream git tag

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

On 30 July 2015 at 15:31, Martin Jansa <martin.jansa@gmail.com> wrote:

> Why don't you set PV in eglinfo.inc and rename them to _git.bb?
>

I think we're going to need the TSC to resolve the opinion in style here.
Again, when it's a release that just happens to use git, I do prefer
keeping the PV in the filename.

Ross

[-- Attachment #2: Type: text/html, Size: 814 bytes --]

Re: [PATCH 06/26] eglinfo: change version from 1.0 to 1.0.0 to match the upstream git tag

[Alexander Kanavin]

On 07/30/2015 06:02 PM, Burton, Ross wrote:

>     Why don't you set PV in eglinfo.inc and rename them to _git.bb
>     <http://git.bb>?
>
>
> I think we're going to need the TSC to resolve the opinion in style
> here.  Again, when it's a release that just happens to use git, I do
> prefer keeping the PV in the filename.

I agree; it is good to easily tell what is a versioned release, and what 
is a git snapshot. Also, there's less "PV = ..." clutter inside the 
recipe that way.

Alex

[PATCH 07/26] gptfdisk: use tarballs instead of git for fetching source code

[Alexander Kanavin]

git repository does not have version tags, so upstream version check
cannot be performed

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../fdisk/{gptfdisk_git.bb => gptfdisk_0.8.10.bb}                 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb => gptfdisk_0.8.10.bb} (75%)

diff --git a/meta/recipes-devtools/fdisk/gptfdisk_git.bb b/meta/recipes-devtools/fdisk/gptfdisk_0.8.10.bb
similarity index 75%
rename from meta/recipes-devtools/fdisk/gptfdisk_git.bb
rename to meta/recipes-devtools/fdisk/gptfdisk_0.8.10.bb
index 477c1d9..3b94b56 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_git.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_0.8.10.bb
@@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 DEPENDS = "util-linux popt ncurses"
 
-PV = "0.8.10+git${SRCPV}"
-SRCREV = "a920398fa393f9d6301b32b191bc01e086ab8bc8"
-SRC_URI = "git://git.code.sf.net/p/gptfdisk/code"
-
-S = "${WORKDIR}/git"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz"
+SRC_URI[md5sum] = "9cf4246c181c324bdbd553fe9b348373"
+SRC_URI[sha256sum] = "73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b"
 
 do_install() {
     install -d ${D}${sbindir}
-- 
2.1.4

[PATCH 08/26] libmad: use ftp instead of sourceforge for consistency with libid3tag

[Alexander Kanavin]

Both ftp and SF are official code sources, but ftp is less finicky
for upstream version checks.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
index 30937eb..9e08b16 100644
--- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -10,7 +10,7 @@ SECTION = "libs"
 DEPENDS = "libid3tag"
 PR = "r3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \
            file://no-force-mem.patch \
            file://add-pkgconfig.patch \
            file://fix_for_mips_with_gcc-4.5.0.patch \
-- 
2.1.4

[PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Alexander Kanavin]

This allows upstream version check to work

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/lsb/lsb_4.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index 6215b62..171a6c8 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
            file://lsb_pidofproc \
            file://lsb_start_daemon \
            "
+PV = "1.4"
 
 SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
 SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
-- 
2.1.4

Re: [PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

On Thu, Jul 30, 2015 at 04:31:38PM +0300, Alexander Kanavin wrote:
> This allows upstream version check to work
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-extended/lsb/lsb_4.1.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 6215b62..171a6c8 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
>             file://lsb_pidofproc \
>             file://lsb_start_daemon \
>             "
> +PV = "1.4"

And isn't it confusing to say 4.1 in recipe name and 1.4 inside of the
recipe?

>  
>  SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
>  SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Alexander Kanavin]

On 07/30/2015 05:32 PM, Martin Jansa wrote:

>> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
>> index 6215b62..171a6c8 100644
>> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
>> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
>> @@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
>> +PV = "1.4"
>
> And isn't it confusing to say 4.1 in recipe name and 1.4 inside of the
> recipe?

It's confusing to begin with to say the recipe is 4.1, but the tarball 
it fetches is 1.4. I don't see how this makes the confusion much worse, 
but at least it fixes the upstream version check.


Alex

Re: [PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]


> On Jul 30, 2015, at 6:31 AM, Alexander Kanavin <alexander.kanavin@linux.intel.com> wrote:
> 
> This allows upstream version check to work
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> meta/recipes-extended/lsb/lsb_4.1.bb | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 6215b62..171a6c8 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
>            file://lsb_pidofproc \
>            file://lsb_start_daemon \
>            "
> +PV = “1.4”
> 

it will send version backwards, why is this needed ?


> SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
> SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
> --
> 2.1.4
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Alexander Kanavin]

On 08/07/2015 10:21 AM, Khem Raj wrote:

>> This allows upstream version check to work
>>
>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>> ---
>> meta/recipes-extended/lsb/lsb_4.1.bb | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
>> index 6215b62..171a6c8 100644
>> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
>> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
>> @@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
>>             file://lsb_pidofproc \
>>             file://lsb_start_daemon \
>>             "
>> +PV = “1.4”
>>
>
> it will send version backwards, why is this needed ?

See above - "This allows upstream version check to work".

Alex

Re: [PATCH 09/26] lsb: set PV to 1.4 to match upstream tarball version

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]


> On Aug 7, 2015, at 5:09 AM, Alexander Kanavin <alexander.kanavin@linux.intel.com> wrote:
> 
> On 08/07/2015 10:21 AM, Khem Raj wrote:
> 
>>> This allows upstream version check to work
>>> 
>>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>>> ---
>>> meta/recipes-extended/lsb/lsb_4.1.bb | 1 +
>>> 1 file changed, 1 insertion(+)
>>> 
>>> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
>>> index 6215b62..171a6c8 100644
>>> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
>>> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
>>> @@ -21,6 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
>>>            file://lsb_pidofproc \
>>>            file://lsb_start_daemon \
>>>            "
>>> +PV = “1.4”
>>> 
>> 
>> it will send version backwards, why is this needed ?
> 
> See above - "This allows upstream version check to work”.

it seems a futile cause in front of regressing on upgrade policy

> 
> Alex
> 
> 


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

[PATCH 10/26] linux-yocto-dev: only numeric characters are allowed in package versions taken from git

[Alexander Kanavin]

See regexes in get_recipe_pv_without_srcpv() in meta/lib/oe/recipeutils.py

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 0be3089..ab094cc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -36,7 +36,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
 SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 
-LINUX_VERSION ?= "4.1-rc+"
+LINUX_VERSION ?= "4.1"
 LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-- 
2.1.4

[PATCH 11/26] nss: reorder SRC_URI lines to fix upstream version check

[Alexander Kanavin]

The source tarball should be listed first

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/nss/nss.inc       | 2 +-
 meta/recipes-support/nss/nss_3.17.3.bb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index 665e4e6..b21dc39 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -12,7 +12,7 @@ LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
 
 LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
                     file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859"
-SRC_URI = "\
+SRC_URI += "\
     file://nss-fix-support-cross-compiling.patch \
     file://nss-no-rpath-for-cross-compiling.patch \
     file://nss-fix-incorrect-shebang-of-perl.patch \
diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb
index e7d0780..b22eb95 100644
--- a/meta/recipes-support/nss/nss_3.17.3.bb
+++ b/meta/recipes-support/nss/nss_3.17.3.bb
@@ -1,7 +1,7 @@
-require nss.inc
-
-SRC_URI += "\
+SRC_URI = "\
     http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \
 "
 SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1"
 SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"
+
+require nss.inc
-- 
2.1.4

Re: [PATCH 11/26] nss: reorder SRC_URI lines to fix upstream version check

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2103 bytes --]

On Thu, Jul 30, 2015 at 04:31:40PM +0300, Alexander Kanavin wrote:
> The source tarball should be listed first
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-support/nss/nss.inc       | 2 +-
>  meta/recipes-support/nss/nss_3.17.3.bb | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
> index 665e4e6..b21dc39 100644
> --- a/meta/recipes-support/nss/nss.inc
> +++ b/meta/recipes-support/nss/nss.inc
> @@ -12,7 +12,7 @@ LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
>  
>  LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
>                      file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859"
> -SRC_URI = "\
> +SRC_URI += "\
>      file://nss-fix-support-cross-compiling.patch \
>      file://nss-no-rpath-for-cross-compiling.patch \
>      file://nss-fix-incorrect-shebang-of-perl.patch \
> diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb
> index e7d0780..b22eb95 100644
> --- a/meta/recipes-support/nss/nss_3.17.3.bb
> +++ b/meta/recipes-support/nss/nss_3.17.3.bb
> @@ -1,7 +1,7 @@
> -require nss.inc
> -
> -SRC_URI += "\
> +SRC_URI = "\
>      http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \
>  "

Why don't you move this to .inc file and replace "3_17_3_RTM" with some
variable set in .bb, it would be easier to read than this reorder and
require .inc later..

>  SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1"
>  SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"
> +
> +require nss.inc
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 11/26] nss: reorder SRC_URI lines to fix upstream version check

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

On 30 July 2015 at 15:33, Martin Jansa <martin.jansa@gmail.com> wrote:

> Why don't you move this to .inc file and replace "3_17_3_RTM" with some
> variable set in .bb, it would be easier to read than this reorder and
> require .inc later..
>

Joe sent a patch earlier to remove the inc file entirely, so please rebase
on top of that (it's in ross/mut).

Ross

[-- Attachment #2: Type: text/html, Size: 797 bytes --]

Re: [PATCH 11/26] nss: reorder SRC_URI lines to fix upstream version check

[Alexander Kanavin]

On 07/30/2015 06:04 PM, Burton, Ross wrote:

>     Why don't you move this to .inc file and replace "3_17_3_RTM" with some
>     variable set in .bb, it would be easier to read than this reorder and
>     require .inc later..
>
>
> Joe sent a patch earlier to remove the inc file entirely, so please
> rebase on top of that (it's in ross/mut).

Done; after rebasing the patch disappeared altogether :)


Alex

[PATCH 12/26] pseudo: fix upstream SRC_URI to enable upstream version check

[Alexander Kanavin]

Previous URI did not allow directory listings.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/pseudo/pseudo_1.6.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb b/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
index dc55950..b8c20ad 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
@@ -1,7 +1,7 @@
 require pseudo.inc
 
 SRC_URI = " \
-    http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
+    http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \
     file://fallback-passwd \
     file://fallback-group \
 "
-- 
2.1.4

[PATCH 13/26] oprofile: reorder SRC_URI lines to fix upstream version check

[Alexander Kanavin]

The source tarball should be listed first.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/oprofile/oprofile.inc      | 2 +-
 meta/recipes-kernel/oprofile/oprofile_1.0.0.bb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 49e6b16..ff360d1 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -18,7 +18,7 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
 FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
 FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
 
-SRC_URI = "file://filemode-fix.patch \
+SRC_URI += "file://filemode-fix.patch \
            file://acinclude.m4 \
            file://automake-foreign.patch \
            file://oprofile-cross-compile-tests.patch \
diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
index f4a34b3..f75a1dd 100644
--- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
@@ -1,13 +1,13 @@
-require oprofile.inc
-
 DEPENDS += "virtual/kernel"
 DEPENDS_append_powerpc64 = " libpfm4"
 
-SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "ba0b340e5c421a93959776c836ed35b3"
 SRC_URI[sha256sum] = "847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a"
 
+require oprofile.inc
+
 S = "${WORKDIR}/oprofile-${PV}"
 
 PR = "r1"
-- 
2.1.4

Re: [PATCH 13/26] oprofile: reorder SRC_URI lines to fix upstream version check

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2177 bytes --]

On Thu, Jul 30, 2015 at 04:31:42PM +0300, Alexander Kanavin wrote:
> The source tarball should be listed first.
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-kernel/oprofile/oprofile.inc      | 2 +-
>  meta/recipes-kernel/oprofile/oprofile_1.0.0.bb | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
> index 49e6b16..ff360d1 100644
> --- a/meta/recipes-kernel/oprofile/oprofile.inc
> +++ b/meta/recipes-kernel/oprofile/oprofile.inc
> @@ -18,7 +18,7 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
>  FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
>  FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
>  
> -SRC_URI = "file://filemode-fix.patch \
> +SRC_URI += "file://filemode-fix.patch \
>             file://acinclude.m4 \
>             file://automake-foreign.patch \
>             file://oprofile-cross-compile-tests.patch \
> diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
> index f4a34b3..f75a1dd 100644
> --- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
> +++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
> @@ -1,13 +1,13 @@
> -require oprofile.inc
> -
>  DEPENDS += "virtual/kernel"
>  DEPENDS_append_powerpc64 = " libpfm4"
>  
> -SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"

Move this to .inc instead of re-ordering.

>  
>  SRC_URI[md5sum] = "ba0b340e5c421a93959776c836ed35b3"
>  SRC_URI[sha256sum] = "847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a"
>  
> +require oprofile.inc
> +
>  S = "${WORKDIR}/oprofile-${PV}"
>  
>  PR = "r1"
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 13/26] oprofile: reorder SRC_URI lines to fix upstream version check

[Alexander Kanavin]

On 07/30/2015 05:34 PM, Martin Jansa wrote:
>
> Move this to .inc instead of re-ordering.
>

Done.

Alex

[PATCH 14/26] puzzles: switch svn for git, as upstream has done the same

[Alexander Kanavin]

Also, drop puzzles_x32_abi_time.patch as it has been merged upstream

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../puzzles/files/puzzles_x32_abi_time.patch       | 30 ----------------------
 .../puzzles/{puzzles_r10286.bb => puzzles_git.bb}  |  7 ++---
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
 rename meta/recipes-sato/puzzles/{puzzles_r10286.bb => puzzles_git.bb} (89%)

diff --git a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
deleted file mode 100644
index 63ab0b8..0000000
--- a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix printf's for time_t value add castings because ISOC90
-don't support long long int that is used in x32 ABI for 
-time_t.
-
-Upstream-Status: Backport
-
-Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
-
---- a/magnets.c	2015-03-15 11:57:39.106674811 +0000
-+++ b/magnets.c	2015-03-15 11:57:58.638674795 +0000
-@@ -2562,7 +2562,7 @@
-         goto done;
-     }
-     s = new_game(NULL, p, desc);
--    printf("%s:%s (seed %ld)\n", id, desc, seed);
-+    printf("%s:%s (seed %ld)\n", id, desc, (long) seed);
-     if (aux) {
-         /* We just generated this ourself. */
-         if (verbose || print) {
---- a/signpost.c	2015-03-15 11:58:52.866674751 +0000
-+++ b/signpost.c	2015-03-15 11:59:08.190674738 +0000
-@@ -2393,7 +2393,7 @@
-         }
-     }
- 
--    sprintf(newseed, "%lu", time(NULL));
-+    sprintf(newseed, "%lu", (unsigned long) time(NULL));
-     seedstr = dupstr(newseed);
- 
-     if (id || !stdin_desc) {
diff --git a/meta/recipes-sato/puzzles/puzzles_r10286.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
similarity index 89%
rename from meta/recipes-sato/puzzles/puzzles_r10286.bb
rename to meta/recipes-sato/puzzles/puzzles_git.bb
index 1ad8d1b..6346c06 100644
--- a/meta/recipes-sato/puzzles/puzzles_r10286.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -10,12 +10,13 @@ REQUIRED_DISTRO_FEATURES = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
 
-SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \
+SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            file://fix-compiling-failure-with-option-g-O.patch \
-           file://puzzles_x32_abi_time.patch \
 "
+SRCREV = "aa1a9375be96cd8e0f89a670359c3c80ad7cf937"
+PV = "0.0+git${SRCPV}"
 
-S = "${WORKDIR}/${BPN}"
+S = "${WORKDIR}/git"
 
 inherit autotools-brokensep distro_features_check
 
-- 
2.1.4

Re: [PATCH 14/26] puzzles: switch svn for git, as upstream has done the same

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3245 bytes --]

On Thu, Jul 30, 2015 at 04:31:43PM +0300, Alexander Kanavin wrote:
> Also, drop puzzles_x32_abi_time.patch as it has been merged upstream
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../puzzles/files/puzzles_x32_abi_time.patch       | 30 ----------------------
>  .../puzzles/{puzzles_r10286.bb => puzzles_git.bb}  |  7 ++---
>  2 files changed, 4 insertions(+), 33 deletions(-)
>  delete mode 100644 meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
>  rename meta/recipes-sato/puzzles/{puzzles_r10286.bb => puzzles_git.bb} (89%)
> 
> diff --git a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
> deleted file mode 100644
> index 63ab0b8..0000000
> --- a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Fix printf's for time_t value add castings because ISOC90
> -don't support long long int that is used in x32 ABI for 
> -time_t.
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> -
> ---- a/magnets.c	2015-03-15 11:57:39.106674811 +0000
> -+++ b/magnets.c	2015-03-15 11:57:58.638674795 +0000
> -@@ -2562,7 +2562,7 @@
> -         goto done;
> -     }
> -     s = new_game(NULL, p, desc);
> --    printf("%s:%s (seed %ld)\n", id, desc, seed);
> -+    printf("%s:%s (seed %ld)\n", id, desc, (long) seed);
> -     if (aux) {
> -         /* We just generated this ourself. */
> -         if (verbose || print) {
> ---- a/signpost.c	2015-03-15 11:58:52.866674751 +0000
> -+++ b/signpost.c	2015-03-15 11:59:08.190674738 +0000
> -@@ -2393,7 +2393,7 @@
> -         }
> -     }
> - 
> --    sprintf(newseed, "%lu", time(NULL));
> -+    sprintf(newseed, "%lu", (unsigned long) time(NULL));
> -     seedstr = dupstr(newseed);
> - 
> -     if (id || !stdin_desc) {
> diff --git a/meta/recipes-sato/puzzles/puzzles_r10286.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
> similarity index 89%
> rename from meta/recipes-sato/puzzles/puzzles_r10286.bb
> rename to meta/recipes-sato/puzzles/puzzles_git.bb
> index 1ad8d1b..6346c06 100644
> --- a/meta/recipes-sato/puzzles/puzzles_r10286.bb
> +++ b/meta/recipes-sato/puzzles/puzzles_git.bb
> @@ -10,12 +10,13 @@ REQUIRED_DISTRO_FEATURES = "x11"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
>  
> -SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \
> +SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
>             file://fix-compiling-failure-with-option-g-O.patch \
> -           file://puzzles_x32_abi_time.patch \
>  "
> +SRCREV = "aa1a9375be96cd8e0f89a670359c3c80ad7cf937"
> +PV = "0.0+git${SRCPV}"

Doesn't PV go backwards with this?

>  
> -S = "${WORKDIR}/${BPN}"
> +S = "${WORKDIR}/git"
>  
>  inherit autotools-brokensep distro_features_check
>  
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 14/26] puzzles: switch svn for git, as upstream has done the same

[Alexander Kanavin]

On 07/30/2015 05:35 PM, Martin Jansa wrote:

> Doesn't PV go backwards with this?

Yes; Ross should make a suggestion of how to avoid that, and fix the 
upstream check at the same time - for this recipe and others where I 
tweak the PV in a similar manner.

Alex

Re: [PATCH 14/26] puzzles: switch svn for git, as upstream has done the same

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]


> On Jul 30, 2015, at 9:06 AM, Alexander Kanavin <alexander.kanavin@linux.intel.com> wrote:
> 
> On 07/30/2015 05:35 PM, Martin Jansa wrote:
> 
>> Doesn't PV go backwards with this?
> 
> Yes; Ross should make a suggestion of how to avoid that, and fix the upstream check at the same time - for this recipe and others where I tweak the PV in a similar manner.


define PE

> 
> Alex
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH 14/26] puzzles: switch svn for git, as upstream has done the same

[Alexander Kanavin]

On 08/07/2015 10:19 AM, Khem Raj wrote:

>>> Doesn't PV go backwards with this?
>>
>> Yes; Ross should make a suggestion of how to avoid that, and fix the upstream check at the same time - for this recipe and others where I tweak the PV in a similar manner.
>
>
> define PE

Ross said he would like to avoid that; I hope he'll make a comment after 
coming back from holiday.


Alex

[PATCH 15/26] syslinux: drop v6.xx/ from directory path in SRC_URI

[Alexander Kanavin]

This allows upstream version check.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/syslinux/syslinux_6.03.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
index c42f05d..ef9ae2f 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native util-linux e2fsprogs"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.xz \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \
            file://syslinux-fix-parallel-building-issue.patch \
            file://syslinux-libupload-depend-lib.patch \
            file://syslinux-remove-clean-script.patch \
-- 
2.1.4

[PATCH 16/26] shared-mime-info: reorder SRC_URI lines to fix upstream version check

[Alexander Kanavin]

Upstream tarball should be listed first.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
index 3797972..8c4fde8 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
@@ -1,6 +1,6 @@
 require shared-mime-info.inc
 
-SRC_URI =+ "file://parallelmake.patch \
+SRC_URI += "file://parallelmake.patch \
 	    file://install-data-hook.patch"
 
 SRC_URI[md5sum] = "16c02f7b658fff2a9c207406d388ea31"
-- 
2.1.4

[PATCH 17/26] tremor: switch SRC_URI from svn to tarballs on debian mirrors

[Alexander Kanavin]

There is no support for checking svn repositories for new commits, so
let's use debian tarballs and assume that Debian has a dedicated maintainer
who would check the upstream now and then.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{tremor-20120314 => tremor}/obsolete_automake_macros.patch      | 0
 .../tremor/{tremor-20120314 => tremor}/tremor-arm-thumb2.patch      | 0
 .../tremor/{tremor_20120314.bb => tremor_18153.bb}                  | 6 ++++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/obsolete_automake_macros.patch (100%)
 rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/tremor-arm-thumb2.patch (100%)
 rename meta/recipes-multimedia/tremor/{tremor_20120314.bb => tremor_18153.bb} (66%)

diff --git a/meta/recipes-multimedia/tremor/tremor-20120314/obsolete_automake_macros.patch b/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
similarity index 100%
rename from meta/recipes-multimedia/tremor/tremor-20120314/obsolete_automake_macros.patch
rename to meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
diff --git a/meta/recipes-multimedia/tremor/tremor-20120314/tremor-arm-thumb2.patch b/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
similarity index 100%
rename from meta/recipes-multimedia/tremor/tremor-20120314/tremor-arm-thumb2.patch
rename to meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
diff --git a/meta/recipes-multimedia/tremor/tremor_20120314.bb b/meta/recipes-multimedia/tremor/tremor_18153.bb
similarity index 66%
rename from meta/recipes-multimedia/tremor/tremor_20120314.bb
rename to meta/recipes-multimedia/tremor/tremor_18153.bb
index afc78ac..c27fe8c 100644
--- a/meta/recipes-multimedia/tremor/tremor_20120314.bb
+++ b/meta/recipes-multimedia/tremor/tremor_18153.bb
@@ -8,12 +8,14 @@ DEPENDS = "libogg"
 SRCDATE = "${PV}"
 PR = "r1"
 
-SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=18221;protocol=http \
+SRC_URI = "${DEBIAN_MIRROR}/main/libv/libvorbisidec/libvorbisidec_1.0.2+svn${PV}.orig.tar.gz \
            file://obsolete_automake_macros.patch;striplevel=0 \
            file://tremor-arm-thumb2.patch \
 "
+SRC_URI[md5sum] = "4190859414c5d6760e316b5cf00fe7c5"
+SRC_URI[sha256sum] = "4dc8c224289da3479fc10ce4e49ffbb85c790eb2fe55ef480934a265ee0a6782"
 
-S = "${WORKDIR}/Tremor"
+S = "${WORKDIR}/libvorbisidec-1.0.2+svn${PV}"
 
 inherit autotools pkgconfig
 
-- 
2.1.4

Re: [PATCH 17/26] tremor: switch SRC_URI from svn to tarballs on debian mirrors

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3054 bytes --]

On Thu, Jul 30, 2015 at 04:31:46PM +0300, Alexander Kanavin wrote:
> There is no support for checking svn repositories for new commits, so
> let's use debian tarballs and assume that Debian has a dedicated maintainer
> who would check the upstream now and then.
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../{tremor-20120314 => tremor}/obsolete_automake_macros.patch      | 0
>  .../tremor/{tremor-20120314 => tremor}/tremor-arm-thumb2.patch      | 0
>  .../tremor/{tremor_20120314.bb => tremor_18153.bb}                  | 6 ++++--
>  3 files changed, 4 insertions(+), 2 deletions(-)
>  rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/obsolete_automake_macros.patch (100%)
>  rename meta/recipes-multimedia/tremor/{tremor-20120314 => tremor}/tremor-arm-thumb2.patch (100%)
>  rename meta/recipes-multimedia/tremor/{tremor_20120314.bb => tremor_18153.bb} (66%)
> 
> diff --git a/meta/recipes-multimedia/tremor/tremor-20120314/obsolete_automake_macros.patch b/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
> similarity index 100%
> rename from meta/recipes-multimedia/tremor/tremor-20120314/obsolete_automake_macros.patch
> rename to meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
> diff --git a/meta/recipes-multimedia/tremor/tremor-20120314/tremor-arm-thumb2.patch b/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
> similarity index 100%
> rename from meta/recipes-multimedia/tremor/tremor-20120314/tremor-arm-thumb2.patch
> rename to meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
> diff --git a/meta/recipes-multimedia/tremor/tremor_20120314.bb b/meta/recipes-multimedia/tremor/tremor_18153.bb
> similarity index 66%
> rename from meta/recipes-multimedia/tremor/tremor_20120314.bb
> rename to meta/recipes-multimedia/tremor/tremor_18153.bb
> index afc78ac..c27fe8c 100644
> --- a/meta/recipes-multimedia/tremor/tremor_20120314.bb
> +++ b/meta/recipes-multimedia/tremor/tremor_18153.bb

PV going backwards isn't acceptable for package feeds

> @@ -8,12 +8,14 @@ DEPENDS = "libogg"
>  SRCDATE = "${PV}"
>  PR = "r1"
>  
> -SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=18221;protocol=http \
> +SRC_URI = "${DEBIAN_MIRROR}/main/libv/libvorbisidec/libvorbisidec_1.0.2+svn${PV}.orig.tar.gz \
>             file://obsolete_automake_macros.patch;striplevel=0 \
>             file://tremor-arm-thumb2.patch \
>  "
> +SRC_URI[md5sum] = "4190859414c5d6760e316b5cf00fe7c5"
> +SRC_URI[sha256sum] = "4dc8c224289da3479fc10ce4e49ffbb85c790eb2fe55ef480934a265ee0a6782"
>  
> -S = "${WORKDIR}/Tremor"
> +S = "${WORKDIR}/libvorbisidec-1.0.2+svn${PV}"
>  
>  inherit autotools pkgconfig
>  
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

[PATCH 18/26] x264: only numeric characters are allowed in package versions taken from git

[Alexander Kanavin]

See regexes in get_recipe_pv_without_srcpv() in meta/lib/oe/recipeutils.py

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 0a69909..cd29d72 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://git.videolan.org/x264.git \
 
 SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6"
 
-PV = "r2491+git${SRCPV}"
+PV = "2491+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
2.1.4

[PATCH 19/26] xf86-video-omapfb: switch SRC_URI to debian git repo

[Alexander Kanavin]

The previous upstream is no longer available.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 4ad2538..e649270 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -13,7 +13,7 @@ SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
 PR = "${INC_PR}.7"
 PV = "0.1.1+gitr${SRCPV}"
 
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
+SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \
   file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \
   file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \
   file://0003-force-plain-mode.patch \
-- 
2.1.4

Re: [PATCH 19/26] xf86-video-omapfb: switch SRC_URI to debian git repo

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 634 bytes --]

On 30 July 2015 at 14:31, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> @@ -13,7 +13,7 @@ SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
>  PR = "${INC_PR}.7"
>  PV = "0.1.1+gitr${SRCPV}"
>
> -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
> +SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \
>

Produces this on the autobuilder:

ERROR: Fetcher failure: Unable to find revision
28c006c94e57ea71df11ec4fff79d7ffcfc4860f in branch master even from upstream

(attempting to pack right now, so can't check if thats transient or a
genuine failure)

Ross

[-- Attachment #2: Type: text/html, Size: 1459 bytes --]

[PATCH 20/26] stress: use developer's website for SRC_URI

[Alexander Kanavin]

So that upstream version check happens at the upstream, not
at Fedora's build servers.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/stress/stress_1.0.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb
index 44f2fc6..df96fc0 100644
--- a/meta/recipes-extended/stress/stress_1.0.4.bb
+++ b/meta/recipes-extended/stress/stress_1.0.4.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://people.seas.harvard.edu/~apw/stress/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/stress/stress-${PV}.tar.gz/a607afa695a511765b40993a64c6e2f4/stress-${PV}.tar.gz \
+SRC_URI = "http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \
            file://texinfo.patch \
            "
 
-- 
2.1.4

Re: [PATCH 20/26] stress: use developer's website for SRC_URI

[Max Krummenacher]

Hi Alexander


Please note that the package has now a changed file COPYING for GPLv3
(but the sources still reference GPLv2)

So unless you still have stress-1.0.4.tar.gz in your download folder
the package checksums and LIC_FILES_CHKSUM will throw an error/warning
and then fallback successfully to the OE mirror.


Regards
Max
Am Donnerstag, den 30.07.2015, 16:31 +0300 schrieb Alexander Kanavin:
> So that upstream version check happens at the upstream, not
> at Fedora's build servers.
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-extended/stress/stress_1.0.4.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb
> index 44f2fc6..df96fc0 100644
> --- a/meta/recipes-extended/stress/stress_1.0.4.bb
> +++ b/meta/recipes-extended/stress/stress_1.0.4.bb
> @@ -4,7 +4,7 @@ HOMEPAGE = "http://people.seas.harvard.edu/~apw/stress/"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>  
> -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/stress/stress-${PV}.tar.gz/a607afa695a511765b40993a64c6e2f4/stress-${PV}.tar.gz \
> +SRC_URI = "http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \
>             file://texinfo.patch \
>             "
>  
> -- 
> 2.1.4
> 

Re: [PATCH 20/26] stress: use developer's website for SRC_URI

[Alexander Kanavin]

On 07/30/2015 08:45 PM, Max Krummenacher wrote:
> Please note that the package has now a changed file COPYING for GPLv3
> (but the sources still reference GPLv2)
>
> So unless you still have stress-1.0.4.tar.gz in your download folder
> the package checksums and LIC_FILES_CHKSUM will throw an error/warning
> and then fallback successfully to the OE mirror.
>> -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/stress/stress-${PV}.tar.gz/a607afa695a511765b40993a64c6e2f4/stress-${PV}.tar.gz \
>> +SRC_URI = "http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \
>>              file://texinfo.patch \
>>              "


That's right. Fedora's tarball has a GPLv3 COPYING in it, while upstream 
tarball has GPLv2 (the source trees are otherwise identical).

I've updated all the checksums in the recipe to match upstream tarball.


Alex

[PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

It is unnecessary because the recipe filename already contains it.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/systemd/systemd_219.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 83e4bce..148a077 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -27,8 +27,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern
 
 SRCREV = "85a6fabdd3e43cfab0fc6359e9f2a9e368d4a3ed"
 
-PV = "219-stable+git${SRCPV}"
-
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stable;protocol=git \
            file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \
            file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
-- 
2.1.4

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1340 bytes --]

On Thu, Jul 30, 2015 at 04:31:50PM +0300, Alexander Kanavin wrote:
> It is unnecessary because the recipe filename already contains it.

No, it contains only 219

> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-core/systemd/systemd_219.bb | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> index 83e4bce..148a077 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -27,8 +27,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern
>  
>  SRCREV = "85a6fabdd3e43cfab0fc6359e9f2a9e368d4a3ed"
>  
> -PV = "219-stable+git${SRCPV}"
> -
>  SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stable;protocol=git \
>             file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \
>             file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

On 07/30/2015 05:36 PM, Martin Jansa wrote:
> On Thu, Jul 30, 2015 at 04:31:50PM +0300, Alexander Kanavin wrote:
>> It is unnecessary because the recipe filename already contains it.
>
> No, it contains only 219
>> -PV = "219-stable+git${SRCPV}"

The idea here is that we only need the basic version, if the revision 
being fetched matches that version, and there is no need for all that 
git revision clutter in the version string.

Alex

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

On 30 July 2015 at 16:32, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> No, it contains only 219
>>
>>> -PV = "219-stable+git${SRCPV}"
>>>
>>
> The idea here is that we only need the basic version, if the revision
> being fetched matches that version, and there is no need for all that git
> revision clutter in the version string.
>

For the release tag I'd agree with you, but as 219 < 219-stable we can't
just change this now (without adding an epoch, and adding epochs are evil).

Does the RRS have a way of mapping a PV to something that can be used in
the upstream comparison?

Ross

[-- Attachment #2: Type: text/html, Size: 1315 bytes --]

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

On 07/30/2015 07:25 PM, Burton, Ross wrote:

> For the release tag I'd agree with you, but as 219 < 219-stable we can't
> just change this now (without adding an epoch, and adding epochs are evil).
>
> Does the RRS have a way of mapping a PV to something that can be used in
> the upstream comparison?

I just noticed that specifically systemd-stable repository does not have 
release tags for new versions at all, and just adds branches for newer 
versions:

http://cgit.freedesktop.org/systemd/systemd-stable/

RRS does not support branch names as indication of "new releases" (and 
it shouldn't IMO), so maybe this patch can be simply dropped, and 
systemd will not have automatic upstream-check.


Alex

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Pascal Bach]

Hi

Am 30.07.2015 um 18:35 schrieb Alexander Kanavin:
> On 07/30/2015 07:25 PM, Burton, Ross wrote:
>
>> For the release tag I'd agree with you, but as 219 < 219-stable we can't
>> just change this now (without adding an epoch, and adding epochs are evil).
>>
>> Does the RRS have a way of mapping a PV to something that can be used in
>> the upstream comparison?
>
> I just noticed that specifically systemd-stable repository does not have release tags for new versions at all, and just adds branches for newer versions:
>
> http://cgit.freedesktop.org/systemd/systemd-stable/
>
New tags for systemd are created but not on the repository above but on their git repository:
https://github.com/systemd/systemd

I think this is the now main repository.

Pascal

> RRS does not support branch names as indication of "new releases" (and it shouldn't IMO), so maybe this patch can be simply dropped, and systemd will not have automatic upstream-check.
>
>
> Alex
>

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

On 07/31/2015 03:40 PM, Pascal Bach wrote:

>> I just noticed that specifically systemd-stable repository does not have release tags for new versions at all, and just adds branches for newer versions:
>>
>> http://cgit.freedesktop.org/systemd/systemd-stable/
>>
> New tags for systemd are created but not on the repository above but on their git repository:
> https://github.com/systemd/systemd
>
> I think this is the now main repository.

The idea behind systemd-stable repository is described here:
http://www.freedesktop.org/wiki/Software/systemd/Backports/

However, it hasn't received any new commits since early May, and still 
stuck at v219, so should we update to a new version from the main 
repository? What's oe-core policy here?


Alex

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Pascal Bach]

> The idea behind systemd-stable repository is described here:
> http://www.freedesktop.org/wiki/Software/systemd/Backports/
>
Thanks I didn't know that.

> However, it hasn't received any new commits since early May, and still stuck at v219, so should we update to a new version from the main repository? What's oe-core policy here?
>
Not sure what would be the right appreoach, I would also be interested to hear the policy of oe-core for this.

Pascal

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

On 07/31/2015 03:53 PM, Alexander Kanavin wrote:

> The idea behind systemd-stable repository is described here:
> http://www.freedesktop.org/wiki/Software/systemd/Backports/
>
> However, it hasn't received any new commits since early May, and still
> stuck at v219, so should we update to a new version from the main
> repository? What's oe-core policy here?

Ah, the systemd-stable repo has also moved to 
https://github.com/systemd/systemd-stable

It has new commits, but still no tags and no versions newer than v219.

Alex

Re: [PATCH 21/26] systemd: remove PV from the recipe

[Alexander Kanavin]

On 07/30/2015 07:25 PM, Burton, Ross wrote:

> For the release tag I'd agree with you, but as 219 < 219-stable we can't
> just change this now (without adding an epoch, and adding epochs are evil).
>
> Does the RRS have a way of mapping a PV to something that can be used in
> the upstream comparison?


I don't really know, but I agree that something like RRS_PV would be 
good to have (and if it's absent then RRS will fall back to PV of course).

Anibal, what's your take?


Alex

[PATCH 22/26] unzip, zip: fix PV to allow upstream version check

[Alexander Kanavin]

Upstream does not separate major and minor version numbers in the tarball
filename, so the best we can do is to squash them together as well :-/

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/unzip/unzip_6.0.bb | 3 ++-
 meta/recipes-extended/zip/zip.inc        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index 4a0a713..8ac3745 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29"
 PE = "1"
 PR = "r5"
 
-SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \
+PV = "60"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tgz \
 	file://avoid-strip.patch \
 	file://define-ldflags.patch \
 	file://06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch \
diff --git a/meta/recipes-extended/zip/zip.inc b/meta/recipes-extended/zip/zip.inc
index 6221c5e..5e92daa 100644
--- a/meta/recipes-extended/zip/zip.inc
+++ b/meta/recipes-extended/zip/zip.inc
@@ -5,7 +5,8 @@ SECTION = "console/utils"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
 
-SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.', '')}.tgz"
+PV = "30"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${PV}.tgz"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
 		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-- 
2.1.4

[PATCH 23/26] guilt-native: set PV in the recipe to allow upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/guilt/guilt-native_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/guilt/guilt-native_git.bb b/meta/recipes-devtools/guilt/guilt-native_git.bb
index dfb3378..b63c68c 100644
--- a/meta/recipes-devtools/guilt/guilt-native_git.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_git.bb
@@ -8,7 +8,7 @@ inherit native
 SRC_URI = "git://repo.or.cz/guilt.git \
            file://guilt-bash.patch \
            "
-
+PV = "0.35+git${SRCPV}"
 SRCREV = "c2a5bae511c6d5354aa4e1cb59069c31df2b8eeb"
 
 S = "${WORKDIR}/git"
-- 
2.1.4

[PATCH 24/26] distrodata.bbclass: do not skip -native recipes in checkpkg task

[Alexander Kanavin]

Some recipes are available only in the -native flavour, and we need to
check their upstream version too from the command line.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distrodata.bbclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index a228242..af3af33 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -218,9 +218,6 @@ python checkpkg_eventhandler() {
                     header = row
                     continue
 
-                if '-native' in pn or 'nativesdk-' in pn:
-                    continue
-
                 if not pn in package_dict.keys():
                     package_dict[pn] = row
             f.close()
-- 
2.1.4

[PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[Alexander Kanavin]

That function is intended for use with git sources and contains some restrictive regexes
that don't work correctly when there are alphabetic characters in the version string.
We can simply compare the versions directly.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distrodata.bbclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index af3af33..d33187b 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -341,10 +341,7 @@ python do_checkpkg() {
         if not pupver:
             pupver = "N/A"
         else:
-            pv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pversion, uri_type)
-            upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
-
-            cmp = vercmp_string(pv, upv)
+            cmp = vercmp_string(pversion, pupver)
             if cmp == -1:
                 pstatus = "UPDATE"
             elif cmp == 0:
-- 
2.1.4

Re: [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[Aníbal Limón]

Hi Alexander,

I added get_recipe_pv_without_srcpv for compare git versions because 
vercmp_string
don't take into account git versioning (git, gitAUTOINC) causing wrong 
comparisons.

We need to review if removal don't affect the current upstream detection.

Regards,
     alimon

On 30/07/15 08:31, Alexander Kanavin wrote:
> That function is intended for use with git sources and contains some restrictive regexes
> that don't work correctly when there are alphabetic characters in the version string.
> We can simply compare the versions directly.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>   meta/classes/distrodata.bbclass | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
> index af3af33..d33187b 100644
> --- a/meta/classes/distrodata.bbclass
> +++ b/meta/classes/distrodata.bbclass
> @@ -341,10 +341,7 @@ python do_checkpkg() {
>           if not pupver:
>               pupver = "N/A"
>           else:
> -            pv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pversion, uri_type)
> -            upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
> -
> -            cmp = vercmp_string(pv, upv)
> +            cmp = vercmp_string(pversion, pupver)
>               if cmp == -1:
>                   pstatus = "UPDATE"
>               elif cmp == 0:

Re: [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[Alexander Kanavin]

On 07/31/2015 05:54 PM, Aníbal Limón wrote:
> I added get_recipe_pv_without_srcpv for compare git versions because
> vercmp_string
> don't take into account git versioning (git, gitAUTOINC) causing wrong
> comparisons.
>
> We need to review if removal don't affect the current upstream detection.

These are the regex strings that get_recipe_pv_without_srcpv() is using:

for git sources:
git_regex = 
re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)")

for everything else:
regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))")

Both regular expressions are too restrictive in allowing only numeric 
characters in the <ver> component. If you try to match, say 3.1rc1 and 
3.1rc2, they will be both stripped of the '.rcN part, <ver> will be set 
to 3, and vercmp_string will of course say they match!

Alex

Re: [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[Aníbal Limón]

On 31/07/15 10:09, Alexander Kanavin wrote:
> On 07/31/2015 05:54 PM, Aníbal Limón wrote:
>> I added get_recipe_pv_without_srcpv for compare git versions because
>> vercmp_string
>> don't take into account git versioning (git, gitAUTOINC) causing wrong
>> comparisons.
>>
>> We need to review if removal don't affect the current upstream 
>> detection.
>
> These are the regex strings that get_recipe_pv_without_srcpv() is using:
>
> for git sources:
> git_regex = 
> re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)")
>
> for everything else:
> regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))")
>
> Both regular expressions are too restrictive in allowing only numeric 
> characters in the <ver> component. If you try to match, say 3.1rc1 and 
> 3.1rc2, they will be both stripped of the '.rcN part, <ver> will be 
> set to 3, and vercmp_string will of course say they match!

In this case we need to add rcN into the regex because if you cmp 
something like,

 >>> import bb
 >>> bb.utils.vercmp_string('3.0+gitX', '2.9+gitX')

It returns 1 that means 2.9+gitX is greater than 3.0+gitX.

     alimon

>
> Alex

Re: [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[Aníbal Limón]

On 31/07/15 10:31, Aníbal Limón wrote:
>
>
> On 31/07/15 10:09, Alexander Kanavin wrote:
>> On 07/31/2015 05:54 PM, Aníbal Limón wrote:
>>> I added get_recipe_pv_without_srcpv for compare git versions because
>>> vercmp_string
>>> don't take into account git versioning (git, gitAUTOINC) causing wrong
>>> comparisons.
>>>
>>> We need to review if removal don't affect the current upstream 
>>> detection.
>>
>> These are the regex strings that get_recipe_pv_without_srcpv() is using:
>>
>> for git sources:
>> git_regex = 
>> re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)")
>>
>> for everything else:
>> regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))")
>>
>> Both regular expressions are too restrictive in allowing only numeric 
>> characters in the <ver> component. If you try to match, say 3.1rc1 
>> and 3.1rc2, they will be both stripped of the '.rcN part, <ver> will 
>> be set to 3, and vercmp_string will of course say they match!
>
> In this case we need to add rcN into the regex because if you cmp 
> something like,
>
> >>> import bb
> >>> bb.utils.vercmp_string('3.0+gitX', '2.9+gitX')
>
> It returns 1 that means 2.9+gitX is greater than 3.0+gitX.
>
>     alimon

I made a mistake here the case that i say is when have a prefix like,

 >>> import bb
 >>> bb.utils.vercmp_string('r2.7+gitX', '2.9+gitX')

     alimon

>
>>
>> Alex
>

Re: [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

[alexander.kanavin]

>>> re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)")
>>> regex = re.compile("(?P<pfx>(v|r|))(?P<ver>((\d+[\.\-_]*)+))")
> I made a mistake here the case that i say is when have a prefix like,
>
>  >>> import bb
>  >>> bb.utils.vercmp_string('r2.7+gitX', '2.9+gitX')

But the <pfx> component should take care of any such leading characters,
right? So when they are taken out, there is no reason to limit the rest to
just numbers. I'll send a patch which changes the regexes to allow "pre",
"rc", "final", "stable", or anything else like "1.0.2a". We can't hardcode
everything that people can come up with, so it's best to write a generic
regex.

Alex

[PATCH 26/26] distrodata.bbclass: drop the manual upstream version check logic

[Alexander Kanavin]

It's already taken care of in meta/lib/oe/recipeutils.py

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/classes/distrodata.bbclass | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index d33187b..7cb7736 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -347,23 +347,6 @@ python do_checkpkg() {
             elif cmp == 0:
                 pstatus = "MATCH"
 
-        """Read from manual distro tracking fields as alternative"""
-        pmver = d.getVar("RECIPE_UPSTREAM_VERSION", True)
-        if not pmver:
-            pmver = "N/A"
-            pmstatus = "ErrNoRecipeData"
-        else:
-            mpv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pmver, uri_type)
-            upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
-
-            cmp = vercmp_string(mpv, upv)
-            if cmp == -1:
-                pmstatus = "UPDATE"
-            elif cmp == 0:
-                pmstatus = "MATCH"
-            else:
-                pmstatus = ""
-
         psrcuri = psrcuri.split()[0]
         pdepends = "".join(pdepends.split("\t"))
         pdesc = "".join(pdesc.split("\t"))
@@ -372,7 +355,7 @@ python do_checkpkg() {
         with open(logfile, "a") as f:
             writer = csv.writer(f, delimiter='\t')
             writer.writerow([pname, pversion, pupver, plicense, psection, phome, 
-                prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pmver, 
+                prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pupver,
                 psrcuri, maintainer, no_upgr_reason])
             f.close()
         bb.utils.unlockfile(lf)
-- 
2.1.4