summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-12 15:00:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:51 +0000
commitaa5df2adc281a826a9a91f23dd2a94dc79a29ba6 (patch)
tree5a7b208c7f7e3834dba20b2748af9620390756ec
parent12ba5cc32537ea931abfecf414965a19f30f3fcb (diff)
downloadpoky-aa5df2adc281a826a9a91f23dd2a94dc79a29ba6.tar.gz
package_regex.inc: split Debian-related entries into their own recipes
(From OE-Core rev: 2a5e1848c11bd9a3c64cf8fcc0cb334c738bc5c5) 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.inc17
-rw-r--r--meta/recipes-bsp/apmd/apmd_3.2.2-15.bb4
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb4
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.29.bb4
-rw-r--r--meta/recipes-devtools/apt/apt.inc4
-rw-r--r--meta/recipes-extended/blktool/blktool_4-7.bb4
-rw-r--r--meta/recipes-extended/mailx/mailx_12.5-5.bb4
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb8
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 699d86963b..6bae1fcabe 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/"
185# Keep old gcc versions at their major versions 185# Keep old gcc versions at their major versions
186REGEX_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"
187REGEX_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"
188
189# these packages are taken from snapshots.debian.org; that source is static and goes stale
190# so we check the latest upstream from a directory that does get updated
191REGEX_URI_pn-apt = "${DEBIAN_MIRROR}/main/a/apt/"
192REGEX_URI_pn-resolvconf = "${DEBIAN_MIRROR}/main/r/resolvconf/"
193REGEX_URI_pn-net-tools = "${DEBIAN_MIRROR}/main/n/net-tools/"
194
195# same for packages from launchpad
196REGEX_URI_pn-base-passwd = "${DEBIAN_MIRROR}/main/b/base-passwd/"
197
198# for these packages we're mostly interested in tracking debian patches,
199# and not in the upstream version where all development has effectively stopped
200DEBIAN_PATCH_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
201REGEX_pn-net-tools = "${DEBIAN_PATCH_REGEX}"
202REGEX_pn-apmd = "${DEBIAN_PATCH_REGEX}"
203REGEX_pn-blktool = "${DEBIAN_PATCH_REGEX}"
204REGEX_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 ea105268a6..9492c6994e 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 \
22SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8" 22SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
23SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d" 23SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d"
24 24
25# for this package we're mostly interested in tracking debian patches,
26# and not in the upstream version where all development has effectively stopped
27UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
28
25S = "${WORKDIR}/apmd-3.2.2.orig" 29S = "${WORKDIR}/apmd-3.2.2.orig"
26 30
27inherit update-rc.d systemd 31inherit 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 916b9f2ae4..cc37541d5b 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/
19SRC_URI[md5sum] = "7362d766e47bfc253500f42b30330d9f" 19SRC_URI[md5sum] = "7362d766e47bfc253500f42b30330d9f"
20SRC_URI[sha256sum] = "5a6e21e8ba6822a5f93075c8c8fe7977e34780ba551af51930d0b31fdd99ab56" 20SRC_URI[sha256sum] = "5a6e21e8ba6822a5f93075c8c8fe7977e34780ba551af51930d0b31fdd99ab56"
21 21
22# the package is taken from snapshots.debian.org; that source is static and goes stale
23# so we check the latest upstream from a directory that does get updated
24UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/"
25
22inherit allarch 26inherit allarch
23 27
24do_compile () { 28do_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 ac9bd81d31..a770168298 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
17SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421" 17SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421"
18SRC_URI[sha256sum] = "f0b66388b2c8e49c15692439d2bee63bcdd4bbbf7a782c7f64accc55986b6a36" 18SRC_URI[sha256sum] = "f0b66388b2c8e49c15692439d2bee63bcdd4bbbf7a782c7f64accc55986b6a36"
19 19
20# the package is taken from launchpad; that source is static and goes stale
21# so we check the latest upstream from a directory that does get updated
22UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/"
23
20inherit autotools 24inherit autotools
21 25
22SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" 26SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst"
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 3248b9a7b2..8e267c3a82 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -16,6 +16,10 @@ SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276"
16SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543" 16SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543"
17LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 17LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
18 18
19# the package is taken from snapshots.debian.org; that source is static and goes stale
20# so we check the latest upstream from a directory that does get updated
21UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/"
22
19inherit autotools gettext 23inherit autotools gettext
20 24
21EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" 25EXTRA_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 679196be1f..d6250a90c4 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 \
18SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" 18SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
19SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764" 19SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
20 20
21# for this package we're mostly interested in tracking debian patches,
22# and not in the upstream version where all development has effectively stopped
23UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
24
21S = "${WORKDIR}/${BPN}-4.orig" 25S = "${WORKDIR}/${BPN}-4.orig"
22 26
23inherit autotools pkgconfig 27inherit 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 c87c58258b..4a32d2f684 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
26SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2" 26SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2"
27SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad" 27SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad"
28 28
29# for this package we're mostly interested in tracking debian patches,
30# and not in the upstream version where all development has effectively stopped
31UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
32
29S = "${WORKDIR}/heirloom-mailx-12.5" 33S = "${WORKDIR}/heirloom-mailx-12.5"
30 34
31inherit autotools-brokensep 35inherit 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 aefc1e6e7e..923d048ed6 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/
13 file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \ 13 file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \
14 " 14 "
15 15
16# for this package we're mostly interested in tracking debian patches,
17# and not in the upstream version where all development has effectively stopped
18UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
19
16S = "${WORKDIR}/net-tools-1.60" 20S = "${WORKDIR}/net-tools-1.60"
17 21
18SRC_URI[tarball.md5sum] = "ecaf37acb5b5daff4bdda77785fd916d" 22SRC_URI[tarball.md5sum] = "ecaf37acb5b5daff4bdda77785fd916d"
@@ -21,6 +25,10 @@ SRC_URI[tarball.sha256sum] = "ec67967cf7b1a3a3828a84762fbc013ac50ee5dc9aa3095d5c
21SRC_URI[patch.md5sum] = "ea3592f49ac8380962bc4d9b66c7e7e9" 25SRC_URI[patch.md5sum] = "ea3592f49ac8380962bc4d9b66c7e7e9"
22SRC_URI[patch.sha256sum] = "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e46585022fc76c" 26SRC_URI[patch.sha256sum] = "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e46585022fc76c"
23 27
28# the package is taken from snapshots.debian.org; that source is static and goes stale
29# so we check the latest upstream from a directory that does get updated
30UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
31
24inherit gettext 32inherit gettext
25 33
26# The Makefile is lame, no parallel build 34# The Makefile is lame, no parallel build