dpkg: 1.18.25 -> 1.19.4

Upgrade dpkg from 1.18.25 to 1.19.4:

* update SRC_URI which DEBIAN_MIRROR
* un-export PERL which causes script scripts/dpkg-architecture.pl fails
  to get cpu type and package arch
* add configure option '--disable-update-alternatives' which causes
  installed-vs-shipped issue
* add patch for dpkg-native to resolve host tar may not support
  options --owner=NAME:ID and --group=NAME:ID
* update context of patches
* drop dpkg-configure.service that apt provides a systemd timer to do it

(From OE-Core rev: 5185b6fe3d4fa9b53baffa6ee419da60ac056da2)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 21 deletions

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index fe4732d1db..fee7a75814 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -9,15 +9,8 @@ RDEPENDS_${PN}_class-native = ""
 
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"
 
-inherit autotools gettext perlnative pkgconfig systemd perl-version
+inherit autotools gettext perlnative pkgconfig perl-version
 
-python () {
-    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-        pn = d.getVar('PN')
-        d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service')
-}
-
-export PERL = "${bindir}/perl"
 PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
 
 export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}"
@@ -29,14 +22,14 @@ EXTRA_OECONF = "\
                 --with-libz \
                 --with-libbz2 \
                 --without-libselinux \
+                TAR=tar \
                 "
 
+EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}"
+
 PACKAGECONFIG = "liblzma"
 PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz"
 
-EXTRA_OECONF += "TAR=tar"
-EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}"
-
 do_install_append () {
         if [ "${PN}" = "dpkg-native" ]; then
                 # update-alternatives doesn't have an offline mode
@@ -45,16 +38,6 @@ do_install_append () {
         else
                 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
         fi
-
-        if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
-                install -d ${D}${systemd_unitdir}/system
-                install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/
-                sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-                        -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-                        -e 's,@BINDIR@,${bindir},g' \
-                        -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
-                        ${D}${systemd_unitdir}/system/dpkg-configure.service
-        fi
 }
 
 PROV = "virtual/update-alternatives"