package_regex.inc: fix upstream version check for -native and -initial packages
PATCH 1/1 package_regex.inc: fix upstream version check for -native and -initial packages
In reply to a message not in the archiveSigned-off-by Alexander Kanavin <[email protected]>
--- meta-yocto/conf/distro/include/package_regex.inc | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-)
meta-yocto/conf/distro/include/package_regex.inc +20 -14
@@ -45,13 +45,15 @@ REGEX_pn-nettle = "nettle-(?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+)+)/" +REGEX_URI_pn-autogen-native = "http://ftp.gnu.org/gnu/autogen/" +REGEX_pn-autogen-native = "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-python-native = "[Pp]ython-(?P<pver>2(\.\d+)+).tar" REGEX_pn-python3 = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" +REGEX_pn-python3-native = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" # exclude betas REGEX_pn-tiff = "tiff-(?P<pver>\d+(\.\d+)+).tar"
@@ -100,10 +102,10 @@ 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+)*)/" +REGEX_URI_pn-docbook-sgml-dtd-3.1-native = "http://www.docbook.org/sgml/" +REGEX_pn-docbook-sgml-dtd-3.1-native = "(?P<pver>3\..+)/" +REGEX_URI_pn-docbook-sgml-dtd-4.1-native = "http://www.docbook.org/sgml/" +REGEX_pn-docbook-sgml-dtd-4.1-native = "(?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/"
@@ -166,17 +168,17 @@ 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://sourceforge.net/projects/openjade/files/openjade/" -REGEX_pn-openjade = "/openjade/${COMMON_REGEX}/" +REGEX_URI_pn-docbook-dsssl-stylesheets-native = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/" +REGEX_pn-docbook-dsssl-stylesheets-native = "/docbook-dsssl/${COMMON_REGEX}/" +REGEX_URI_pn-openjade-native = "http://sourceforge.net/projects/openjade/files/openjade/" +REGEX_pn-openjade-native = "/openjade/${COMMON_REGEX}/" 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/" +REGEX_URI_pn-cdrtools-native = "http://sourceforge.net/projects/cdrtools/files/alpha/" # GIT GITTAGREGEX_COMMON = "(?P<pver>\d+\.\d+(\.\d+)*)"
@@ -185,14 +187,16 @@ 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-uclibc-initial = "${GITTAGREGEX_COMMON}" GITTAGREGEX_pn-glibc = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-cross-localedef = "${GITTAGREGEX_COMMON}" +GITTAGREGEX_pn-glibc-initial = "${GITTAGREGEX_COMMON}" +GITTAGREGEX_pn-cross-localedef-native = "${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+)+))" +GITTAGREGEX_pn-chkconfig-alternatives-native = "chkconfig-(?P<pver>(\d+(\.\d+)+))" +GITTAGREGEX_pn-sgmlspl-native = "(?P<pver>(\d+(\.\d+)+))" # Exclude x.99.x versions GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)"
@@ -240,6 +244,7 @@ REGEX_pn-gstreamer1.0-rtsp-server = "${GNOME_STABLE}" # and perl REGEX_pn-perl = "${GNOME_STABLE}" +REGEX_pn-perl-native = "${GNOME_STABLE}" # Keep old gcc versions at their major versions REGEX_pn-gcc-source-4.9.2 = "gcc-(?P<pver>4\.9\.\d+).tar"
@@ -248,6 +253,7 @@ 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-apt-native = "${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/"
Signature · 1 line
2.1.4
Quoted 4 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta-yocto/conf/distro/include/package_regex.inc | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-)
Rather than duplicate these, can we teach the code in question how to map variables back to the original one (e.g. strip the -native suffix)?
Cheers,
Richard
Quoted 5 lines · Richard Purdie
Quoted 2 lines
meta-yocto/conf/distro/include/package_regex.inc | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-)Rather than duplicate these, can we teach the code in question how to map variables back to the original one (e.g. strip the -native suffix)?
That's right. Also it needs to be done because otherwise upstream check won't find the correct tarballs. Distrodata.bbclass already does it right at the start of checkpkg task, but RRS apparently does not.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=8102
Alex