summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-07-10 17:21:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-12 22:39:41 +0100
commit2aad399f3c3c951974472580df945bfd115dcc6e (patch)
tree444c82c54e5e7ae821bff59d3df4371c8e28fd07 /meta
parente25b9820000687b5ee4a681497edd13f15c3b30a (diff)
downloadpoky-2aad399f3c3c951974472580df945bfd115dcc6e.tar.gz
dpkg: change SRC_URI to take dpkg from git
tar.xz on original URL have been removed, switch to use git (From OE-Core rev: b8173a9a5c8bfbfa30bbf066cfbcb1c0eba1b98d) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc14
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.20.0.bb7
2 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 1c3c585d79..04fe85c4a8 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -7,7 +7,7 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte
7RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" 7RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl"
8RDEPENDS_${PN}_class-native = "" 8RDEPENDS_${PN}_class-native = ""
9 9
10UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" 10UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
11 11
12inherit autotools gettext perlnative pkgconfig perl-version update-alternatives 12inherit autotools gettext perlnative pkgconfig perl-version update-alternatives
13 13
@@ -30,6 +30,18 @@ EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH
30PACKAGECONFIG = "liblzma" 30PACKAGECONFIG = "liblzma"
31PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" 31PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz"
32 32
33
34#autotools.bbclass default AUTOTOOLS_AUXDIR is ${S}, we need to under ${S}/build-aux
35AUTOTOOLS_AUXDIR = "${S}/build-aux"
36
37do_configure_prepend () {
38 mkdir -p ${AUTOTOOLS_AUXDIR}
39 # autotools_do_configure updates po/Makefile.in.in, we also need
40 # update dselect/po and scripts/po
41 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/dselect/po/
42 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/
43}
44
33do_install_append () { 45do_install_append () {
34 if [ "${PN}" = "dpkg-native" ]; then 46 if [ "${PN}" = "dpkg-native" ]; then
35 # update-alternatives doesn't have an offline mode 47 # update-alternatives doesn't have an offline mode
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
index c98a9e58e2..334294e6f8 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
@@ -1,7 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3 3
4SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ 4SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
5 file://noman.patch \ 5 file://noman.patch \
6 file://remove-tar-no-timestamp.patch \ 6 file://remove-tar-no-timestamp.patch \
7 file://arch_pm.patch \ 7 file://arch_pm.patch \
@@ -18,5 +18,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \
18 18
19SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" 19SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
20 20
21SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" 21SRCREV = "314ac02663c5bd1a82b34745150bf13a39a549a3"
22SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" 22
23S = "${WORKDIR}/git"