From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta/recipes-devtools/dpkg/dpkg.inc | 25 ++-------- .../0001-arch-Add-support-for-riscv64-CPU.patch | 54 ---------------------- ...tinsts-expect-D-to-be-set-when-running-in.patch | 19 ++++++-- .../dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch | 16 ++++--- ...uild.c-Remove-usage-of-clamp-mtime-in-tar.patch | 12 +++-- .../dpkg/dpkg/dpkg-configure.service | 17 ------- .../dpkg/dpkg/glibc2.5-sync_file_range.patch | 11 +++-- .../dpkg/dpkg/tweak-options-require-tar-1.27.patch | 27 +++++++++++ poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb | 22 --------- poky/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb | 22 +++++++++ 10 files changed, 93 insertions(+), 132 deletions(-) delete mode 100644 poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch delete mode 100644 poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service create mode 100644 poky/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch delete mode 100644 poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb create mode 100644 poky/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb (limited to 'poky/meta/recipes-devtools/dpkg') diff --git a/poky/meta/recipes-devtools/dpkg/dpkg.inc b/poky/meta/recipes-devtools/dpkg/dpkg.inc index fe4732d1d..fee7a7581 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg.inc +++ b/poky/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" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch deleted file mode 100644 index 45c606e69..000000000 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 319f32d743f5b5e725012654d124e49226d5de91 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Mar 2018 20:28:24 -0700 -Subject: [PATCH] arch: Add support for riscv64 CPU - - * Architecture support: - - Add support for riscv64 CPU. Closes: #822914 - Thanks to Manuel A. Fernandez Montecelo - -Upstream-Status: Backport [https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=dpkg%2Fdpkg.git;a=commitdiff_plain;h=ee0855cc66076691de4796be48f8a0d889fde001;hp=2f5816d8be40b449d2473b22f9e0c33b32f3bd78] - -Signed-off-by: Khem Raj ---- - data/cputable | 1 + - scripts/t/Dpkg_Arch.t | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/data/cputable b/data/cputable -index a2bd7d6..9f2a8e0 100644 ---- a/data/cputable -+++ b/data/cputable -@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big - powerpcel powerpcle powerpcle 32 little - ppc64 powerpc64 (powerpc|ppc)64 64 big - ppc64el powerpc64le powerpc64le 64 little -+riscv64 riscv64 riscv64 64 little - s390 s390 s390 32 big - s390x s390x s390x 64 big - sh3 sh3 sh3 32 little -diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t -index d478b49..ecd5d66 100644 ---- a/scripts/t/Dpkg_Arch.t -+++ b/scripts/t/Dpkg_Arch.t -@@ -16,7 +16,7 @@ - use strict; - use warnings; - --use Test::More tests => 16367; -+use Test::More tests => 16832; - - use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch - debarch_eq debarch_is debarch_is_wildcard -@@ -162,7 +162,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); - is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); - is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); - --is(scalar get_valid_arches(), 524, 'expected amount of known architectures'); -+is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); - - { - local $ENV{CC} = 'false'; --- -2.16.2 - diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index 93d870443..b88be8749 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch @@ -10,15 +10,16 @@ Upstream-Status: Inappropriate [OE Specific] RP 2011/12/07 ALIMON 2016/05/26 ALIMON 2017/02/21 +KKang 2019/02/20 --- src/script.c | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/src/script.c b/src/script.c -index 2f252ae..768a9d1 100644 +index 0865b95..73ed35d 100644 --- a/src/script.c +++ b/src/script.c -@@ -97,48 +97,10 @@ setexecute(const char *path, struct stat *stab) +@@ -96,58 +96,11 @@ setexecute(const char *path, struct stat *stab) static const char * maintscript_pre_exec(struct command *cmd) { @@ -32,6 +33,8 @@ index 2f252ae..768a9d1 100644 - changedir = "/"; - - if (instdirlen > 0 && !fc_script_chrootless) { +- int rc; +- - if (strncmp(admindir, instdir, instdirlen) != 0) - ohshit(_("admindir must be inside instdir for dpkg to work properly")); - if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0) @@ -39,7 +42,12 @@ index 2f252ae..768a9d1 100644 - if (setenv("DPKG_ROOT", "", 1) < 0) - ohshite(_("unable to setenv for subprocesses")); - -- if (chroot(instdir)) +- rc = chroot(instdir); +- if (rc && fc_nonroot && errno == EPERM) +- ohshit(_("not enough privileges to change root " +- "directory with --force-not-root, consider " +- "using --force-script-chrootless?")); +- else if (rc) - ohshite(_("failed to chroot to '%.250s'"), instdir); + if (*instdir) { + setenv("D", instdir, 1); @@ -64,7 +72,10 @@ index 2f252ae..768a9d1 100644 - if (instdirlen == 0 || fc_script_chrootless) - return cmd->filename; - -- assert(strlen(cmd->filename) >= instdirlen); +- if (strlen(cmd->filename) < instdirlen) +- internerr("maintscript name '%s' length < instdir length %zd", +- cmd->filename, instdirlen); + - return cmd->filename + instdirlen; + return cmd->filename; } diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch index 96e96f277..b36850886 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch @@ -15,22 +15,26 @@ Upstream-Status: Pending Signed-off-by: Donn Seeley Signed-off-by: Robert Yang Signed-off-by: Aníbal Limón + +Update patch context for dpkg 1.19.4. + +Signed-off-by: Kai Kang --- m4/dpkg-compiler.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 -index 682857c..23ed7d0 100644 +index a6192f6..4c7bf2e 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 -@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ - DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) - DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses]) +@@ -67,7 +67,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ + DPKG_CHECK_COMPILER_FLAG([-Wshift-negative-value]) + DPKG_CHECK_COMPILER_FLAG([-Wsizeof-array-argument]) DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool]) - DPKG_CHECK_COMPILER_FLAG([-Wvla]) - DPKG_CHECK_COMPILER_FLAG([-Winit-self]) DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) - DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) + + AC_LANG_CASE( -- 2.1.4 diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch index 1b985df0f..4f79a40d8 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch @@ -18,22 +18,26 @@ Upstream-Status: Inappropriate [Configuration] [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759999#20 [2] https://lists.gnu.org/archive/html/help-tar/2016-01/msg00000.html + +Update patch context for dpkg 1.19.4. + +Signed-off-by: Kai Kang --- dpkg-deb/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index a92b58e..a3d1912 100644 +index 68d1875..053fcb7 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c -@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +@@ -457,7 +457,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, command_init(&cmd, TAR, "tar -cf"); command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", - "--mtime", mtime, "--clamp-mtime", NULL); + "--mtime", mtime, NULL); /* Mode might become a positional argument, pass it before -T. */ - if (mode) - command_add_args(&cmd, "--mode", mode, NULL); + if (options->mode) + command_add_args(&cmd, "--mode", options->mode, NULL); -- 2.11.0 diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service b/poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service deleted file mode 100644 index 9a248ccb4..000000000 --- a/poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=dpkg first boot configure -DefaultDependencies=no -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount -Before=sysinit.target - -[Service] -Type=oneshot -EnvironmentFile=-@SYSCONFDIR@/default/postinst -ExecStart=-@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then @BINDIR@/dpkg --configure -a > $LOGFILE 2>&1; else @BINDIR@/dpkg --configure -a; fi" -ExecStartPost=@BASE_BINDIR@/systemctl --no-reload disable dpkg-configure.service -StandardOutput=syslog -RemainAfterExit=No - -[Install] -WantedBy=basic.target -WantedBy=sysinit.target diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch index d48386647..5debcc520 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch @@ -66,15 +66,18 @@ Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)] Signed-off-by: Donn Seeley Signed-off-by: Lei Liu +Update patch context for dpkg 1.19.4. + +Signed-off-by: Kai Kang --- src/archives.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/archives.c b/src/archives.c -index 4b2fc92..a92b795 100644 +index 8476a5c..b05a63f 100644 --- a/src/archives.c +++ b/src/archives.c -@@ -69,7 +69,7 @@ fd_writeback_init(int fd) +@@ -68,7 +68,7 @@ fd_writeback_init(int fd) /* Ignore the return code as it should be considered equivalent to an * asynchronous hint for the kernel, we are doing an fsync() later on * anyway. */ @@ -83,14 +86,14 @@ index 4b2fc92..a92b795 100644 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); #elif defined(HAVE_POSIX_FADVISE) posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); -@@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti) +@@ -1093,7 +1093,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) return 0; } -#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) +#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) && __GLIBC_PREREQ(2, 6) static void - tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) + tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg) { -- 2.16.2 diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch b/poky/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch new file mode 100644 index 000000000..e9119918b --- /dev/null +++ b/poky/meta/recipes-devtools/dpkg/dpkg/tweak-options-require-tar-1.27.patch @@ -0,0 +1,27 @@ +GNU tar >= 1.27 is required for --owner=NAME:ID and --group=NAME:ID. And fails +to build .deb packages with error: + +| dpkg-deb: building package 'linux-libc-headers-dbg' in '.../tmp/work/i586-poky-linux/linux-libc-headers/4.19-r0/deploy-debs/i586/linux-libc-headers-dbg_ 4.19-r0.0_i386.deb'. +| tar: root\:0: Invalid owner +| tar: Error is not recoverable: exiting now +| dpkg-deb: error: tar -cf subprocess returned error exit status 2 + +Tweak tar options in dpkg-deb source code to make it work on old machines. + +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Kai Kang +--- +diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c +index 68d187511..86fe22e25 100644 +--- a/dpkg-deb/build.c ++++ b/dpkg-deb/build.c +@@ -462,7 +462,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, + if (options->mode) + command_add_args(&cmd, "--mode", options->mode, NULL); + if (options->root_owner_group) +- command_add_args(&cmd, "--owner", "root:0", "--group", "root:0", NULL); ++ command_add_args(&cmd, "--owner", "root", "--group", "root", NULL); + command_add_args(&cmd, "--null", "--no-unquote", "--no-recursion", + "-T", "-", NULL); + command_exec(&cmd); diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb deleted file mode 100644 index 6d8ec3476..000000000 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb +++ /dev/null @@ -1,22 +0,0 @@ -require dpkg.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20170518T093838Z/pool/main/d/dpkg/dpkg_1.18.24.tar.xz \ - file://noman.patch \ - file://remove-tar-no-timestamp.patch \ - file://arch_pm.patch \ - file://dpkg-configure.service \ - file://add_armeb_triplet_entry.patch \ - file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ - file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ - file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ - file://0005-dpkg-compiler.m4-remove-Wvla.patch \ - file://0006-add-musleabi-to-known-target-tripets.patch \ - file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ - file://0001-dpkg-Support-muslx32-build.patch \ - file://0001-arch-Add-support-for-riscv64-CPU.patch \ - " -SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " - -SRC_URI[md5sum] = "02e8af8faf1e689228da806c3e8c6882" -SRC_URI[sha256sum] = "d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb new file mode 100644 index 000000000..c3dbda77a --- /dev/null +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb @@ -0,0 +1,22 @@ +require dpkg.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ + file://noman.patch \ + file://remove-tar-no-timestamp.patch \ + file://arch_pm.patch \ + file://add_armeb_triplet_entry.patch \ + file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ + file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ + file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ + file://0005-dpkg-compiler.m4-remove-Wvla.patch \ + file://0006-add-musleabi-to-known-target-tripets.patch \ + file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ + file://0001-dpkg-Support-muslx32-build.patch \ + " +SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch \ + file://tweak-options-require-tar-1.27.patch \ +" + +SRC_URI[md5sum] = "1e4420409426d8c58bbe13a8e07c0c0b" +SRC_URI[sha256sum] = "c15234e98655689586bff2d517a6fdc6135d139c54d52ae9cfa6a90007fee0ae" -- cgit v1.2.3