From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail5.wrs.com (mail5.wrs.com [192.103.53.11]) by mx.groups.io with SMTP id smtpd.web10.2491.1594347118372814533 for ; Thu, 09 Jul 2020 19:11:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: windriver.com, ip: 192.103.53.11, mailfrom: changqing.li@windriver.com) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id 06A2Banl015055 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 9 Jul 2020 19:11:46 -0700 Received: from pek-lpg-core2.corp.ad.wrs.com (128.224.153.41) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.487.0; Thu, 9 Jul 2020 19:11:25 -0700 From: "Changqing Li" To: Subject: [PATCH V3] dpkg: change SRC_URI to take dpkg from git Date: Fri, 10 Jul 2020 10:08:28 +0800 Message-ID: <20200710020828.76717-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain From: Changqing Li tar.xz on original URL have been removed, switch to use git Signed-off-by: Changqing Li --- meta/recipes-devtools/dpkg/dpkg.inc | 9 ++++++++- meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 1c3c585d79..a309613259 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 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" RDEPENDS_${PN}_class-native = "" -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" inherit autotools gettext perlnative pkgconfig perl-version update-alternatives @@ -30,6 +30,13 @@ EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH PACKAGECONFIG = "liblzma" PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" +do_configure_prepend () { + # autotools_do_configure updates po/Makefile.in.in, we also need + # update dselect/po and scripts/po + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/dselect/po/ + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/ +} + do_install_append () { if [ "${PN}" = "dpkg-native" ]; then # 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..935dcac918 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 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \ @@ -18,5 +18,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" -SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" +SRCREV = "314ac02663c5bd1a82b34745150bf13a39a549a3" + +S = "${WORKDIR}/git" + +#autotools.bbclass default AUTOTOOLS_AUXDIR is ${S}, we need to under ${S}/build-aux +AUTOTOOLS_AUXDIR = "${S}/build-aux" -- 2.17.1