[PATCH 1/6] meta-selftest: fix upstream version checks for devtool test recipes

[PATCH 1/6] meta-selftest: fix upstream version checks for devtool test recipes

[Alexander Kanavin]

So that they're reported correctly when checking 'universe' for
latest upstream versions.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb       | 1 +
 meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb | 2 ++
 meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb   | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
index e45ee9f60a0..fc3799590cc 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
@@ -6,6 +6,7 @@ DEPENDS = "libxres libxext virtual/libx11 ncurses"
 SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-0.4.tar.gz \
            file://readme.patch.gz \
            "
+UPSTREAM_VERSION_UNKNOWN = "1"
 
 S = "${WORKDIR}/xrestop-0.4"
 
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
index 4049be292b4..333ecac7ed8 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
 
 SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz \
            file://0001-Add-a-note-line-to-the-quick-reference.patch"
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
 SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
 SRC_URI[sha256sum] = "681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
index 450636ef182..07b83276fb9 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
@@ -12,6 +12,8 @@ PV = "0.1+git${SRCPV}"
 PR = "r2"
 
 SRC_URI = "git://git.yoctoproject.org/dbus-wait"
+UPSTREAM_CHECK_COMMITS = "1"
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
 S = "${WORKDIR}/git"
 
-- 
2.15.0

[PATCH 2/6] cdrtools-native: fix upstream version check

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
index 0e0be627108..78e1565e474 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
@@ -8,6 +8,7 @@ LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${REALPV}.tar.bz2"
+UPSTREAM_VERSION_UNKNOWN = "1"
 
 SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b"
 SRC_URI[sha256sum] = "ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f"
-- 
2.15.0

[PATCH 3/6] m4-native: fix upstream version check

[Alexander Kanavin]

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

diff --git a/meta/recipes-devtools/m4/m4-native_1.4.18.bb b/meta/recipes-devtools/m4/m4-native_1.4.18.bb
index 06d8aa244e5..407ad89330e 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.18.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.18.bb
@@ -11,3 +11,4 @@ do_configure()  {
 	oe_runconf
 }
 
+UPSTREAM_CHECK_URI = "${GNU_MIRROR}/m4/"
-- 
2.15.0

[PATCH 4/6] opkg-utils: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
index 646cc8ff9a8..514ba7912a3 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
@@ -11,6 +11,8 @@ SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV
            file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
 "
 SRC_URI_append_class-native = " file://tar_ignore_error.patch"
+UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"
+
 
 SRC_URI[md5sum] = "a19e09c79bf1152aac62e8a120d679ff"
 SRC_URI[sha256sum] = "7f4b08912e26a3f4f6f423f3b4e7157a73b1f3a7483fc59b216d1a80b50b0c38"
-- 
2.15.0

[PATCH 5/6] kern-tools-native: fix upstream version check

[Alexander Kanavin]

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

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 3a3992a2927..8ccd8cee146 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -12,6 +12,7 @@ inherit native
 
 SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git"
 S = "${WORKDIR}"
