* [PATCH 0/8] Deprecate package_regex.inc and split it into recipes
@ 2015-11-18 9:52 Alexander Kanavin
2015-11-18 9:52 ` [PATCH 1/8] package_regex.inc: deprecate the file Alexander Kanavin
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
This patch series deprecates package_regex.inc and splits its contents into
respective recipes. This is done for same reasons as deprecating
upstream_tracking.inc: having upstream version check tweaks bundled into a
separate file makes the information prone to getting out of date.
The following changes since commit d9aabf9639510fdb3e2ccc21ba5ae4aa9f6e4a57:
gcc: Drop 4.8 (2015-11-16 14:59:18 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/split-package-regex
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/split-package-regex
Alexander Kanavin (8):
package_regex.inc: deprecate the file
package_regex.inc: split entries with odd-even versioning into their
own recipes
package_regex.inc: split GITTAGREGEX entries into recipe files
package_regex.inc: split Debian-related entries into their own recipes
package_regex.inc: split PyPi related entries to their own recipes
package_regex.inc: split sourceforge related entries to their own
recipes
package_regex.inc: split entries which blacklist specific versions to
their recipes
package_regex.inc: split the rest of the entries to their recipes
meta/classes/upstream-version-is-even.bbclass | 5 +
meta/conf/distro/include/package_regex.inc | 260 +--------------------
meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 4 +
meta/recipes-bsp/libacpi/libacpi_0.2.bb | 2 +
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 2 +
meta/recipes-connectivity/dhcp/dhcp.inc | 3 +
.../nfs-utils/libnfsidmap_0.25.bb | 2 +
.../resolvconf/resolvconf_1.77.bb | 4 +
.../wireless-tools/wireless-tools_30.pre9.bb | 3 +
.../recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 +
.../console-tools/console-tools_0.3.2.bb | 3 +
meta/recipes-core/dbus/dbus-test_1.8.20.bb | 2 +-
meta/recipes-core/dbus/dbus.inc | 2 +-
meta/recipes-core/glib-2.0/glib.inc | 2 +-
.../glib-networking/glib-networking_2.44.0.bb | 2 +-
.../glibc/cross-localedef-native_2.22.bb | 1 +
meta/recipes-core/glibc/glibc_2.22.bb | 1 +
meta/recipes-core/libcgroup/libcgroup_0.41.bb | 2 +
meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 4 +
meta/recipes-core/uclibc/uclibc-git.inc | 3 +
meta/recipes-devtools/apt/apt.inc | 4 +
.../autogen/autogen-native_5.18.5.bb | 3 +
meta/recipes-devtools/binutils/binutils-2.25.1.inc | 2 +
.../bootchart2/bootchart2_0.14.7.bb | 2 +
.../cdrtools/cdrtools-native_3.01a31.bb | 2 +
meta/recipes-devtools/chrpath/chrpath_0.16.bb | 2 +
meta/recipes-devtools/cmake/cmake.inc | 2 +
.../docbook-dsssl-stylesheets-native_1.79.bb | 3 +
.../docbook-sgml-dtd-3.1-native_3.1.bb | 3 +
.../docbook-sgml-dtd-4.1-native_4.1.bb | 3 +
.../docbook-xml/docbook-xsl-stylesheets_1.78.1.bb | 3 +
.../dosfstools/dosfstools_3.0.28.bb | 2 +
meta/recipes-devtools/expect/expect_5.45.bb | 3 +
meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb | 3 +
meta/recipes-devtools/file/file_5.24.bb | 3 +
meta/recipes-devtools/gcc/gcc-4.9.inc | 2 +
meta/recipes-devtools/intltool/intltool.inc | 3 +
meta/recipes-devtools/json-c/json-c_0.12.bb | 5 +
.../openjade/openjade-native_1.3.2.bb | 2 +
meta/recipes-devtools/perl/perl.inc | 2 +
meta/recipes-devtools/python/python-async_0.6.2.bb | 2 +
meta/recipes-devtools/python/python-git_1.0.1.bb | 3 +
meta/recipes-devtools/python/python-gitdb_0.6.4.bb | 2 +
meta/recipes-devtools/python/python-mako_1.0.1.bb | 3 +
meta/recipes-devtools/python/python-nose_1.3.6.bb | 3 +
meta/recipes-devtools/python/python-pexpect_3.3.bb | 2 +
meta/recipes-devtools/python/python-scons_2.3.6.bb | 3 +
meta/recipes-devtools/python/python-smmap_0.9.0.bb | 3 +
meta/recipes-devtools/python/python.inc | 4 +
.../python/python3-native_3.4.3.bb | 3 +
meta/recipes-devtools/python/python3-pip_6.1.1.bb | 2 +
.../python/python3-setuptools_18.2.bb | 2 +
meta/recipes-devtools/python/python3_3.4.3.bb | 3 +
meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb | 1 +
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 +
.../recipes-devtools/sgmlspl/sgmlspl-native_git.bb | 1 +
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 +
meta/recipes-devtools/vala/vala.inc | 2 +-
meta/recipes-extended/blktool/blktool_4-7.bb | 4 +
meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 +
.../chkconfig-alternatives-native_1.3.59.bb | 1 +
meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 3 +
meta/recipes-extended/cups/cups.inc | 3 +
.../foomatic/foomatic-filters_4.0.17.bb | 2 +
meta/recipes-extended/iputils/iputils_s20121221.bb | 2 +
meta/recipes-extended/less/less_479.bb | 2 +
meta/recipes-extended/lsb/lsb_4.1.bb | 4 +
meta/recipes-extended/lsof/lsof_4.89.bb | 2 +
meta/recipes-extended/mailx/mailx_12.5-5.bb | 4 +
meta/recipes-extended/minicom/minicom_2.7.bb | 2 +
.../net-tools/net-tools_1.60-26.bb | 8 +
meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb | 2 +
meta/recipes-extended/quota/quota_4.02.bb | 3 +
meta/recipes-extended/sysstat/sysstat.inc | 2 +
meta/recipes-extended/unzip/unzip_6.0.bb | 4 +
meta/recipes-extended/watchdog/watchdog_5.14.bb | 3 +
.../xdg-utils/xdg-utils_1.1.0-rc1.bb | 2 +
meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 3 +
meta/recipes-extended/zip/zip_3.0.bb | 3 +
meta/recipes-gnome/epiphany/epiphany_3.16.3.bb | 2 +-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 2 +-
.../gnome-desktop/gnome-desktop3_3.16.2.bb | 2 +-
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+.inc | 4 +
meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
.../gtk-engines/gtk-engines_2.20.2.bb | 4 +
meta/recipes-gnome/librsvg/librsvg_2.40.10.bb | 2 +-
meta/recipes-graphics/cairo/cairo_1.14.4.bb | 2 +
meta/recipes-graphics/clutter/clutter-1.0.inc | 2 +-
meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 2 +-
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 2 +-
meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
meta/recipes-graphics/glew/glew_1.12.0.bb | 3 +
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +
.../menu-cache/menu-cache_1.0.0.bb | 2 +
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 3 +
meta/recipes-graphics/pango/pango.inc | 2 +-
meta/recipes-graphics/tslib/tslib_1.1.bb | 1 +
meta/recipes-graphics/waffle/waffle_1.5.1.bb | 2 +
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 3 +
.../xorg-driver/xf86-video-omapfb_git.bb | 3 +
.../xorg-lib/libxkbcommon_0.5.0.bb | 2 +
meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | 2 +
meta/recipes-kernel/linux/linux-yocto.inc | 2 +
meta/recipes-kernel/powertop/powertop_2.7.bb | 2 +
meta/recipes-lsb4/libpng/libpng12_1.2.53.bb | 3 +
.../gstreamer/gstreamer1.0-libav.inc | 2 +-
.../gstreamer/gstreamer1.0-plugins.inc | 2 +-
.../gstreamer/gstreamer1.0-rtsp-server.inc | 2 +-
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 +-
meta/recipes-multimedia/liba52/liba52_0.7.4.bb | 3 +
.../libsamplerate/libsamplerate0_0.1.8.bb | 3 +
.../libtheora/libtheora_1.1.1.bb | 2 +
meta/recipes-multimedia/libtiff/tiff_4.0.4.bb | 3 +
meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 2 +
meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 2 +
meta/recipes-qt/qt-apps/quicky_0.4.bb | 2 +
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 3 +
meta/recipes-qt/qt4/qt4-4.8.7.inc | 3 +
meta/recipes-qt/qt4/qt4-native.inc | 4 +
meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb | 2 +
meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 2 +-
meta/recipes-support/atk/at-spi2-atk_2.16.0.bb | 2 +-
meta/recipes-support/atk/at-spi2-core_2.16.0.bb | 2 +-
meta/recipes-support/atk/atk_2.16.0.bb | 2 +-
meta/recipes-support/db/db_6.0.30.bb | 4 +
meta/recipes-support/libevent/libevent_2.0.22.bb | 2 +
meta/recipes-support/libical/libical_1.0.0.bb | 2 +
meta/recipes-support/libmpc/libmpc_1.0.3.bb | 2 +
meta/recipes-support/libpcre/libpcre_8.37.bb | 3 +
meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb | 2 +-
meta/recipes-support/libusb/libusb-compat_0.1.5.bb | 3 +
meta/recipes-support/libxslt/libxslt_1.1.28.bb | 3 +
meta/recipes-support/mpfr/mpfr_3.1.3.bb | 2 +
meta/recipes-support/nettle/nettle.inc | 2 +
meta/recipes-support/nss/nss_3.19.2.bb | 3 +
meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 2 +-
meta/recipes-support/sqlite/sqlite3_3.9.0.bb | 3 +
meta/recipes-support/taglib/taglib_1.9.1.bb | 2 +
meta/recipes-support/vte/vte.inc | 2 +-
140 files changed, 327 insertions(+), 285 deletions(-)
create mode 100644 meta/classes/upstream-version-is-even.bbclass
--
2.1.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/8] package_regex.inc: deprecate the file
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 2/8] package_regex.inc: split entries with odd-even versioning into their own recipes Alexander Kanavin
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
New entries should be added to recipes themselves
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index d12999b..0035586 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -1,3 +1,5 @@
+# NOTE: THIS FILE IS DEPRECATED. Please add new entries to the recipes themselves.
+#
# package_regex.inc - This file contains data that tracks
# upstream project associated with a given recipe. This list is needed
# for recipes that version information can not be automagically discovered.
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/8] package_regex.inc: split entries with odd-even versioning into their own recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 1/8] package_regex.inc: deprecate the file Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 3/8] package_regex.inc: split GITTAGREGEX entries into recipe files Alexander Kanavin
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/classes/upstream-version-is-even.bbclass | 5 +++
meta/conf/distro/include/package_regex.inc | 50 ----------------------
meta/recipes-core/dbus/dbus-test_1.8.20.bb | 2 +-
meta/recipes-core/dbus/dbus.inc | 2 +-
meta/recipes-core/glib-2.0/glib.inc | 2 +-
.../glib-networking/glib-networking_2.44.0.bb | 2 +-
meta/recipes-devtools/perl/perl.inc | 2 +
meta/recipes-devtools/vala/vala.inc | 2 +-
meta/recipes-gnome/epiphany/epiphany_3.16.3.bb | 2 +-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 2 +-
.../gnome-desktop/gnome-desktop3_3.16.2.bb | 2 +-
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+.inc | 4 ++
meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
.../gtk-engines/gtk-engines_2.20.2.bb | 4 ++
meta/recipes-gnome/librsvg/librsvg_2.40.10.bb | 2 +-
meta/recipes-graphics/clutter/clutter-1.0.inc | 2 +-
meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 2 +-
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 2 +-
meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
meta/recipes-graphics/pango/pango.inc | 2 +-
.../gstreamer/gstreamer1.0-libav.inc | 2 +-
.../gstreamer/gstreamer1.0-plugins.inc | 2 +-
.../gstreamer/gstreamer1.0-rtsp-server.inc | 2 +-
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 +-
meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 2 +-
meta/recipes-support/atk/at-spi2-atk_2.16.0.bb | 2 +-
meta/recipes-support/atk/at-spi2-core_2.16.0.bb | 2 +-
meta/recipes-support/atk/atk_2.16.0.bb | 2 +-
meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb | 2 +-
meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 2 +-
meta/recipes-support/vte/vte.inc | 2 +-
32 files changed, 42 insertions(+), 77 deletions(-)
create mode 100644 meta/classes/upstream-version-is-even.bbclass
diff --git a/meta/classes/upstream-version-is-even.bbclass b/meta/classes/upstream-version-is-even.bbclass
new file mode 100644
index 0000000..21d844e
--- /dev/null
+++ b/meta/classes/upstream-version-is-even.bbclass
@@ -0,0 +1,5 @@
+# This class ensures that the upstream version check only
+# accepts even minor versions (i.e. 3.0.x, 3.2.x, 3.4.x, etc.)
+# This scheme is used by Gnome and a number of other projects
+# to signify stable releases vs development releases.
+REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 0035586..2216b41 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -208,56 +208,6 @@ GITTAGREGEX_pn-xinetd = "xinetd-(?P<pver>(?!20030122).+)"
# Blacklist debian-specific tags
GITTAGREGEX_pn-xf86-video-omapfb = "(?P<pver>\d+(\.\d+)+)(?!-)"
-# GNOME related.
-#
-# GNOME2_STABLE picks stable releases in the 2.x series (so not 2.90 onwards,
-# which were GNOME 3 betas.
-#
-# GNOME_STABLE picks the latest stable release.
-
-GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
-GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
-
-REGEX_pn-glib-2.0 = "${GNOME_STABLE}"
-REGEX_pn-atk = "${GNOME_STABLE}"
-REGEX_pn-at-spi2-core = "${GNOME_STABLE}"
-REGEX_pn-at-spi2-atk = "${GNOME_STABLE}"
-REGEX_pn-gdk-pixbuf = "${GNOME_STABLE}"
-REGEX_pn-pango = "${GNOME_STABLE}"
-REGEX_pn-gtk+ = "${GNOME2_STABLE}"
-REGEX_pn-gtk+3 = "${GNOME_STABLE}"
-REGEX_pn-gtk-engines = "${GNOME2_STABLE}"
-REGEX_pn-glib-networking = "${GNOME_STABLE}"
-REGEX_pn-librsvg = "${GNOME_STABLE}"
-REGEX_pn-libsoup-2.4 = "${GNOME_STABLE}"
-REGEX_pn-vala = "${GNOME_STABLE}"
-REGEX_pn-clutter-1.0 = "${GNOME_STABLE}"
-REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}"
-REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
-REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
-REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
-REGEX_pn-vte = "${GNOME_STABLE}"
-REGEX_pn-epiphany = "${GNOME_STABLE}"
-REGEX_pn-webkitgtk = "${GNOME_STABLE}"
-REGEX_pn-p11-kit = "${GNOME_STABLE}"
-REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}"
-
-# not GNOME related but uses same even-minor-release-is-stable logic
-REGEX_pn-dbus = "${GNOME_STABLE}"
-REGEX_pn-dbus-test = "${GNOME_STABLE}"
-
-# same logic applies to gstreamer releases
-REGEX_pn-gstreamer1.0 = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-libav = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-bad = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-base = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-good = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-ugly = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-rtsp-server = "${GNOME_STABLE}"
-
-# and perl
-REGEX_pn-perl = "${GNOME_STABLE}"
-
# Keep old gcc versions at their major versions
REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.8.20.bb
index 704070b..f5400a0 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.20.bb
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b
S="${WORKDIR}/dbus-${PV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
-inherit autotools pkgconfig gettext ptest
+inherit autotools pkgconfig gettext ptest upstream-version-is-even
EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
EXTRA_OECONF_X_class-native = "--without-x"
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 3971081..afb5a71 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -19,7 +19,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-inherit useradd autotools pkgconfig gettext update-rc.d
+inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
INITSCRIPT_NAME = "dbus-1"
INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 072f790..ef08627 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,7 +27,7 @@ PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
-inherit autotools gettext gtk-doc pkgconfig ptest-gnome
+inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even
S = "${WORKDIR}/glib-${PV}"
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
index 4f91b76..269cb31 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
@@ -22,7 +22,7 @@ PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
EXTRA_OECONF = "--without-gnome-proxy"
-inherit gnomebase gettext
+inherit gnomebase gettext upstream-version-is-even
FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"
diff --git a/meta/recipes-devtools/perl/perl.inc b/meta/recipes-devtools/perl/perl.inc
index 0d9716c..3313a94 100644
--- a/meta/recipes-devtools/perl/perl.inc
+++ b/meta/recipes-devtools/perl/perl.inc
@@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz"
+
+inherit upstream-version-is-even
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index 63056fd..c98244b 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
FILES_${PN}-doc += "${datadir}/devhelp"
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
index c3745c0..3ff35fc 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \
gsettings-desktop-schemas gnome-desktop3"
-inherit gnomebase gsettings distro_features_check
+inherit gnomebase gsettings distro_features_check upstream-version-is-even
# libwnck3 is x11 only
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
index 68f3850..4895d5d 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
@@ -23,7 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
SRC_URI[md5sum] = "4fed0d54432f1b69fc6e66e608bd5542"
SRC_URI[sha256sum] = "4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"
-inherit autotools pkgconfig gettext pixbufcache ptest-gnome
+inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even
LIBV = "2.10.0"
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
index 3765697..43546ce 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
BPN = "gnome-desktop"
-inherit gnome pkgconfig
+inherit gnome pkgconfig upstream-version-is-even
SRC_URI[archive.md5sum] = "ab5bf4cc94ad63639f42adcc1542b1f0"
SRC_URI[archive.sha256sum] = "3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0"
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
index 0d7fa0c..265aabc 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
LICENSE = "LGPL-3.0 | CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c"
-inherit allarch autotools pkgconfig gettext gtk-icon-cache
+inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even
DEPENDS += "intltool-native"
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index a197b9d..35aa10f 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -13,6 +13,10 @@ SECTION = "libs"
inherit distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+# This picks stable releases in the 2.x series (but not 2.90 onwards,
+# which were GNOME 3 betas).
+REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
+
X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
cairo gdk-pixbuf"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index e0c4ccb..7f3916b 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check
+inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
# This should be in autotools.bbclass, but until something elses uses it putting
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 7c3a87e..8c265da 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -37,6 +37,10 @@ GNOME_COMPRESS_TYPE="bz2"
inherit distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+# This picks stable releases in the 2.x series (but not 2.90 onwards,
+# which were GNOME 3 betas).
+REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
+
python populate_packages_prepend() {
engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
themes_root = os.path.join(d.getVar('datadir', True), "themes")
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
index 06552c2..c04ef3e 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
@@ -10,7 +10,7 @@ SECTION = "x11/utils"
DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango"
BBCLASSEXTEND = "native"
-inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
+inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even
SRC_URI += "file://gtk-option.patch"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 5d0f55c..7b115aa 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1+"
-inherit clutter ptest-gnome distro_features_check
+inherit clutter ptest-gnome distro_features_check upstream-version-is-even
# depends on cogl-1.0 which needs opengl
REQUIRED_DISTRO_FEATURES ?= "opengl"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
index 67c7590..5aeeac6 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2+"
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
# depends on clutter-1.0 which depends on cogl-1.0
REQUIRED_DISTRO_FEATURES ?= "opengl"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
index 688eed2..b07d3b9 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2+"
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
# depends on clutter-1.0 which depends on cogl-1.0
REQUIRED_DISTRO_FEATURES ?= "opengl"
# depends on gtk+3
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 88d84ea..b56bfec 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs"
HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
LICENSE = "MIT"
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
# cogl-1.0 needs opengl to build
REQUIRED_DISTRO_FEATURES ?= "opengl"
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index df0fdf6..d40ee98 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -25,7 +25,7 @@ PACKAGES_DYNAMIC += "^pango-module-.*"
RRECOMMENDS_${PN} = "pango-module-basic-fc"
-inherit gnomebase gtk-doc qemu ptest
+inherit gnomebase gtk-doc qemu ptest upstream-version-is-even
# Create a pango-modules package
ALLOW_EMPTY_${BPN}-modules = "1"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
index 5d86205..664c5d6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
@@ -5,7 +5,7 @@ LICENSE_FLAGS = "commercial"
HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index f1783b7..58c0bbb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
SECTION = "multimedia"
DEPENDS = "gstreamer1.0"
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
GSTREAMER_1_0_DEBUG ?= "--disable-debug"
GSTREAMER_1_0_GIT_BRANCH ?= "master"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
index 28a9420..65b4876 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
@@ -10,5 +10,5 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz
S = "${WORKDIR}/${PNREAL}-${PV}"
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index aa95d57..ee8c696 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -7,7 +7,7 @@ SECTION = "multimedia"
LICENSE = "LGPLv2+"
DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap"
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext upstream-version-is-even
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
PACKAGECONFIG[check] = "--enable-check,--disable-check"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
index 68634a9..221ba17 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
@@ -19,7 +19,7 @@ SRC_URI = "\
SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae"
SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20"
-inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check
+inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even
# depends on libxt
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
index 7d95fdb..29b83d7 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3
DEPENDS = "dbus glib-2.0 atk at-spi2-core"
-inherit autotools pkgconfig distro_features_check
+inherit autotools pkgconfig distro_features_check upstream-version-is-even
# The at-spi2-core requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
index 7c12b54..624d154 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
-inherit autotools gtk-doc pkgconfig distro_features_check
+inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-support/atk/atk_2.16.0.bb b/meta/recipes-support/atk/atk_2.16.0.bb
index 0f8f9b5..a60a200 100644
--- a/meta/recipes-support/atk/atk_2.16.0.bb
+++ b/meta/recipes-support/atk/atk_2.16.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
DEPENDS = "glib-2.0"
-inherit gnomebase gtk-doc
+inherit gnomebase gtk-doc upstream-version-is-even
SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116"
SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
index 044db31..4eb07ac 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b
S = "${WORKDIR}/libsoup-${PV}"
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig upstream-version-is-even
# glib-networking is needed for SSL, proxies, etc.
RRECOMMENDS_${PN} = "glib-networking"
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
index ee77951..8f15894 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig upstream-version-is-even
DEPENDS = "libtasn1 libffi"
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 07b9e10..94f9587 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.0"
DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
RDEPENDS_libvte = "vte-termcap"
-inherit gnome gtk-doc distro_features_check
+inherit gnome gtk-doc distro_features_check upstream-version-is-even
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
EXTRA_OECONF = "--disable-python --disable-introspection"
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/8] package_regex.inc: split GITTAGREGEX entries into recipe files
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 1/8] package_regex.inc: deprecate the file Alexander Kanavin
2015-11-18 9:52 ` [PATCH 2/8] package_regex.inc: split entries with odd-even versioning into their own recipes Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 4/8] package_regex.inc: split Debian-related entries into their own recipes Alexander Kanavin
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 26 ----------------------
.../glibc/cross-localedef-native_2.22.bb | 1 +
meta/recipes-core/glibc/glibc_2.22.bb | 1 +
meta/recipes-core/uclibc/uclibc-git.inc | 3 +++
meta/recipes-devtools/binutils/binutils-2.25.1.inc | 2 ++
.../bootchart2/bootchart2_0.14.7.bb | 2 ++
meta/recipes-devtools/file/file_5.24.bb | 3 +++
meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb | 1 +
.../recipes-devtools/sgmlspl/sgmlspl-native_git.bb | 1 +
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 +
.../chkconfig-alternatives-native_1.3.59.bb | 1 +
meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 3 +++
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 3 +++
.../xorg-driver/xf86-video-omapfb_git.bb | 3 +++
meta/recipes-kernel/linux/linux-yocto.inc | 2 ++
15 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 2216b41..2eaaca4 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -182,32 +182,6 @@ REGEX_URI_pn-pcmanfm = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20
REGEX_URI_pn-libcgroup = "http://sourceforge.net/projects/libcg/files/libcgroup/"
REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/"
-# GIT
-GITTAGREGEX_COMMON = "(?P<pver>\d+\.\d+(\.\d+)*)"
-
-GITTAGREGEX_pn-linux-yocto = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-linux-yocto-tiny = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-linux-yocto-dev = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-uclibc = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-glibc = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-cross-localedef = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-binutils = "binutils-(?P<pver>\d+_(\d_?)*)"
-GITTAGREGEX_pn-bootchart2 = "${GITTAGREGEX_COMMON}"
-GITTAGREGEX_pn-remake = "(?P<pver>(\d+(\.\d+)+)\+dbg.+)"
-GITTAGREGEX_pn-tcf-agent = "(?P<pver>(\d+(\.\d+)+))"
-GITTAGREGEX_pn-chkconfig-alternatives = "chkconfig-(?P<pver>(\d+(\.\d+)+))"
-GITTAGREGEX_pn-sgmlspl = "(?P<pver>(\d+(\.\d+)+))"
-
-# Exclude x.99.x versions
-GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)"
-
-# Blacklist a bogus tag
-GITTAGREGEX_pn-file = "FILE(?P<pver>(?!6_23).+)"
-GITTAGREGEX_pn-xinetd = "xinetd-(?P<pver>(?!20030122).+)"
-
-# Blacklist debian-specific tags
-GITTAGREGEX_pn-xf86-video-omapfb = "(?P<pver>\d+(\.\d+)+)(?!-)"
-
# Keep old gcc versions at their major versions
REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb b/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
index 03be9c0..7cfd698 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
@@ -16,6 +16,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
SRCBRANCH ?= "release/${PV}/master"
GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
+GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/meta/recipes-core/glibc/glibc_2.22.bb
index 1b23597..947beef 100644
--- a/meta/recipes-core/glibc/glibc_2.22.bb
+++ b/meta/recipes-core/glibc/glibc_2.22.bb
@@ -12,6 +12,7 @@ SRCREV ?= "a34d1c6afc86521d6ad17662a3b5362d8481514c"
SRCBRANCH ?= "release/${PV}/master"
GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
+GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index dcb616d..958a4ec 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -21,3 +21,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
file://0001-wire-in-syncfs.patch \
"
S = "${WORKDIR}/git"
+
+GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
+
diff --git a/meta/recipes-devtools/binutils/binutils-2.25.1.inc b/meta/recipes-devtools/binutils/binutils-2.25.1.inc
index f3817fa..6b9a152 100644
--- a/meta/recipes-devtools/binutils/binutils-2.25.1.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.25.1.inc
@@ -16,6 +16,8 @@ def binutils_branch_version(d):
BINUPV = "${@binutils_branch_version(d)}"
+GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
+
SRCREV = "2bd25930221dea4bf33c13a89c111514491440e2"
SRC_URI = "\
git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
index 4b0a980..7c82e4e 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
@@ -88,6 +88,8 @@ HOMEPAGE = "https://github.com/mmeeks/bootchart"
LICENSE = "GPL-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
+GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
+
SRC_URI = "git://github.com/mmeeks/bootchart.git \
file://bootchartd_stop.sh \
"
diff --git a/meta/recipes-devtools/file/file_5.24.bb b/meta/recipes-devtools/file/file_5.24.bb
index d04f121..e67ffdc 100644
--- a/meta/recipes-devtools/file/file_5.24.bb
+++ b/meta/recipes-devtools/file/file_5.24.bb
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
DEPENDS = "zlib file-replacement-native"
DEPENDS_class-native = "zlib-native"
+# Blacklist a bogus tag in upstream check
+GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
+
SRC_URI = "git://github.com/file/file.git \
file://debian-742262.patch \
file://0001-Add-P-prompt-into-Usage-info.patch \
diff --git a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
index c61913d..3ba31f4 100644
--- a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
+++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
require remake.inc
+GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+)\+dbg.+)"
SRC_URI += "file://version-remake.texi.patch \
"
SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561"
diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb b/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
index 5e3460f..9091f3d 100644
--- a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
+++ b/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
@@ -4,6 +4,7 @@ SECTION = "libs"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
+GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
SRC_URI = "git://github.com/gitpan/SGMLSpm \
"
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index f8fd390..fd63cb0 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
SRCREV = "b9a735e9c7cf82f80d412b7ab15d08b89d5a4ccc"
PV = "1.3.0+git${SRCPV}"
+GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \
file://fix_ranlib.patch \
file://tcf-agent.init \
diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
index 7fd34aa..72f446e 100644
--- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
# support for alternatives.
SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot"
S = "${WORKDIR}/git"
+GITTAGREGEX = "chkconfig-(?P<pver>(\d+(\.\d+)+))"
SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee"
PV = "1.3.59+${SRCPV}"
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 9af45a5..334220e 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
DEPENDS = ""
PR = "r2"
+# Blacklist a bogus tag in upstream check
+GITTAGREGEX = "xinetd-(?P<pver>(?!20030122).+)"
+
SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \
file://xinetd.init \
file://xinetd.conf \
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
index ce35b61..0f19271 100644
--- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -4,6 +4,9 @@ require mx.inc
SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
PV = "1.4.7+git${SRCPV}"
+# Exclude x.99.x versions from upstream checks
+GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)"
+
SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
file://fix-build-dir.patch \
file://fix-test-includes.patch \
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 0eeb870..9a058ec 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -13,6 +13,9 @@ SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8"
PR = "${INC_PR}.7"
PV = "0.1.1+gitr${SRCPV}"
+# Blacklist debian-specific tags in upstream version check
+GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)(?!-)"
+
SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \
file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \
file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index e0524de..79d6876 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -4,6 +4,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
+
INC_PR = "r4"
DEPENDS += "xz-native bc-native"
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/8] package_regex.inc: split Debian-related entries into their own recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (2 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 3/8] package_regex.inc: split GITTAGREGEX entries into recipe files Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 5/8] package_regex.inc: split PyPi related entries to " Alexander Kanavin
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 17 -----------------
meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 4 ++++
meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb | 4 ++++
meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 ++++
meta/recipes-devtools/apt/apt.inc | 4 ++++
meta/recipes-extended/blktool/blktool_4-7.bb | 4 ++++
meta/recipes-extended/mailx/mailx_12.5-5.bb | 4 ++++
meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 ++++++++
8 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 2eaaca4..d55f5c8 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -185,20 +185,3 @@ REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/"
# Keep old gcc versions at their major versions
REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
-
-# these packages are taken from snapshots.debian.org; that source is static and goes stale
-# so we check the latest upstream from a directory that does get updated
-REGEX_URI_pn-apt = "${DEBIAN_MIRROR}/main/a/apt/"
-REGEX_URI_pn-resolvconf = "${DEBIAN_MIRROR}/main/r/resolvconf/"
-REGEX_URI_pn-net-tools = "${DEBIAN_MIRROR}/main/n/net-tools/"
-
-# same for packages from launchpad
-REGEX_URI_pn-base-passwd = "${DEBIAN_MIRROR}/main/b/base-passwd/"
-
-# for these packages we're mostly interested in tracking debian patches,
-# and not in the upstream version where all development has effectively stopped
-DEBIAN_PATCH_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
-REGEX_pn-net-tools = "${DEBIAN_PATCH_REGEX}"
-REGEX_pn-apmd = "${DEBIAN_PATCH_REGEX}"
-REGEX_pn-blktool = "${DEBIAN_PATCH_REGEX}"
-REGEX_pn-mailx = "${DEBIAN_PATCH_REGEX}"
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index ea10526..511d209 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
@@ -22,6 +22,10 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d"
+# for this package we're mostly interested in tracking debian patches,
+# and not in the upstream version where all development has effectively stopped
+REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
+
S = "${WORKDIR}/apmd-3.2.2.orig"
inherit update-rc.d systemd
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
index 916b9f2..564354f 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
@@ -19,6 +19,10 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20150511T214718Z/pool/main/
SRC_URI[md5sum] = "7362d766e47bfc253500f42b30330d9f"
SRC_URI[sha256sum] = "5a6e21e8ba6822a5f93075c8c8fe7977e34780ba551af51930d0b31fdd99ab56"
+# the package is taken from snapshots.debian.org; that source is static and goes stale
+# so we check the latest upstream from a directory that does get updated
+REGEX_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/"
+
inherit allarch
do_compile () {
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index ac9bd81..26495ba 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -17,6 +17,10 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar
SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421"
SRC_URI[sha256sum] = "f0b66388b2c8e49c15692439d2bee63bcdd4bbbf7a782c7f64accc55986b6a36"
+# the package is taken from launchpad; that source is static and goes stale
+# so we check the latest upstream from a directory that does get updated
+REGEX_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/"
+
inherit autotools
SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst"
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 3248b9a..0bec5b4 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -16,6 +16,10 @@ SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276"
SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543"
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
+# the package is taken from snapshots.debian.org; that source is static and goes stale
+# so we check the latest upstream from a directory that does get updated
+REGEX_URI = "${DEBIAN_MIRROR}/main/a/apt/"
+
inherit autotools gettext
EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.bb
index 679196b..751a3ce 100644
--- a/meta/recipes-extended/blktool/blktool_4-7.bb
+++ b/meta/recipes-extended/blktool/blktool_4-7.bb
@@ -18,6 +18,10 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \
SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
+# for this package we're mostly interested in tracking debian patches,
+# and not in the upstream version where all development has effectively stopped
+REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
+
S = "${WORKDIR}/${BPN}-4.orig"
inherit autotools pkgconfig
diff --git a/meta/recipes-extended/mailx/mailx_12.5-5.bb b/meta/recipes-extended/mailx/mailx_12.5-5.bb
index ffa9049..49aa3a7 100644
--- a/meta/recipes-extended/mailx/mailx_12.5-5.bb
+++ b/meta/recipes-extended/mailx/mailx_12.5-5.bb
@@ -26,6 +26,10 @@ SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.g
SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2"
SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad"
+# for this package we're mostly interested in tracking debian patches,
+# and not in the upstream version where all development has effectively stopped
+REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
+
S = "${WORKDIR}/heirloom-mailx-12.5"
inherit autotools-brokensep
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index aefc1e6..7f0c72b 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -13,6 +13,10 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/
file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \
"
+# for this package we're mostly interested in tracking debian patches,
+# and not in the upstream version where all development has effectively stopped
+REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
+
S = "${WORKDIR}/net-tools-1.60"
SRC_URI[tarball.md5sum] = "ecaf37acb5b5daff4bdda77785fd916d"
@@ -21,6 +25,10 @@ SRC_URI[tarball.sha256sum] = "ec67967cf7b1a3a3828a84762fbc013ac50ee5dc9aa3095d5c
SRC_URI[patch.md5sum] = "ea3592f49ac8380962bc4d9b66c7e7e9"
SRC_URI[patch.sha256sum] = "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e46585022fc76c"
+# the package is taken from snapshots.debian.org; that source is static and goes stale
+# so we check the latest upstream from a directory that does get updated
+REGEX_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
+
inherit gettext
# The Makefile is lame, no parallel build
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/8] package_regex.inc: split PyPi related entries to their own recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (3 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 4/8] package_regex.inc: split Debian-related entries into their own recipes Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 6/8] package_regex.inc: split sourceforge " Alexander Kanavin
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 19 -------------------
meta/recipes-devtools/python/python-async_0.6.2.bb | 2 ++
meta/recipes-devtools/python/python-git_1.0.1.bb | 3 +++
meta/recipes-devtools/python/python-gitdb_0.6.4.bb | 2 ++
meta/recipes-devtools/python/python-mako_1.0.1.bb | 3 +++
meta/recipes-devtools/python/python-nose_1.3.6.bb | 3 +++
meta/recipes-devtools/python/python-pexpect_3.3.bb | 2 ++
meta/recipes-devtools/python/python-smmap_0.9.0.bb | 3 +++
meta/recipes-devtools/python/python3-pip_6.1.1.bb | 2 ++
.../python/python3-setuptools_18.2.bb | 2 ++
10 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index d55f5c8..7888260 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -120,25 +120,6 @@ REGEX_pn-nativesdk-qt4-tools = "(?P<pver>\d+(\.\d+)+)/"
REGEX_URI_pn-qt4-native = "http://download.qt.io/official_releases/qt/4.8/"
REGEX_pn-qt4-native = "(?P<pver>\d+(\.\d+)+)/"
-# PyPI sites
-REGEX_URI_pn-python-nose = "https://pypi.python.org/pypi/nose/"
-REGEX_pn-python-nose = "/nose/${COMMON_REGEX}"
-# python-distribute 0.7.x is a simple compatibility layer that installs Setuptools 0.7+.
-# so we stick to 0.6.x series
-REGEX_URI_pn-python-distribute = "https://pypi.python.org/pypi/distribute/"
-REGEX_pn-python-distribute = "/distribute/(?P<pver>\d+.6.\d+)"
-REGEX_URI_pn-python-gitdb = "https://pypi.python.org/pypi/gitdb/"
-REGEX_URI_pn-python-async = "https://pypi.python.org/pypi/async/"
-REGEX_URI_pn-python-smmap = "https://pypi.python.org/pypi/smmap/"
-REGEX_pn-python-smmap = "/smmap/${COMMON_REGEX}"
-REGEX_URI_pn-python-git = "https://pypi.python.org/pypi/GitPython/"
-REGEX_pn-python-git = "/GitPython/${COMMON_REGEX}"
-REGEX_URI_pn-python-mako = "https://pypi.python.org/pypi/mako/"
-REGEX_pn-python-mako = "/Mako/${COMMON_REGEX}"
-REGEX_URI_pn-python-pexpect = "https://pypi.python.org/pypi/pexpect"
-REGEX_URI_pn-python3-pip = "https://pypi.python.org/pypi/pip"
-REGEX_URI_pn-python3-setuptools = "https://pypi.python.org/pypi/setuptools"
-
# Sourceforge sites
REGEX_URI_pn-python-scons = "http://sourceforge.net/projects/scons/files/scons/"
REGEX_pn-python-scons = "/scons/${COMMON_REGEX}/"
diff --git a/meta/recipes-devtools/python/python-async_0.6.2.bb b/meta/recipes-devtools/python/python-async_0.6.2.bb
index 5a17a1a..0da6be6 100644
--- a/meta/recipes-devtools/python/python-async_0.6.2.bb
+++ b/meta/recipes-devtools/python/python-async_0.6.2.bb
@@ -8,6 +8,8 @@ SRC_URI = "http://pypi.python.org/packages/source/a/async/async-${PV}.tar.gz"
SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
+REGEX_URI = "https://pypi.python.org/pypi/async/"
+
S = "${WORKDIR}/async-${PV}"
inherit setuptools
diff --git a/meta/recipes-devtools/python/python-git_1.0.1.bb b/meta/recipes-devtools/python/python-git_1.0.1.bb
index a78d7c8..6a6f15b 100644
--- a/meta/recipes-devtools/python/python-git_1.0.1.bb
+++ b/meta/recipes-devtools/python/python-git_1.0.1.bb
@@ -14,6 +14,9 @@ SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.ta
SRC_URI[md5sum] = "4659644b42c41e5e5170c0cd83ed6422"
SRC_URI[sha256sum] = "9c88c17bbcae2a445ff64024ef13526224f70e35e38c33416be5ceb56ca7f760"
+REGEX_URI = "https://pypi.python.org/pypi/GitPython/"
+REGEX = "/GitPython/(?P<pver>(\d+[\.\-_]*)+)"
+
S = "${WORKDIR}/GitPython-${PV}"
inherit setuptools
diff --git a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb b/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
index f0083bd..20b8b06 100644
--- a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
+++ b/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
@@ -10,6 +10,8 @@ SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz"
SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a"
SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658"
+REGEX_URI = "https://pypi.python.org/pypi/gitdb/"
+
S = "${WORKDIR}/gitdb-${PV}"
inherit distutils
diff --git a/meta/recipes-devtools/python/python-mako_1.0.1.bb b/meta/recipes-devtools/python/python-mako_1.0.1.bb
index 5d42b0c..2c2b45e 100644
--- a/meta/recipes-devtools/python/python-mako_1.0.1.bb
+++ b/meta/recipes-devtools/python/python-mako_1.0.1.bb
@@ -8,6 +8,9 @@ SRC_URI = "https://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
SRC_URI[md5sum] = "9f0aafd177b039ef67b90ea350497a54"
SRC_URI[sha256sum] = "45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
+REGEX_URI = "https://pypi.python.org/pypi/mako/"
+REGEX = "/Mako/(?P<pver>(\d+[\.\-_]*)+)"
+
S = "${WORKDIR}/Mako-${PV}"
inherit setuptools
diff --git a/meta/recipes-devtools/python/python-nose_1.3.6.bb b/meta/recipes-devtools/python/python-nose_1.3.6.bb
index e47ddb0..54811fc 100644
--- a/meta/recipes-devtools/python/python-nose_1.3.6.bb
+++ b/meta/recipes-devtools/python/python-nose_1.3.6.bb
@@ -10,6 +10,9 @@ SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz"
SRC_URI[md5sum] = "0ca546d81ca8309080fc80cb389e7a16"
SRC_URI[sha256sum] = "f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758"
+REGEX_URI = "https://pypi.python.org/pypi/nose/"
+REGEX = "/nose/(?P<pver>(\d+[\.\-_]*)+)"
+
S = "${WORKDIR}/nose-${PV}"
inherit setuptools
diff --git a/meta/recipes-devtools/python/python-pexpect_3.3.bb b/meta/recipes-devtools/python/python-pexpect_3.3.bb
index cd80aeb..6ff6b3e 100644
--- a/meta/recipes-devtools/python/python-pexpect_3.3.bb
+++ b/meta/recipes-devtools/python/python-pexpect_3.3.bb
@@ -8,6 +8,8 @@ SRC_URI = "https://pypi.python.org/packages/source/p/pexpect/pexpect-${PV}.tar.g
SRC_URI[md5sum] = "0de72541d3f1374b795472fed841dce8"
SRC_URI[sha256sum] = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"
+REGEX_URI = "https://pypi.python.org/pypi/pexpect"
+
S = "${WORKDIR}/pexpect-${PV}"
inherit distutils
diff --git a/meta/recipes-devtools/python/python-smmap_0.9.0.bb b/meta/recipes-devtools/python/python-smmap_0.9.0.bb
index b658be8..72a2851 100644
--- a/meta/recipes-devtools/python/python-smmap_0.9.0.bb
+++ b/meta/recipes-devtools/python/python-smmap_0.9.0.bb
@@ -11,6 +11,9 @@ SRC_URI = "http://pypi.python.org/packages/source/s/smmap/smmap-${PV}.tar.gz"
SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab"
SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62"
+REGEX_URI = "https://pypi.python.org/pypi/smmap/"
+REGEX = "/smmap/(?P<pver>(\d+[\.\-_]*)+)"
+
S = "${WORKDIR}/smmap-${PV}"
inherit setuptools
diff --git a/meta/recipes-devtools/python/python3-pip_6.1.1.bb b/meta/recipes-devtools/python/python3-pip_6.1.1.bb
index 7bfc30e..45b3145 100644
--- a/meta/recipes-devtools/python/python3-pip_6.1.1.bb
+++ b/meta/recipes-devtools/python/python3-pip_6.1.1.bb
@@ -13,6 +13,8 @@ SRC_URI = " \
SRC_URI[md5sum] = "6b19e0a934d982a5a4b798e957cb6d45"
SRC_URI[sha256sum] = "89f3b626d225e08e7f20d85044afa40f612eb3284484169813dc2d0631f2a556"
+REGEX_URI = "https://pypi.python.org/pypi/pip"
+
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils3
diff --git a/meta/recipes-devtools/python/python3-setuptools_18.2.bb b/meta/recipes-devtools/python/python3-setuptools_18.2.bb
index dc0ac80..94144b5 100644
--- a/meta/recipes-devtools/python/python3-setuptools_18.2.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_18.2.bb
@@ -14,6 +14,8 @@ SRC_URI = " \
SRC_URI[md5sum] = "52b4e48939ef311d7204f8fe940764f4"
SRC_URI[sha256sum] = "0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d"
+REGEX_URI = "https://pypi.python.org/pypi/setuptools"
+
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils3
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/8] package_regex.inc: split sourceforge related entries to their own recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (4 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 5/8] package_regex.inc: split PyPi related entries to " Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 7/8] package_regex.inc: split entries which blacklist specific versions to their recipes Alexander Kanavin
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 43 ----------------------
.../console-tools/console-tools_0.3.2.bb | 3 ++
meta/recipes-core/libcgroup/libcgroup_0.41.bb | 2 +
meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 4 ++
.../cdrtools/cdrtools-native_3.01a31.bb | 2 +
.../docbook-dsssl-stylesheets-native_1.79.bb | 3 ++
.../docbook-xml/docbook-xsl-stylesheets_1.78.1.bb | 3 ++
meta/recipes-devtools/expect/expect_5.45.bb | 3 ++
meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb | 3 ++
.../openjade/openjade-native_1.3.2.bb | 2 +
meta/recipes-devtools/python/python-scons_2.3.6.bb | 3 ++
meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 3 ++
meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++
meta/recipes-extended/quota/quota_4.02.bb | 3 ++
meta/recipes-extended/watchdog/watchdog_5.14.bb | 3 ++
meta/recipes-graphics/glew/glew_1.12.0.bb | 3 ++
.../menu-cache/menu-cache_1.0.0.bb | 2 +
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 3 ++
meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | 2 +
meta/recipes-lsb4/libpng/libpng12_1.2.53.bb | 3 ++
meta/recipes-multimedia/liba52/liba52_0.7.4.bb | 3 ++
meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 2 +
meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb | 2 +
meta/recipes-support/libpcre/libpcre_8.37.bb | 3 ++
meta/recipes-support/libusb/libusb-compat_0.1.5.bb | 3 ++
25 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 7888260..7db8d57 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -120,49 +120,6 @@ REGEX_pn-nativesdk-qt4-tools = "(?P<pver>\d+(\.\d+)+)/"
REGEX_URI_pn-qt4-native = "http://download.qt.io/official_releases/qt/4.8/"
REGEX_pn-qt4-native = "(?P<pver>\d+(\.\d+)+)/"
-# Sourceforge sites
-REGEX_URI_pn-python-scons = "http://sourceforge.net/projects/scons/files/scons/"
-REGEX_pn-python-scons = "/scons/${COMMON_REGEX}/"
-REGEX_URI_pn-expect = "http://sourceforge.net/projects/expect/files/Expect/"
-REGEX_pn-expect = "/Expect/${COMMON_REGEX}/"
-REGEX_URI_pn-docbook-xsl-stylesheets = "http://sourceforge.net/projects/docbook/files/docbook-xsl/"
-REGEX_pn-docbook-xsl-stylesheets = "/docbook-xsl/${COMMON_REGEX}/"
-REGEX_URI_pn-glew = "http://sourceforge.net/projects/glew/files/glew"
-REGEX_pn-glew = "/glew/${COMMON_REGEX}/"
-REGEX_URI_pn-menu-cache = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/"
-REGEX_URI_pn-x11vnc = "http://sourceforge.net/projects/libvncserver/files/x11vnc/"
-REGEX_pn-x11vnc = "/x11vnc/${COMMON_REGEX}/"
-REGEX_URI_pn-quota = "http://sourceforge.net/projects/linuxquota/files/quota-tools/"
-REGEX_pn-quota = "/quota-tools/${COMMON_REGEX}/"
-REGEX_URI_pn-lsb = "http://sourceforge.net/projects/lsb/files/lsb_release/"
-REGEX_pn-lsb = "/lsb_release/${COMMON_REGEX}/"
-REGEX_URI_pn-libpcre = "http://sourceforge.net/projects/pcre/files/pcre/"
-REGEX_pn-libpcre = "/pcre/${COMMON_REGEX}/"
-REGEX_URI_pn-libusb-compat = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/"
-REGEX_pn-libusb-compat = "/libusb-compat-${COMMON_REGEX}/$"
-REGEX_URI_pn-sysfsutils = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/"
-REGEX_pn-sysfsutils = "/sysfsutils/${COMMON_REGEX}/"
-REGEX_URI_pn-console-tools = "http://sourceforge.net/projects/lct/files/console-tools-devel/"
-REGEX_pn-console-tools = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/"
-REGEX_URI_pn-watchdog = "http://sourceforge.net/projects/watchdog/files/watchdog/"
-REGEX_pn-watchdog = "/watchdog/${COMMON_REGEX}/"
-REGEX_URI_pn-cracklib = "http://sourceforge.net/projects/cracklib/files/cracklib/"
-REGEX_pn-cracklib = "/cracklib/${COMMON_REGEX}/"
-REGEX_URI_pn-gptfdisk = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
-REGEX_pn-gptfdisk = "/gptfdisk/${COMMON_REGEX}/"
-REGEX_URI_pn-libpng12 = "http://sourceforge.net/projects/libpng/files/libpng12/"
-REGEX_pn-libpng12 = "/libpng12/${COMMON_REGEX}/"
-REGEX_URI_pn-docbook-dsssl-stylesheets = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/"
-REGEX_pn-docbook-dsssl-stylesheets = "/docbook-dsssl/${COMMON_REGEX}/"
-
-REGEX_URI_pn-openjade = "http://openjade.sourceforge.net/download.html"
-REGEX_URI_pn-libpfm4 = "http://sourceforge.net/projects/perfmon2/files/libpfm4/"
-REGEX_URI_pn-liba52 = "http://liba52.sourceforge.net/downloads.html"
-REGEX_URI_pn-mpeg2dec = "http://libmpeg2.sourceforge.net/downloads.html"
-REGEX_URI_pn-pcmanfm = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/"
-REGEX_URI_pn-libcgroup = "http://sourceforge.net/projects/libcg/files/libcgroup/"
-REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/"
-
# Keep old gcc versions at their major versions
REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index a9805b3..6f99030 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -20,6 +20,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd"
SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2"
+REGEX_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/"
+REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/"
+
do_configure_prepend () {
mkdir -p ${S}/m4
cp ${WORKDIR}/lcmessage.m4 ${S}/m4/
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 52ba1d76..590c3cf 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
@@ -15,6 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2
SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f"
SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51"
+REGEX_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/"
+
EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
PACKAGES =+ "cgroups-pam-plugin"
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index b9f40f4..a4562d1 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -17,6 +17,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc"
SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"
+
+REGEX_URI = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/"
+REGEX = "/sysfsutils/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/sysfsutils-${PV}"
inherit autotools
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
index d0f36e2..c22d6c6 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
@@ -12,6 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/cdrtools/alpha/cdrtools-${PV}.tar.bz2"
SRC_URI[md5sum] = "78172557894f469b4584d008e93ec469"
SRC_URI[sha256sum] = "183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a"
+REGEX_URI = "http://sourceforge.net/projects/cdrtools/files/alpha/"
+
S = "${WORKDIR}/cdrtools-3.01"
inherit native
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index 461b48f..3af05dd 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
SRC_URI[md5sum] = "bc192d23266b9a664ca0aba4a7794c7c"
SRC_URI[sha256sum] = "2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc"
+REGEX_URI = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/"
+REGEX = "/docbook-dsssl/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/docbook-dsssl-${PV}"
inherit native
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
index 2a1bdc4..2b88bd5 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
@@ -11,6 +11,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \
SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771"
SRC_URI[sha256sum] = "c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467"
+REGEX_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/"
+REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/docbook-xsl-${PV}"
inherit allarch
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index 3c2aab4..6d314f6 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -29,6 +29,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b"
SRC_URI[sha256sum] = "b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040"
+REGEX_URI = "http://sourceforge.net/projects/expect/files/Expect/"
+REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/${BPN}${PV}"
do_install_append() {
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
index a4cc846..c08767e 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
@@ -10,6 +10,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz"
SRC_URI[md5sum] = "2061f917af084215898d4fea04d8388f"
SRC_URI[sha256sum] = "5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c"
+REGEX_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
+REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
+
do_install() {
install -d ${D}${sbindir}
install -m 0755 cgdisk ${D}${sbindir}
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index fa7aa62..2d67cf3 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -22,6 +22,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"
+REGEX_URI = "http://openjade.sourceforge.net/download.html"
+
inherit autotools-brokensep native
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
diff --git a/meta/recipes-devtools/python/python-scons_2.3.6.bb b/meta/recipes-devtools/python/python-scons_2.3.6.bb
index c4ad7d3..d231d20 100644
--- a/meta/recipes-devtools/python/python-scons_2.3.6.bb
+++ b/meta/recipes-devtools/python/python-scons_2.3.6.bb
@@ -9,6 +9,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
SRC_URI[md5sum] = "9c6a1c3c716cbe5f16515f163c91d928"
SRC_URI[sha256sum] = "98adaa351d8f4e4068a5bf1894bdd7f85b390c8c3f80d437cf8bb266012404df"
+REGEX_URI = "http://sourceforge.net/projects/scons/files/scons/"
+REGEX = "/scons/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index c0ffe33..e99cecd 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
@@ -18,6 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \
SRC_URI[md5sum] = "376790a95c1fb645e59e6e9803c78582"
SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88be3fa33"
+REGEX_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/"
+REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/"
+
inherit autotools gettext pythonnative python-dir
do_install_append_class-target() {
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index c9f6a8b..b898428 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -24,6 +24,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
+
+REGEX_URI = "http://sourceforge.net/projects/lsb/files/lsb_release/"
+REGEX = "/lsb_release/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/lsb-release-1.4"
CLEANBROKEN = "1"
diff --git a/meta/recipes-extended/quota/quota_4.02.bb b/meta/recipes-extended/quota/quota_4.02.bb
index 673d584..23f728f 100644
--- a/meta/recipes-extended/quota/quota_4.02.bb
+++ b/meta/recipes-extended/quota/quota_4.02.bb
@@ -17,6 +17,9 @@ SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch"
SRC_URI[md5sum] = "a8a5df262261e659716ccad2a5d6df0d"
SRC_URI[sha256sum] = "f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795"
+REGEX_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/"
+REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/quota-tools"
DEPENDS = "gettext-native e2fsprogs"
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb b/meta/recipes-extended/watchdog/watchdog_5.14.bb
index 9ec0a8e..41b2ec0 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
@@ -17,6 +17,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
SRC_URI[sha256sum] = "620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
+REGEX_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/"
+REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"
+
inherit autotools
inherit update-rc.d
diff --git a/meta/recipes-graphics/glew/glew_1.12.0.bb b/meta/recipes-graphics/glew/glew_1.12.0.bb
index eb28c4d..712d4de 100644
--- a/meta/recipes-graphics/glew/glew_1.12.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.12.0.bb
@@ -18,6 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1"
SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf"
+REGEX_URI = "http://sourceforge.net/projects/glew/files/glew"
+REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/"
+
inherit autotools lib_package pkgconfig distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
index ab909f7..c6fd301 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
@@ -13,4 +13,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz"
SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad"
SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf"
+REGEX_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/"
+
inherit autotools gettext pkgconfig gtk-doc
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index ec0241f..24a5a95 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -14,6 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
+REGEX_URI = "http://sourceforge.net/projects/libvncserver/files/x11vnc/"
+REGEX = "/x11vnc/(?P<pver>(\d+[\.\-_]*)+)/"
+
DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
inherit autotools-brokensep distro_features_check
diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
index 2dfda90..07b8cb0 100644
--- a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
+++ b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
@@ -19,6 +19,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}
SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487"
SRC_URI[sha256sum] = "5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f"
+REGEX_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/"
+
EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\""
EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\""
EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\""
diff --git a/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
index bf861a7..60c91df 100644
--- a/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
+++ b/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
@@ -14,6 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.
SRC_URI[md5sum] = "7d18a74e6fd2029aee76ccd00e00a9e6"
SRC_URI[sha256sum] = "b45e49f689e7451bd576569e6a344f7e0d11c02ecbb797f4da0e431526765c0a"
+REGEX_URI = "http://sourceforge.net/projects/libpng/files/libpng12/"
+REGEX = "/libpng12/(?P<pver>(\d+[\.\-_]*)+)/"
+
BINCONFIG_GLOB = "${PN}-config"
inherit autotools binconfig pkgconfig
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index 94b66b1..0b33129 100644
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
@@ -13,6 +13,9 @@ SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \
SRC_URI[md5sum] = "caa9f5bc44232dc8aeea773fea56be80"
SRC_URI[sha256sum] = "a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33"
+
+REGEX_URI = "http://liba52.sourceforge.net/downloads.html"
+
S = "${WORKDIR}/a52dec-${PV}"
EXTRA_OECONF = " --enable-shared "
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index cede2bf..b369808 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz \
SRC_URI[md5sum] = "7631b0a4bcfdd0d78c0bb0083080b0dc"
SRC_URI[sha256sum] = "c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e3edeee"
+REGEX_URI = "http://libmpeg2.sourceforge.net/downloads.html"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared --disable-sdl"
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
index b63db87..5e34f92 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
@@ -23,6 +23,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \
SRC_URI[md5sum] = "c993402d407b0a3fc076f842ac1bc5c9"
SRC_URI[sha256sum] = "cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380"
+REGEX_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/"
+
inherit autotools pkgconfig distro_features_check
# The startup-notification requires x11 in DISTRO_FEATURES
diff --git a/meta/recipes-support/libpcre/libpcre_8.37.bb b/meta/recipes-support/libpcre/libpcre_8.37.bb
index 1880639..57e04ce 100644
--- a/meta/recipes-support/libpcre/libpcre_8.37.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.37.bb
@@ -17,6 +17,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \
SRC_URI[md5sum] = "ed91be292cb01d21bc7e526816c26981"
SRC_URI[sha256sum] = "51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d"
+REGEX_URI = "http://sourceforge.net/projects/pcre/files/pcre/"
+REGEX = "/pcre/(?P<pver>(\d+[\.\-_]*)+)/"
+
S = "${WORKDIR}/pcre-${PV}"
PROVIDES += "pcre"
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
index 646872c..cced15e 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
@@ -25,6 +25,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4"
SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
+REGEX_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/"
+REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$"
+
BINCONFIG = "${bindir}/libusb-config"
inherit autotools pkgconfig binconfig-disabled lib_package
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 7/8] package_regex.inc: split entries which blacklist specific versions to their recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (5 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 6/8] package_regex.inc: split sourceforge " Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 9:52 ` [PATCH 8/8] package_regex.inc: split the rest of the entries " Alexander Kanavin
2015-11-18 15:38 ` [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Richard Purdie
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 35 ----------------------
.../docbook-sgml-dtd-3.1-native_3.1.bb | 3 ++
.../docbook-sgml-dtd-4.1-native_4.1.bb | 3 ++
meta/recipes-devtools/gcc/gcc-4.9.inc | 2 ++
meta/recipes-devtools/python/python.inc | 4 +++
.../python/python3-native_3.4.3.bb | 3 ++
meta/recipes-devtools/python/python3_3.4.3.bb | 3 ++
meta/recipes-extended/unzip/unzip_6.0.bb | 4 +++
meta/recipes-extended/zip/zip_3.0.bb | 3 ++
meta/recipes-multimedia/libtiff/tiff_4.0.4.bb | 3 ++
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 3 ++
meta/recipes-qt/qt4/qt4-4.8.7.inc | 3 ++
meta/recipes-qt/qt4/qt4-native.inc | 4 +++
meta/recipes-support/db/db_6.0.30.bb | 4 +++
14 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 7db8d57..beed994 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -46,25 +46,9 @@ REGEX_pn-cmake = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
REGEX_pn-libsdl = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
REGEX_pn-libxslt = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
-# Exclude NC versions which lack AES encryption
-REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
-
REGEX_URI_pn-autogen = "http://ftp.gnu.org/gnu/autogen/"
REGEX_pn-autogen = "rel(?P<pver>\d+(\.\d+)+)/"
-# python recipe is actually python 2.x
-# also, exclude pre-releases for both python 2.x and 3.x
-REGEX_pn-python = "[Pp]ython-(?P<pver>2(\.\d+)+).tar"
-REGEX_pn-python3 = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
-
-# exclude betas
-REGEX_pn-tiff = "tiff-(?P<pver>\d+(\.\d+)+).tar"
-
-# exclude version 5.5.2 which triggers a false positive
-REGEX_pn-unzip = "unzip(?P<pver>(?!552).+)\.tgz"
-# similar for zip
-REGEX_pn-zip = "^zip(?P<pver>(?!232).+)\.tgz"
-
# Isn't possible to download with the default URI web server returns
# (403, 404, 550)
REGEX_URI_pn-dosfstools = "https://github.com/dosfstools/dosfstools/releases"
@@ -104,22 +88,3 @@ REGEX_URI_pn-libnfsidmap = "http://www.citi.umich.edu/projects/nfsv4/linux/libnf
REGEX_URI_pn-mpfr = "http://www.mpfr.org/mpfr-current/"
REGEX_URI_pn-nss = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
REGEX_pn-nss = "NSS_(?P<pver>.+)_release_notes"
-
-REGEX_URI_pn-docbook-sgml-dtd-3.1 = "http://www.docbook.org/sgml/"
-REGEX_pn-docbook-sgml-dtd-3.1 = "(?P<pver>3\..+)/"
-REGEX_URI_pn-docbook-sgml-dtd-4.1 = "http://www.docbook.org/sgml/"
-REGEX_pn-docbook-sgml-dtd-4.1 = "(?P<pver>4\.1(\.\d+)*)/"
-
-# Qt recipes should be kept at 4.x
-REGEX_URI_pn-qt4-embedded = "http://download.qt.io/official_releases/qt/4.8/"
-REGEX_pn-qt4-embedded = "(?P<pver>\d+(\.\d+)+)/"
-REGEX_URI_pn-qt4-x11-free = "http://download.qt.io/official_releases/qt/4.8/"
-REGEX_pn-qt4-x11-free = "(?P<pver>\d+(\.\d+)+)/"
-REGEX_URI_pn-nativesdk-qt4-tools = "http://download.qt.io/official_releases/qt/4.8/"
-REGEX_pn-nativesdk-qt4-tools = "(?P<pver>\d+(\.\d+)+)/"
-REGEX_URI_pn-qt4-native = "http://download.qt.io/official_releases/qt/4.8/"
-REGEX_pn-qt4-native = "(?P<pver>\d+(\.\d+)+)/"
-
-# Keep old gcc versions at their major versions
-REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
-REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
index a7df4f9..83d60a0 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
@@ -16,6 +16,9 @@ SRC_URI = "http://www.docbook.org/sgml/3.1/docbk31.zip \
SRC_URI[md5sum] = "432749c0c806dbae81c8bcb70da3b5d3"
SRC_URI[sha256sum] = "20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538"
+REGEX_URI = "http://www.docbook.org/sgml/"
+REGEX = "(?P<pver>3\..+)/"
+
do_compile() {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd-3.html
# for details.
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
index 88c9396..77938e1 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
@@ -16,6 +16,9 @@ SRC_URI = "http://docbook.org/sgml/4.1/docbk41.zip \
SRC_URI[md5sum] = "489f6ff2a2173eb1e14216c10533ede2"
SRC_URI[sha256sum] = "deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311"
+REGEX_URI = "http://www.docbook.org/sgml/"
+REGEX = "(?P<pver>4\.1(\.\d+)*)/"
+
do_compile() {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
# for details.
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 95b553c..0a35d49 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -85,6 +85,8 @@ SRC_URI = "\
SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327"
SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e"
+REGEX = "gcc-(?P<pver>4\.9\.\d+).tar"
+
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 4d428f3..eafedb6 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -12,6 +12,10 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz"
SRC_URI[md5sum] = "38d530f7efc373d64a8fb1637e3baaa7"
SRC_URI[sha256sum] = "90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916"
+# python recipe is actually python 2.x
+# also, exclude pre-releases for both python 2.x and 3.x
+REGEX = "[Pp]ython-(?P<pver>2(\.\d+)+).tar"
+
PYTHON_MAJMIN = "2.7"
inherit autotools
diff --git a/meta/recipes-devtools/python/python3-native_3.4.3.bb b/meta/recipes-devtools/python/python3-native_3.4.3.bb
index 464ff05..5f2ff77 100644
--- a/meta/recipes-devtools/python/python3-native_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3-native_3.4.3.bb
@@ -32,6 +32,9 @@ SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043e
LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
+# exclude pre-releases for both python 2.x and 3.x
+REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
+
S = "${WORKDIR}/Python-${PV}"
EXTRANATIVEPATH += "bzip2-native"
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb
index a33f10f..cae2f13 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -41,6 +41,9 @@ SRC_URI += "\
SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5"
SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8"
+# exclude pre-releases for both python 2.x and 3.x
+REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
+
LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
S = "${WORKDIR}/Python-${PV}"
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index b386323..cb9636d 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -20,6 +20,10 @@ SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \
SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
+
+# exclude version 5.5.2 which triggers a false positive
+REGEX = "unzip(?P<pver>(?!552).+)\.tgz"
+
S = "${WORKDIR}/unzip60"
# Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index 1e96110..21f6eaa 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -8,6 +8,9 @@ S = "${WORKDIR}/zip30"
SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37"
SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
+# exclude version 2.3.2 which triggers a false positive
+REGEX = "^zip(?P<pver>(?!232).+)\.tgz"
+
# zip.inc sets CFLAGS, but what Makefile actually uses is
# CFLAGS_NOOPT. It will also force -O3 optimization, overriding
# whatever we set.
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
index cf3a5f0..94352e0 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
@@ -10,6 +10,9 @@ SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
SRC_URI[md5sum] = "9aee7107408a128c0c7b24286c0db900"
SRC_URI[sha256sum] = "8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890"
+# exclude betas
+REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
+
inherit autotools
CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 077008b..3eb4c52 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -18,6 +18,9 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://g++.conf \
file://linux.conf"
+REGEX_URI = "http://download.qt.io/official_releases/qt/4.8/"
+REGEX = "(?P<pver>\d+(\.\d+)+)/"
+
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index d165514..8b26456 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -34,6 +34,9 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"
SRC_URI[sha256sum] = "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
+REGEX_URI = "http://download.qt.io/official_releases/qt/4.8/"
+REGEX = "(?P<pver>\d+(\.\d+)+)/"
+
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
# disable webkit for mips64 n32 temporarily that fails to compile,
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 2a41f8a..37fb6e3 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -19,6 +19,10 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://g++.conf \
file://linux.conf \
"
+
+REGEX_URI = "http://download.qt.io/official_releases/qt/4.8/"
+REGEX = "(?P<pver>\d+(\.\d+)+)/"
+
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
EXTRA_OECONF = "-prefix ${prefix} \
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb
index d49df62..cde590a 100644
--- a/meta/recipes-support/db/db_6.0.30.bb
+++ b/meta/recipes-support/db/db_6.0.30.bb
@@ -26,6 +26,10 @@ SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"
SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2"
+# Exclude NC versions which lack AES encryption
+REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
+REGEX_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html"
+
LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490"
inherit autotools
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 8/8] package_regex.inc: split the rest of the entries to their recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (6 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 7/8] package_regex.inc: split entries which blacklist specific versions to their recipes Alexander Kanavin
@ 2015-11-18 9:52 ` Alexander Kanavin
2015-11-18 15:38 ` [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Richard Purdie
8 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 9:52 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/package_regex.inc | 68 ----------------------
meta/recipes-bsp/libacpi/libacpi_0.2.bb | 2 +
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 2 +
meta/recipes-connectivity/dhcp/dhcp.inc | 3 +
.../nfs-utils/libnfsidmap_0.25.bb | 2 +
.../wireless-tools/wireless-tools_30.pre9.bb | 3 +
.../autogen/autogen-native_5.18.5.bb | 3 +
meta/recipes-devtools/chrpath/chrpath_0.16.bb | 2 +
meta/recipes-devtools/cmake/cmake.inc | 2 +
.../dosfstools/dosfstools_3.0.28.bb | 2 +
meta/recipes-devtools/intltool/intltool.inc | 3 +
meta/recipes-devtools/json-c/json-c_0.12.bb | 5 ++
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 2 +
meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 +
meta/recipes-extended/cups/cups.inc | 3 +
.../foomatic/foomatic-filters_4.0.17.bb | 2 +
meta/recipes-extended/iputils/iputils_s20121221.bb | 2 +
meta/recipes-extended/less/less_479.bb | 2 +
meta/recipes-extended/lsof/lsof_4.89.bb | 2 +
meta/recipes-extended/minicom/minicom_2.7.bb | 2 +
meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb | 2 +
meta/recipes-extended/sysstat/sysstat.inc | 2 +
.../xdg-utils/xdg-utils_1.1.0-rc1.bb | 2 +
meta/recipes-graphics/cairo/cairo_1.14.4.bb | 2 +
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +
meta/recipes-graphics/tslib/tslib_1.1.bb | 1 +
meta/recipes-graphics/waffle/waffle_1.5.1.bb | 2 +
.../xorg-lib/libxkbcommon_0.5.0.bb | 2 +
meta/recipes-kernel/powertop/powertop_2.7.bb | 2 +
.../libsamplerate/libsamplerate0_0.1.8.bb | 3 +
.../libtheora/libtheora_1.1.1.bb | 2 +
meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 2 +
meta/recipes-qt/qt-apps/quicky_0.4.bb | 2 +
meta/recipes-support/libevent/libevent_2.0.22.bb | 2 +
meta/recipes-support/libical/libical_1.0.0.bb | 2 +
meta/recipes-support/libmpc/libmpc_1.0.3.bb | 2 +
meta/recipes-support/libxslt/libxslt_1.1.28.bb | 3 +
meta/recipes-support/mpfr/mpfr_3.1.3.bb | 2 +
meta/recipes-support/nettle/nettle.inc | 2 +
meta/recipes-support/nss/nss_3.19.2.bb | 3 +
meta/recipes-support/sqlite/sqlite3_3.9.0.bb | 3 +
meta/recipes-support/taglib/taglib_1.9.1.bb | 2 +
42 files changed, 93 insertions(+), 68 deletions(-)
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index beed994..e08082a 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -20,71 +20,3 @@
# determine the upstream release version. This regex can be used
# to filter only relevant tags.
#
-
-COMMON_REGEX = "(?P<pver>(\d+[\.\-_]*)+)"
-
-# Generic regex don't match
-REGEX_URI_pn-wireless-tools = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-REGEX_pn-wireless-tools = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz"
-
-REGEX_URI_pn-sqlite3="http://www.sqlite.org/"
-REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html"
-
-REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/"
-REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))/"
-
-REGEX_pn-foomatic-filters = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz"
-REGEX_pn-xdg-utils = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
-REGEX_pn-rpm="rpm-${COMMON_REGEX}-.*$"
-REGEX_pn-libtheora = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
-
-REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar"
-REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
-
-REGEX_pn-cairo = "cairo-(?P<pver>\d+(\.\d+)+)\.tar"
-REGEX_pn-cmake = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
-REGEX_pn-libsdl = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
-REGEX_pn-libxslt = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
-
-REGEX_URI_pn-autogen = "http://ftp.gnu.org/gnu/autogen/"
-REGEX_pn-autogen = "rel(?P<pver>\d+(\.\d+)+)/"
-
-# Isn't possible to download with the default URI web server returns
-# (403, 404, 550)
-REGEX_URI_pn-dosfstools = "https://github.com/dosfstools/dosfstools/releases"
-REGEX_pn-json-c = "json-c-(?P<pver>\d+(\.\d+)+).tar"
-# json-c releases page is fetching the list of releases in some weird XML format
-# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
-#REGEX_URI_pn-json-c = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
-REGEX_URI_pn-chrpath = "http://alioth.debian.org/frs/?group_id=31052"
-
-REGEX_URI_pn-powertop = "https://01.org/powertop/downloads"
-REGEX_URI_pn-libsamplerate0 = "http://www.mega-nerd.com/SRC/download.html"
-REGEX_URI_pn-libxkbcommon = "http://xkbcommon.org/"
-REGEX_URI_pn-tslib = "https://github.com/kergoth/tslib/releases"
-REGEX_URI_pn-waffle="http://www.waffle-gl.org/releases.html"
-REGEX_URI_pn-lrzsz = "http://ohse.de/uwe/software/lrzsz.html"
-REGEX_URI_pn-libacpi = "http://www.ngolde.de/libacpi.html"
-REGEX_URI_pn-less = "http://www.greenwoodsoftware.com/less/download.html"
-REGEX_URI_pn-cups = "http://www.cups.org/software.php"
-REGEX_pn-cups = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar"
-REGEX_URI_pn-bzip2 = "http://www.bzip.org/downloads.html"
-REGEX_URI_pn-minicom = "https://alioth.debian.org/frs/?group_id=30018"
-REGEX_URI_pn-sysstat = "http://sebastien.godard.pagesperso-orange.fr/download.html"
-REGEX_URI_pn-libical = "https://github.com/libical/libical/releases/"
-REGEX_URI_pn-libmpc = "http://www.multiprecision.org/index.php?prog=mpc&page=download"
-REGEX_URI_pn-taglib = "http://github.com/taglib/taglib/releases/"
-REGEX_URI_pn-libevent = "http://libevent.org/"
-REGEX_URI_pn-db = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html"
-REGEX_URI_pn-python-smartpm="https://launchpad.net/smart/trunk/"
-REGEX_URI_pn-lsof = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
-REGEX_URI_pn-pbzip2 = "http://compression.ca/pbzip2/"
-REGEX_URI_pn-quicky = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482"
-REGEX_URI_pn-libwebp = "http://downloads.webmproject.org/releases/webp/index.html"
-
-# The engine tries to use directory versioning but is a false-positive
-REGEX_URI_pn-intltool = "https://launchpad.net/intltool/trunk/"
-REGEX_URI_pn-libnfsidmap = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/"
-REGEX_URI_pn-mpfr = "http://www.mpfr.org/mpfr-current/"
-REGEX_URI_pn-nss = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
-REGEX_pn-nss = "NSS_(?P<pver>.+)_release_notes"
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index bf302f3..692d295 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -16,6 +16,8 @@ SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
+REGEX_URI = "http://www.ngolde.de/libacpi.html"
+
inherit lib_package
COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index e0ce57d..df55142 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -24,6 +24,8 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
SRC_URI[sha256sum] = "c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1"
+REGEX_URI = "http://ohse.de/uwe/software/lrzsz.html"
+
inherit autotools gettext
do_install() {
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index d883a8d..96cf108 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -20,6 +20,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
file://dhcpd.service file://dhcrelay.service \
file://dhcpd6.service "
+REGEX_URI = "ftp://ftp.isc.org/isc/dhcp/"
+REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
+
inherit autotools systemd
SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay"
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
index 5b578e9..2884e48 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
+++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${P
SRC_URI[md5sum] = "2ac4893c92716add1a1447ae01df77ab"
SRC_URI[sha256sum] = "656d245d84400e1030f8f40a5a27da76370690c4a932baf249110f047fe7efcf"
+REGEX_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/"
+
inherit autotools
EXTRA_OECONF = "--disable-ldap"
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
index 26ecdf3..c9d69a6 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
@@ -19,6 +19,9 @@ SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.$
SRC_URI[md5sum] = "ca91ba7c7eff9bfff6926b1a34a4697d"
SRC_URI[sha256sum] = "abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63"
+REGEX_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+REGEX = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz"
+
S = "${WORKDIR}/wireless_tools.30"
CFLAGS =+ "-I${S}"
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
index 2a28512..b27ac95 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
@@ -17,6 +17,9 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
SRC_URI[md5sum] = "385d7c7dfbe60babbee261c054923a53"
SRC_URI[sha256sum] = "7bbdb73b5518baf64c6d3739fb2ecc66d2cccda888ce5ad573abe235ab5d96ba"
+REGEX_URI = "http://ftp.gnu.org/gnu/autogen/"
+REGEX = "rel(?P<pver>\d+(\.\d+)+)/"
+
DEPENDS = "guile-native libtool-native libxml2-native"
inherit autotools texinfo native pkgconfig
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.16.bb b/meta/recipes-devtools/chrpath/chrpath_0.16.bb
index 0a3b06e..9a55cb0 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.16.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.16.bb
@@ -13,6 +13,8 @@ SRC_URI = "http://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.
SRC_URI[md5sum] = "2bf8d1d1ee345fc8a7915576f5649982"
SRC_URI[sha256sum] = "bb0d4c54bac2990e1bdf8132f2c9477ae752859d523e141e72b3b11a12c26e7b"
+REGEX_URI = "http://alioth.debian.org/frs/?group_id=31052"
+
inherit autotools
# We don't have a staged chrpath-native for ensuring our binary is
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index c912bcc..c28fcd1 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -19,6 +19,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
SRC_URI[md5sum] = "5febbd11bcaac854a27eebaf4a124be2"
SRC_URI[sha256sum] = "e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22"
+REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
+
inherit autotools
# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb b/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
index ac131cb..8845d8a 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
@@ -13,6 +13,8 @@ SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v3.0.28/do
SRC_URI[md5sum] = "6a047a6c65186b9ebb1853709adb36db"
SRC_URI[sha256sum] = "ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2"
+REGEX_URI = "https://github.com/dosfstools/dosfstools/releases"
+
FILES_${PN} = "${base_sbindir}"
FILES_${PN}-doc = "${mandir} ${docdir}"
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index be77704..b434677 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -4,6 +4,9 @@ LICENSE = "GPLv2"
URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
+
+REGEX_URI = "https://launchpad.net/intltool/trunk/"
+
S = "${WORKDIR}/intltool-${PV}"
DEPENDS = "libxml-parser-perl-native"
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb
index cfef03d..ff97a29 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.12.bb
@@ -11,6 +11,11 @@ SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
+REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
+# json-c releases page is fetching the list of releases in some weird XML format
+# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
+#REGEX_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
+
RPROVIDES_${PN} = "libjson"
inherit autotools
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 3930410..7b7a97b 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -111,6 +111,8 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
SRC_URI[md5sum] = "25093d399a0b5d1342d24900a91b347d"
SRC_URI[sha256sum] = "676e3ab41f72e3b504e04109cfb565a300742f56a7da084f202013b30eeae467"
+REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
+
inherit autotools gettext
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index d7b8c06..909f259 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -17,6 +17,8 @@ SRC_URI = "http://www.bzip.org/${PV}/${BP}.tar.gz \
SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
+REGEX_URI = "http://www.bzip.org/downloads.html"
+
PACKAGES =+ "libbz2"
CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 2c34da9..2209483 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -12,6 +12,9 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
file://cups.service \
"
+REGEX_URI = "http://www.cups.org/software.php"
+REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar"
+
LEAD_SONAME = "libcupsdriver.so"
CLEANBROKEN = "1"
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
index 790c981..38d9e18 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
@@ -20,6 +20,8 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
SRC_URI[md5sum] = "b05f5dcbfe359f198eef3df5b283d896"
SRC_URI[sha256sum] = "a2e2e53e502571e88eeb9010c45a0d54671f15707ee104f5c9c22b59ea7a33e3"
+REGEX = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz"
+
inherit autotools pkgconfig
EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20121221.bb
index e87a32a..edd0323 100644
--- a/meta/recipes-extended/iputils/iputils_s20121221.bb
+++ b/meta/recipes-extended/iputils/iputils_s20121221.bb
@@ -24,6 +24,8 @@ SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171"
SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f"
+REGEX = "iputils-(?P<pver>s\d+).tar"
+
do_compile () {
oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man
}
diff --git a/meta/recipes-extended/less/less_479.bb b/meta/recipes-extended/less/less_479.bb
index 618954b..f9bb7c6 100644
--- a/meta/recipes-extended/less/less_479.bb
+++ b/meta/recipes-extended/less/less_479.bb
@@ -30,6 +30,8 @@ SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
SRC_URI[md5sum] = "049f51ccfe2686009c6ce943eeb4bbaf"
SRC_URI[sha256sum] = "5bf06cb30ee2a2bd1f79f39aa91e46444e7cb19b48c95c4992fa63cfe4527a80"
+REGEX_URI = "http://www.greenwoodsoftware.com/less/download.html"
+
inherit autotools update-alternatives
do_install () {
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb b/meta/recipes-extended/lsof/lsof_4.89.bb
index 0e9d071..acee2b0 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/meta/recipes-extended/lsof/lsof_4.89.bb
@@ -9,6 +9,8 @@ SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386"
SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718"
+REGEX_URI = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
+
LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
S = "${WORKDIR}/lsof_${PV}_src"
diff --git a/meta/recipes-extended/minicom/minicom_2.7.bb b/meta/recipes-extended/minicom/minicom_2.7.bb
index 1575cfb..5191414 100644
--- a/meta/recipes-extended/minicom/minicom_2.7.bb
+++ b/meta/recipes-extended/minicom/minicom_2.7.bb
@@ -15,6 +15,8 @@ SRC_URI = "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz
SRC_URI[md5sum] = "7044ca3e291268c33294f171d426dc2d"
SRC_URI[sha256sum] = "9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4"
+REGEX_URI = "https://alioth.debian.org/frs/?group_id=30018"
+
PACKAGECONFIG ??= ""
PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev"
diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb b/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
index 0330981..5b32c19 100644
--- a/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
+++ b/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
@@ -16,6 +16,8 @@ SRC_URI = "https://launchpad.net/${BPN}/1.1/${PV}/+download/${BP}.tar.gz"
SRC_URI[md5sum] = "91a4911b13305850423840eb0fa6f4f9"
SRC_URI[sha256sum] = "573bb358a5a7d3bf5f42f881af324cedf960c786e8d66dd03d448ddd8a0166ee"
+REGEX_URI = "http://compression.ca/pbzip2/"
+
do_configure[noexec] = "1"
EXTRA_OEMAKE = "CXX='${CXX} ${CXXFLAGS}' LDFLAGS='${LDFLAGS}'"
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 5c761fa..104af58 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -9,6 +9,8 @@ SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
file://sysstat.service \
"
+REGEX_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
+
DEPENDS += "base-passwd"
inherit autotools-brokensep gettext systemd
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
index 46f1e3c..2d8e0eb 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
@@ -24,6 +24,8 @@ SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \
SRC_URI[md5sum] = "fadf5e7a08e0526fc60dbe3e5b7ef8d6"
SRC_URI[sha256sum] = "7b05558ae4bb8ede356863cae8c42e3e012aa421bf9d45130a570fd209d79102"
+REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
+
inherit autotools-brokensep distro_features_check
# The xprop requires x11 in DISTRO_FEATURES
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.4.bb b/meta/recipes-graphics/cairo/cairo_1.14.4.bb
index 17ea851..e7b7ecd 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.4.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.4.bb
@@ -7,6 +7,8 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
SRC_URI[md5sum] = "90a929e8fe66fb5d19b5adaaea1e9a12"
SRC_URI[sha256sum] = "f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716"
+REGEX = "cairo-(?P<pver>\d+(\.\d+)+)\.tar"
+
PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
SUMMARY_${PN} = "The Cairo 2D vector graphics library"
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index c0d5c6a..6a92a3d 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -27,6 +27,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://pkgconfig.patch \
"
+REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
+
S = "${WORKDIR}/SDL-${PV}"
SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb b/meta/recipes-graphics/tslib/tslib_1.1.bb
index 6d8c7dd..3d694e7 100644
--- a/meta/recipes-graphics/tslib/tslib_1.1.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.
SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d"
SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c"
+REGEX_URI = "https://github.com/kergoth/tslib/releases"
inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.1.bb b/meta/recipes-graphics/waffle/waffle_1.5.1.bb
index af84020..f83e988 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.1.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.5.1.bb
@@ -9,6 +9,8 @@ SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz \
SRC_URI[md5sum] = "c0d802bc3d0aba87c51e423a3a8bdd69"
SRC_URI[sha256sum] = "cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa"
+REGEX_URI = "http://www.waffle-gl.org/releases.html"
+
inherit cmake distro_features_check lib_package
# This should be overridden per-machine to reflect the capabilities of the GL
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
index a166b57..4a99792 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158"
SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
+REGEX_URI = "http://xkbcommon.org/"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-docs"
diff --git a/meta/recipes-kernel/powertop/powertop_2.7.bb b/meta/recipes-kernel/powertop/powertop_2.7.bb
index 5ba07e9..0671c3e 100644
--- a/meta/recipes-kernel/powertop/powertop_2.7.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.7.bb
@@ -11,6 +11,8 @@ SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-${PV}.t
SRC_URI[md5sum] = "e0d686e47daaf7e9d89031f7763432ef"
SRC_URI[sha256sum] = "8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca"
+REGEX_URI = "https://01.org/powertop/downloads"
+
inherit autotools gettext pkgconfig
# we need to explicitly link with libintl in uClibc systems
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
index f06935c..cc7fb0c 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
@@ -11,6 +11,9 @@ SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
SRC_URI[md5sum] = "1c7fb25191b4e6e3628d198a66a84f47"
SRC_URI[sha256sum] = "93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06"
+
+REGEX_URI = "http://www.mega-nerd.com/SRC/download.html"
+
S = "${WORKDIR}/libsamplerate-${PV}"
inherit autotools pkgconfig
diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
index 18cb168..8566596 100644
--- a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
+++ b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
@@ -15,6 +15,8 @@ SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \
SRC_URI[md5sum] = "292ab65cedd5021d6b7ddd117e07cd8e"
SRC_URI[sha256sum] = "b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
+REGEX = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-examples"
diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
index c4b80f6..e245e6f 100644
--- a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
+++ b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
@@ -17,6 +17,8 @@ SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
SRC_URI[md5sum] = "08813525eeeffe7e305b4cbfade8ae9b"
SRC_URI[sha256sum] = "efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4"
+REGEX_URI = "http://downloads.webmproject.org/releases/webp/index.html"
+
EXTRA_OECONF = " \
--disable-experimental \
--disable-wic \
diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/meta/recipes-qt/qt-apps/quicky_0.4.bb
index bcaa562..53e09bd 100644
--- a/meta/recipes-qt/qt-apps/quicky_0.4.bb
+++ b/meta/recipes-qt/qt-apps/quicky_0.4.bb
@@ -11,6 +11,8 @@ SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
SRC_URI[md5sum] = "824d9e477ee9c4994f73a3cb215161d9"
SRC_URI[sha256sum] = "9c66376e0035d44547612bf629890769a6178c3e7eafbcf95f1c6207ac0f352a"
+REGEX_URI = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482"
+
inherit qt4x11
do_install() {
diff --git a/meta/recipes-support/libevent/libevent_2.0.22.bb b/meta/recipes-support/libevent/libevent_2.0.22.bb
index 58c263c..5709664 100644
--- a/meta/recipes-support/libevent/libevent_2.0.22.bb
+++ b/meta/recipes-support/libevent/libevent_2.0.22.bb
@@ -14,6 +14,8 @@ SRC_URI = " \
SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11"
SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3"
+REGEX_URI = "http://libevent.org/"
+
S = "${WORKDIR}/${BPN}-${PV}-stable"
PACKAGECONFIG ??= ""
diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/meta/recipes-support/libical/libical_1.0.0.bb
index be6b635..85b403d 100644
--- a/meta/recipes-support/libical/libical_1.0.0.bb
+++ b/meta/recipes-support/libical/libical_1.0.0.bb
@@ -10,4 +10,6 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz"
SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36"
SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2"
+REGEX_URI = "https://github.com/libical/libical/releases/"
+
inherit autotools
diff --git a/meta/recipes-support/libmpc/libmpc_1.0.3.bb b/meta/recipes-support/libmpc/libmpc_1.0.3.bb
index f3e5a18..85e0b6e 100644
--- a/meta/recipes-support/libmpc/libmpc_1.0.3.bb
+++ b/meta/recipes-support/libmpc/libmpc_1.0.3.bb
@@ -8,6 +8,8 @@ SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz"
SRC_URI[md5sum] = "d6a1d5f8ddea3abd2cc3e98f58352d26"
SRC_URI[sha256sum] = "617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3"
+REGEX_URI = "http://www.multiprecision.org/index.php?prog=mpc&page=download"
+
S = "${WORKDIR}/mpc-${PV}"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.28.bb
index 87fabec..3a07086 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.28.bb
@@ -15,6 +15,9 @@ SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7"
SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
+
+REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
+
S = "${WORKDIR}/libxslt-${PV}"
BINCONFIG = "${bindir}/xslt-config"
diff --git a/meta/recipes-support/mpfr/mpfr_3.1.3.bb b/meta/recipes-support/mpfr/mpfr_3.1.3.bb
index af19b54..c777630 100644
--- a/meta/recipes-support/mpfr/mpfr_3.1.3.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.1.3.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \
SRC_URI[md5sum] = "6969398cd2fbc56a6af570b5273c56a9"
SRC_URI[sha256sum] = "6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16"
+REGEX_URI = "http://www.mpfr.org/mpfr-current/"
+
S = "${WORKDIR}/mpfr-${PV}"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
index fafff6d..444509c 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/meta/recipes-support/nettle/nettle.inc
@@ -16,6 +16,8 @@ SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
+REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
+
EXTRA_OECONF = "--disable-openssl"
inherit autotools ptest
diff --git a/meta/recipes-support/nss/nss_3.19.2.bb b/meta/recipes-support/nss/nss_3.19.2.bb
index 23a4a1f..fff6e96 100644
--- a/meta/recipes-support/nss/nss_3.19.2.bb
+++ b/meta/recipes-support/nss/nss_3.19.2.bb
@@ -27,6 +27,9 @@ SRC_URI = "\
SRC_URI[md5sum] = "b02ffd1e8e8ef5f8512fa02d8ca9db3d"
SRC_URI[sha256sum] = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae"
+REGEX_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
+REGEX = "NSS_(?P<pver>.+)_release_notes"
+
inherit siteinfo
DEPENDS = "sqlite3 nspr zlib nss-native"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.0.bb b/meta/recipes-support/sqlite/sqlite3_3.9.0.bb
index 50531ba..39f3e6c 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.9.0.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.9.0.bb
@@ -15,6 +15,9 @@ SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz"
SRC_URI[md5sum] = "cd0f883b2ddfc29e8e1bbbbd8e85f555"
SRC_URI[sha256sum] = "a324143f4cc35cd7e9605a0a8dec9f9e4861d0be8305f3642e7d05008b77e60d"
+REGEX_URI = "http://www.sqlite.org/"
+REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html"
+
S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
# Provide column meta-data API
diff --git a/meta/recipes-support/taglib/taglib_1.9.1.bb b/meta/recipes-support/taglib/taglib_1.9.1.bb
index 1f27814..fa56567 100644
--- a/meta/recipes-support/taglib/taglib_1.9.1.bb
+++ b/meta/recipes-support/taglib/taglib_1.9.1.bb
@@ -12,6 +12,8 @@ SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz"
SRC_URI[md5sum] = "0d35df96822bbd564c5504cb3c2e4d86"
SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a"
+REGEX_URI = "http://github.com/taglib/taglib/releases/"
+
BINCONFIG = "${bindir}/taglib-config"
inherit cmake pkgconfig binconfig-disabled
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 0/8] Deprecate package_regex.inc and split it into recipes
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
` (7 preceding siblings ...)
2015-11-18 9:52 ` [PATCH 8/8] package_regex.inc: split the rest of the entries " Alexander Kanavin
@ 2015-11-18 15:38 ` Richard Purdie
2015-11-18 15:48 ` Alexander Kanavin
8 siblings, 1 reply; 12+ messages in thread
From: Richard Purdie @ 2015-11-18 15:38 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
On Wed, 2015-11-18 at 11:52 +0200, Alexander Kanavin wrote:
> This patch series deprecates package_regex.inc and splits its contents into
> respective recipes. This is done for same reasons as deprecating
> upstream_tracking.inc: having upstream version check tweaks bundled into a
> separate file makes the information prone to getting out of date.
Looking at the patches the one thing that bothers me is the name of this
variable, "REGEX". In the recipe context its rather ambiguous what it
means.
I'm wondering if we should take the opportunity to call it something
like SRC_URI_REGEX or something?
We either do it now or not at all...
Cheers,
Richard
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/8] Deprecate package_regex.inc and split it into recipes
2015-11-18 15:38 ` [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Richard Purdie
@ 2015-11-18 15:48 ` Alexander Kanavin
2015-11-18 16:06 ` Burton, Ross
0 siblings, 1 reply; 12+ messages in thread
From: Alexander Kanavin @ 2015-11-18 15:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 11/18/2015 05:38 PM, Richard Purdie wrote:
>> This patch series deprecates package_regex.inc and splits its contents into
>> respective recipes. This is done for same reasons as deprecating
>> upstream_tracking.inc: having upstream version check tweaks bundled into a
>> separate file makes the information prone to getting out of date.
>
> Looking at the patches the one thing that bothers me is the name of this
> variable, "REGEX". In the recipe context its rather ambiguous what it
> means.
>
> I'm wondering if we should take the opportunity to call it something
> like SRC_URI_REGEX or something?
>
> We either do it now or not at all...
I agree. I'll do the rename (from REGEX_URI to UPSTREAM_CHECK_URI and
from REGEX to UPSTREAM_CHECK_REGEX) and resubmit.
This may break upstream versions checks for a while though, because
there may be code accessing these variables that is not in oe-core tree.
Alex
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/8] Deprecate package_regex.inc and split it into recipes
2015-11-18 15:48 ` Alexander Kanavin
@ 2015-11-18 16:06 ` Burton, Ross
0 siblings, 0 replies; 12+ messages in thread
From: Burton, Ross @ 2015-11-18 16:06 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
On 18 November 2015 at 15:48, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:
> This may break upstream versions checks for a while though, because there
> may be code accessing these variables that is not in oe-core tree.
>
We can coordinate the merge with fixing the RRS and so on, and the bulk of
the logic *should* be in oe-core itself now anyway as part of
distrodata.bbclass (and the code it calls in bitbake).
Ross
[-- Attachment #2: Type: text/html, Size: 863 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-11-18 16:06 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-18 9:52 [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 1/8] package_regex.inc: deprecate the file Alexander Kanavin
2015-11-18 9:52 ` [PATCH 2/8] package_regex.inc: split entries with odd-even versioning into their own recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 3/8] package_regex.inc: split GITTAGREGEX entries into recipe files Alexander Kanavin
2015-11-18 9:52 ` [PATCH 4/8] package_regex.inc: split Debian-related entries into their own recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 5/8] package_regex.inc: split PyPi related entries to " Alexander Kanavin
2015-11-18 9:52 ` [PATCH 6/8] package_regex.inc: split sourceforge " Alexander Kanavin
2015-11-18 9:52 ` [PATCH 7/8] package_regex.inc: split entries which blacklist specific versions to their recipes Alexander Kanavin
2015-11-18 9:52 ` [PATCH 8/8] package_regex.inc: split the rest of the entries " Alexander Kanavin
2015-11-18 15:38 ` [PATCH 0/8] Deprecate package_regex.inc and split it into recipes Richard Purdie
2015-11-18 15:48 ` Alexander Kanavin
2015-11-18 16:06 ` Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.