diff options
author | Tim Orling <timothy.t.orling@linux.intel.com> | 2016-07-27 10:24:01 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-01 12:14:39 +0100 |
commit | b6a3c9c29801616268b2d7923bda4c786d133706 (patch) | |
tree | 3841c478fa210ed45d72b616bec30ef3ea1d4fee /meta/recipes-devtools | |
parent | fbe10c86e84fd642be523bb65d2a9df85b57f545 (diff) | |
download | poky-b6a3c9c29801616268b2d7923bda4c786d133706.tar.gz |
dpkg: use snapshot.debian.org for SRC_URI
[YOCTO #10005] Krogoth-next checkuri failures
From Ross Burton (commit 1d39e4c145925e4517dc7fbb6f83767e883bb3c6)
Using ${DEBIAN_MIRROR} for SRC_URI doesn't work very well as that will only contain releases that are currently in Debian, so currently doesn't contain 1.18.4 as unstable has moved on to 1.18.9.
So, move all of SRC_URI to the .bb so it can use snapshot.debian.org instead, and set UPSTREAM_CHECK_URI to ${DEBIAN_MIRROR} so upstream release checking continues to work.
(From OE-Core rev: 85378ebe19730cc42587bf1e5e5e15b3deda638b)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.18.4.bb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 3d9e7e3058..440a5001f8 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -2,8 +2,6 @@ SUMMARY = "Package maintenance system from Debian" | |||
2 | LICENSE = "GPLv2.0+" | 2 | LICENSE = "GPLv2.0+" |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | 4 | ||
5 | SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz" | ||
6 | |||
7 | SRC_URI_append_class-native = " file://0001-When-running-do_package_write_deb-we-have-trees-of-h.patch" | 5 | SRC_URI_append_class-native = " file://0001-When-running-do_package_write_deb-we-have-trees-of-h.patch" |
8 | 6 | ||
9 | DEPENDS = "zlib bzip2 perl ncurses" | 7 | DEPENDS = "zlib bzip2 perl ncurses" |
@@ -11,6 +9,8 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte | |||
11 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" | 9 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" |
12 | RDEPENDS_${PN}_class-native = "xz-native" | 10 | RDEPENDS_${PN}_class-native = "xz-native" |
13 | 11 | ||
12 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" | ||
13 | |||
14 | inherit autotools gettext perlnative pkgconfig systemd | 14 | inherit autotools gettext perlnative pkgconfig systemd |
15 | 15 | ||
16 | python () { | 16 | python () { |
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb index 7876944d6b..5eb42de6a0 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | require dpkg.inc | 1 | require dpkg.inc |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
3 | 3 | ||
4 | SRC_URI_append_class-native =" file://glibc2.5-sync_file_range.patch " | 4 | SRC_URI += "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \ |
5 | SRC_URI += "file://noman.patch \ | 5 | file://noman.patch \ |
6 | file://remove-tar-no-timestamp.patch \ | 6 | file://remove-tar-no-timestamp.patch \ |
7 | file://fix-abs-redefine.patch \ | 7 | file://fix-abs-redefine.patch \ |
8 | file://arch_pm.patch \ | 8 | file://arch_pm.patch \ |
@@ -14,6 +14,7 @@ SRC_URI += "file://noman.patch \ | |||
14 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ | 14 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ |
15 | file://0006-add-musleabi-to-known-target-tripets.patch \ | 15 | file://0006-add-musleabi-to-known-target-tripets.patch \ |
16 | " | 16 | " |
17 | SRC_URI_append_class-native =" file://glibc2.5-sync_file_range.patch " | ||
17 | 18 | ||
18 | SRC_URI[md5sum] = "e95b513c89693f6ec3ab53b6b1c3defd" | 19 | SRC_URI[md5sum] = "e95b513c89693f6ec3ab53b6b1c3defd" |
19 | SRC_URI[sha256sum] = "fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da" | 20 | SRC_URI[sha256sum] = "fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da" |