+UPSTREAM_CHECK_COMMITS = "1"
 
 do_compile() { 
 	:
-- 
2.15.0

[PATCH 6/6] neon: remove the recipe

[Alexander Kanavin]

For these reasons:
1) Upstream website has been dead for quite a while now;
2) Nothing is actually using neon in oe-core, except one gstreamer plugin in gst-plugins-bad
(and I couldn't find evidence of that plugin being used anywhere)

However, the recipe is still required by libmusicbrainz in meta-oe and so it will be moved there
(with the tarball taken from debian).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../packagegroups/packagegroup-self-hosted.bb      |  1 -
 .../packagegroups/packagegroup-core-lsb.bb         |  1 -
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |  2 +-
 meta/recipes-support/neon/neon/pkgconfig.patch     | 15 ---------
 meta/recipes-support/neon/neon_0.30.2.bb           | 38 ----------------------
 5 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 meta/recipes-support/neon/neon/pkgconfig.patch
 delete mode 100644 meta/recipes-support/neon/neon_0.30.2.bb

diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index ff42866e327..adb0c56c3a5 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -136,7 +136,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
     mtools \
     ncurses \
     ncurses-terminfo-base \
-    neon \
     nfs-utils \
     nfs-utils-client \
     openssl \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 5baaf351e18..e1f34d5af11 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -68,7 +68,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
     mc-helpers-perl \
     mdadm \
     minicom \
-    neon \
     parted \
     quota \
     screen \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 7be15d99731..ca2ea9e963a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -22,7 +22,7 @@ PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
-    bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \
+    bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \
 "
 
 PACKAGECONFIG[assrender]       = "--enable-assrender,--disable-assrender,libass"
diff --git a/meta/recipes-support/neon/neon/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch
deleted file mode 100644
index 239dba8e255..00000000000
--- a/meta/recipes-support/neon/neon/pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- neon.pc.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- neon-0.30.1.orig/neon.pc.in
-+++ neon-0.30.1/neon.pc.in
-@@ -7,5 +7,5 @@ Name: neon
- Description: HTTP/WebDAV client library
- Version: @NEON_VERSION@
- Libs: -L${libdir} -lneon @NEON_PC_LIBS@
--Libs.private: @NEON_LIBS@
-+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls
- Cflags: -I${includedir}/neon @NEON_CFLAGS@
diff --git a/meta/recipes-support/neon/neon_0.30.2.bb b/meta/recipes-support/neon/neon_0.30.2.bb
deleted file mode 100644
index 5792c56f3aa..00000000000
--- a/meta/recipes-support/neon/neon_0.30.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "An HTTP and WebDAV client library with a C interface"
-HOMEPAGE = "http://www.webdav.org/neon/"
-SECTION = "libs"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
-                    file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
-
-SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
-           file://pkgconfig.patch \
-          "
-
-SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
-SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
-
-inherit autotools binconfig-disabled lib_package pkgconfig
-
-# Enable gnutls or openssl, not both
-PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
-PACKAGECONFIG_class-native = "expat gnutls webdav zlib"
-
-PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
-PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
-PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
-PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
-PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
-PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
-PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
-PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-
-EXTRA_OECONF += "--enable-shared"
-
-do_compile_append() {
-	oe_runmake -C test
-}
-
-BINCONFIG = "${bindir}/neon-config"
-
-BBCLASSEXTEND = "native"
-- 
2.15.0

Re: [PATCH 6/6] neon: remove the recipe

[Maxin B. John]

Hi,

It will be good to remove references of neon from 'distro_alias.inc' and 'maintainers.inc' as well.

Acked-by: Maxin B. John <maxin.john@intel.com>

On Wed, Nov 22, 2017 at 06:32:33PM +0200, Alexander Kanavin wrote:
> For these reasons:
> 1) Upstream website has been dead for quite a while now;
> 2) Nothing is actually using neon in oe-core, except one gstreamer plugin in gst-plugins-bad
> (and I couldn't find evidence of that plugin being used anywhere)

generally, neonhttpsrc can be replaced by souphttpsrc or giosrc. 

> However, the recipe is still required by libmusicbrainz in meta-oe and so it will be moved there
> (with the tarball taken from debian).
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../packagegroups/packagegroup-self-hosted.bb      |  1 -
>  .../packagegroups/packagegroup-core-lsb.bb         |  1 -
>  .../gstreamer/gstreamer1.0-plugins-bad.inc         |  2 +-
>  meta/recipes-support/neon/neon/pkgconfig.patch     | 15 ---------
>  meta/recipes-support/neon/neon_0.30.2.bb           | 38 ----------------------
>  5 files changed, 1 insertion(+), 56 deletions(-)
>  delete mode 100644 meta/recipes-support/neon/neon/pkgconfig.patch
>  delete mode 100644 meta/recipes-support/neon/neon_0.30.2.bb
> 
> diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> index ff42866e327..adb0c56c3a5 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> @@ -136,7 +136,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
>      mtools \
>      ncurses \
>      ncurses-terminfo-base \
> -    neon \
>      nfs-utils \
>      nfs-utils-client \
>      openssl \
> diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
> index 5baaf351e18..e1f34d5af11 100644
> --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
> @@ -68,7 +68,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
>      mc-helpers-perl \
>      mdadm \
>      minicom \
> -    neon \
>      parted \
>      quota \
>      screen \
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
> index 7be15d99731..ca2ea9e963a 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
> @@ -22,7 +22,7 @@ PACKAGECONFIG ??= " \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
> -    bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \
> +    bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \
>  "
>  
>  PACKAGECONFIG[assrender]       = "--enable-assrender,--disable-assrender,libass"
> diff --git a/meta/recipes-support/neon/neon/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch
> deleted file mode 100644
> index 239dba8e255..00000000000
> --- a/meta/recipes-support/neon/neon/pkgconfig.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> ----
> - neon.pc.in |    2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> ---- neon-0.30.1.orig/neon.pc.in
> -+++ neon-0.30.1/neon.pc.in
> -@@ -7,5 +7,5 @@ Name: neon
> - Description: HTTP/WebDAV client library
> - Version: @NEON_VERSION@
> - Libs: -L${libdir} -lneon @NEON_PC_LIBS@
> --Libs.private: @NEON_LIBS@
> -+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls
> - Cflags: -I${includedir}/neon @NEON_CFLAGS@
> diff --git a/meta/recipes-support/neon/neon_0.30.2.bb b/meta/recipes-support/neon/neon_0.30.2.bb
> deleted file mode 100644
> index 5792c56f3aa..00000000000
> --- a/meta/recipes-support/neon/neon_0.30.2.bb
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -SUMMARY = "An HTTP and WebDAV client library with a C interface"
> -HOMEPAGE = "http://www.webdav.org/neon/"
> -SECTION = "libs"
> -LICENSE = "LGPLv2+"
> -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
> -                    file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
> -
> -SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
> -           file://pkgconfig.patch \
> -          "
> -
> -SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
> -SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
> -
> -inherit autotools binconfig-disabled lib_package pkgconfig
> -
> -# Enable gnutls or openssl, not both
> -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
> -PACKAGECONFIG_class-native = "expat gnutls webdav zlib"
> -
> -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
> -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
> -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
> -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
> -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
> -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
> -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
> -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
> -
> -EXTRA_OECONF += "--enable-shared"
> -
> -do_compile_append() {
> -	oe_runmake -C test
> -}
> -
> -BINCONFIG = "${bindir}/neon-config"
> -
> -BBCLASSEXTEND = "native"
> -- 
> 2.15.0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 6/6] neon: remove the recipe

[Alexander Kanavin]

On 11/23/2017 01:28 PM, Maxin B. John wrote:
> It will be good to remove references of neon from 'distro_alias.inc' and 'maintainers.inc' as well.

To be honest, those two files are inconsistent for many other recipes, 
and we need a general solution for them. I think removing 
distro_alias.inc was discussed, and maintainers.inc content can be 
splitted into individual recipes (using a custom tool perhaps).


Alex