summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-11 17:15:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:51 +0000
commit12ba5cc32537ea931abfecf414965a19f30f3fcb (patch)
treebe522a5df8c7393dcc333f66519dc006f91bb600
parent642e92f2cd67980a731ba21b570d8d1c6f4798e0 (diff)
downloadpoky-12ba5cc32537ea931abfecf414965a19f30f3fcb.tar.gz
package_regex.inc: split GITTAGREGEX entries into recipe files
(From OE-Core rev: 589f5442372a7ab0f8bc40403e1739ce1cdd1cc0) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/package_regex.inc26
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.22.bb1
-rw-r--r--meta/recipes-core/glibc/glibc_2.22.bb1
-rw-r--r--meta/recipes-core/uclibc/uclibc-git.inc3
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.25.1.inc2
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb2
-rw-r--r--meta/recipes-devtools/file/file_5.24.bb3
-rw-r--r--meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb1
-rw-r--r--meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb1
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_git.bb1
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb1
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.bb3
-rw-r--r--meta/recipes-graphics/mx/mx-1.0_1.4.7.bb3
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc2
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 ea628209cd..699d86963b 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
182REGEX_URI_pn-libcgroup = "http://sourceforge.net/projects/libcg/files/libcgroup/" 182REGEX_URI_pn-libcgroup = "http://sourceforge.net/projects/libcg/files/libcgroup/"
183REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/" 183REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/"
184 184
185# GIT
186GITTAGREGEX_COMMON = "(?P<pver>\d+\.\d+(\.\d+)*)"
187
188GITTAGREGEX_pn-linux-yocto = "${GITTAGREGEX_COMMON}"
189GITTAGREGEX_pn-linux-yocto-tiny = "${GITTAGREGEX_COMMON}"
190GITTAGREGEX_pn-linux-yocto-dev = "${GITTAGREGEX_COMMON}"
191GITTAGREGEX_pn-uclibc = "${GITTAGREGEX_COMMON}"
192GITTAGREGEX_pn-glibc = "${GITTAGREGEX_COMMON}"
193GITTAGREGEX_pn-cross-localedef = "${GITTAGREGEX_COMMON}"
194GITTAGREGEX_pn-binutils = "binutils-(?P<pver>\d+_(\d_?)*)"
195GITTAGREGEX_pn-bootchart2 = "${GITTAGREGEX_COMMON}"
196GITTAGREGEX_pn-remake = "(?P<pver>(\d+(\.\d+)+)\+dbg.+)"
197GITTAGREGEX_pn-tcf-agent = "(?P<pver>(\d+(\.\d+)+))"
198GITTAGREGEX_pn-chkconfig-alternatives = "chkconfig-(?P<pver>(\d+(\.\d+)+))"
199GITTAGREGEX_pn-sgmlspl = "(?P<pver>(\d+(\.\d+)+))"
200
201# Exclude x.99.x versions
202GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)"
203
204# Blacklist a bogus tag
205GITTAGREGEX_pn-file = "FILE(?P<pver>(?!6_23).+)"
206GITTAGREGEX_pn-xinetd = "xinetd-(?P<pver>(?!20030122).+)"
207
208# Blacklist debian-specific tags
209GITTAGREGEX_pn-xf86-video-omapfb = "(?P<pver>\d+(\.\d+)+)(?!-)"
210
211# Keep old gcc versions at their major versions 185# Keep old gcc versions at their major versions
212REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar" 186REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
213REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar" 187REGEX_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 03be9c0401..d9c01aac40 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:"
16 16
17SRCBRANCH ?= "release/${PV}/master" 17SRCBRANCH ?= "release/${PV}/master"
18GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 18GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
19UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
19 20
20SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 21SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
21 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ 22 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 cbacfd4748..eeb97422f0 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"
12SRCBRANCH ?= "release/${PV}/master" 12SRCBRANCH ?= "release/${PV}/master"
13 13
14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
15 16
16SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 17SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
17 file://0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch \ 18 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 dcb616d0d2..716a647ccd 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 \
21 file://0001-wire-in-syncfs.patch \ 21 file://0001-wire-in-syncfs.patch \
22" 22"
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24
25UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
26
diff --git a/meta/recipes-devtools/binutils/binutils-2.25.1.inc b/meta/recipes-devtools/binutils/binutils-2.25.1.inc
index f3817fafb6..bf29da16f5 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):
16 16
17BINUPV = "${@binutils_branch_version(d)}" 17BINUPV = "${@binutils_branch_version(d)}"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20
19SRCREV = "2bd25930221dea4bf33c13a89c111514491440e2" 21SRCREV = "2bd25930221dea4bf33c13a89c111514491440e2"
20SRC_URI = "\ 22SRC_URI = "\
21 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ 23 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 4b0a98068d..8ca26ef800 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"
88LICENSE = "GPL-3.0" 88LICENSE = "GPL-3.0"
89LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124" 89LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
90 90
91UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
92
91SRC_URI = "git://github.com/mmeeks/bootchart.git \ 93SRC_URI = "git://github.com/mmeeks/bootchart.git \
92 file://bootchartd_stop.sh \ 94 file://bootchartd_stop.sh \
93 " 95 "
diff --git a/meta/recipes-devtools/file/file_5.24.bb b/meta/recipes-devtools/file/file_5.24.bb
index d04f1218a9..39f185d36a 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
11DEPENDS = "zlib file-replacement-native" 11DEPENDS = "zlib file-replacement-native"
12DEPENDS_class-native = "zlib-native" 12DEPENDS_class-native = "zlib-native"
13 13
14# Blacklist a bogus tag in upstream check
15UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
16
14SRC_URI = "git://github.com/file/file.git \ 17SRC_URI = "git://github.com/file/file.git \
15 file://debian-742262.patch \ 18 file://debian-742262.patch \
16 file://0001-Add-P-prompt-into-Usage-info.patch \ 19 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 c61913d056..30f29e04ea 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 \
4 file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" 4 file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
5require remake.inc 5require remake.inc
6 6
7UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+)\+dbg.+)"
7SRC_URI += "file://version-remake.texi.patch \ 8SRC_URI += "file://version-remake.texi.patch \
8 " 9 "
9SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561" 10SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561"
diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb b/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
index 5e3460ff3a..01581c14cc 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"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" 5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
6 6
7UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
7SRC_URI = "git://github.com/gitpan/SGMLSpm \ 8SRC_URI = "git://github.com/gitpan/SGMLSpm \
8 " 9 "
9 10
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index 1337da9a9b..fff81a568c 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"
8SRCREV = "b9a735e9c7cf82f80d412b7ab15d08b89d5a4ccc" 8SRCREV = "b9a735e9c7cf82f80d412b7ab15d08b89d5a4ccc"
9PV = "1.3.0+git${SRCPV}" 9PV = "1.3.0+git${SRCPV}"
10 10
11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
11SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \ 12SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \
12 file://fix_ranlib.patch \ 13 file://fix_ranlib.patch \
13 file://ldflags.patch \ 14 file://ldflags.patch \
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 7fd34aa05f..c0f7f1674f 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"
10# support for alternatives. 10# support for alternatives.
11SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" 11SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P<pver>(\d+(\.\d+)+))"
13 14
14SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" 15SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee"
15PV = "1.3.59+${SRCPV}" 16PV = "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 9af45a51f1..652fe91de9 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"
9DEPENDS = "" 9DEPENDS = ""
10PR = "r2" 10PR = "r2"
11 11
12# Blacklist a bogus tag in upstream check
13UPSTREAM_CHECK_GITTAGREGEX = "xinetd-(?P<pver>(?!20030122).+)"
14
12SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \ 15SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \
13 file://xinetd.init \ 16 file://xinetd.init \
14 file://xinetd.conf \ 17 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 ce35b61eb1..5545c1e819 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
4SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" 4SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
5PV = "1.4.7+git${SRCPV}" 5PV = "1.4.7+git${SRCPV}"
6 6
7# Exclude x.99.x versions from upstream checks
8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)"
9
7SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ 10SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
8 file://fix-build-dir.patch \ 11 file://fix-build-dir.patch \
9 file://fix-test-includes.patch \ 12 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 0eeb870b35..3ccd870545 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"
13PR = "${INC_PR}.7" 13PR = "${INC_PR}.7"
14PV = "0.1.1+gitr${SRCPV}" 14PV = "0.1.1+gitr${SRCPV}"
15 15
16# Blacklist debian-specific tags in upstream version check
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)(?!-)"
18
16SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ 19SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \
17 file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ 20 file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \
18 file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ 21 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 e0524de27e..6b161fc064 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -4,6 +4,8 @@ LICENSE = "GPLv2"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
6 6
7UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
8
7INC_PR = "r4" 9INC_PR = "r4"
8 10
9DEPENDS += "xz-native bc-native" 11DEPENDS += "xz-native bc-native"