* [PATCH 1/3] dpkg-native: rebase and reinstate fix for "tar: file changed as we read it"
2020-06-18 3:54 [PATCH 0/3] Misc fixes Paul Eggleton
@ 2020-06-18 3:54 ` Paul Eggleton
2020-06-18 3:54 ` [PATCH 2/3] shadow-sysroot: drop unused SRC_URI checksums Paul Eggleton
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2020-06-18 3:54 UTC (permalink / raw)
To: openembedded-core
In OE-Core rev 8ee36a5f2f9367550d28bf271afc53bca6ff3d5f a patch was
added for dpkg to ignore a return of 1 from dpkg's calls to tar (which
indicates that files changed in some way while tar was operating) we
were observing failures on the autobuilder due to changes to link counts
in hard-linked file trees. The patch was subsequently rebased and then
later removed during an upgrade in
3812f58b3a438ae533c282170416cdd1681868e0 on the assumption that the fix
had been applied upstream, however that was not the case. I am now
occasionally seeing these errors in my builds without any apparent
material change to the files, so rebase and reinstate the patch.
Fixes [YOCTO #13913].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.microsoft.com>
---
...01-build.c-ignore-return-of-1-from-tar-cf.patch | 52 ++++++++++++++++++++++
meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 2 +
2 files changed, 54 insertions(+)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
new file mode 100644
index 0000000..6c5a91d
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -0,0 +1,52 @@
+From 450fece894fce750502be8accabfd88c585bda4c Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
+Date: Tue, 16 Jun 2020 03:57:25 +0000
+Subject: [PATCH] build.c: ignore return of 1 from tar -cf
+
+When running do_package_write_deb, we have trees of hardlinked files
+such as the dbg source files in ${PN}-dbg. If something makes another
+copy of one of those files (or deletes one), the number of links a file
+has changes and tar can notice this, e.g.:
+
+| DEBUG: Executing python function do_package_deb
+| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'.
+| tar: ./usr/lib/sed/ptest/testsuite/tst-regex2: file changed as we read it
+| dpkg-deb: error: subprocess tar -cf returned error exit status 1
+
+Tar returns an error of 1 when files 'change' and other errors codes
+in other error cases. We tweak dpkg-deb here so that it ignores an exit
+code of 1 from tar. The files don't really change (and we have locking in
+place to avoid that kind of issue).
+
+Upsteam-Status: Inappropriate
+
+Original patch by RP 2015/3/27, rebased by Paul Eggleton
+
+Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
+---
+ dpkg-deb/build.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
+index a3d1912..1de7f9c 100644
+--- a/dpkg-deb/build.c
++++ b/dpkg-deb/build.c
+@@ -427,6 +427,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+ {
+ int pipe_filenames[2], pipe_tarball[2];
+ pid_t pid_tar, pid_comp;
++ int rc;
+
+ /* Fork off a tar. We will feed it a list of filenames on stdin later. */
+ m_pipe(pipe_filenames);
+@@ -477,7 +478,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+ /* All done, clean up wait for tar and <compress> to finish their job. */
+ close(pipe_filenames[1]);
+ subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
+- subproc_reap(pid_tar, "tar -cf", 0);
++ rc = subproc_reap(pid_tar, "tar -cf", SUBPROC_RETERROR);
++ if (rc && rc != 1)
++ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc);
+ }
+
+ static time_t
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
index d539c57..c98a9e5 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
@@ -16,5 +16,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \
file://0001-Add-support-for-riscv32-CPU.patch \
"
+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"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] shadow-sysroot: drop unused SRC_URI checksums
2020-06-18 3:54 [PATCH 0/3] Misc fixes Paul Eggleton
2020-06-18 3:54 ` [PATCH 1/3] dpkg-native: rebase and reinstate fix for "tar: file changed as we read it" Paul Eggleton
@ 2020-06-18 3:54 ` Paul Eggleton
2020-06-18 3:54 ` [PATCH 3/3] devtool: fix typo Paul Eggleton
2020-06-18 4:02 ` ✗ patchtest: failure for Misc fixes Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2020-06-18 3:54 UTC (permalink / raw)
To: openembedded-core
This recipe only fetches local files, so there's no need for a checksum.
These have been present for some time and nobody noticed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.microsoft.com>
---
meta/recipes-extended/shadow/shadow-sysroot_4.6.bb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
index 79fc8b8..a8c1539 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
@@ -14,9 +14,6 @@ PR = "r3"
# can add custom users/groups for recipes that use inherit useradd.
SRC_URI = "file://login.defs_shadow-sysroot"
-SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
-SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
-
S = "${WORKDIR}"
do_install() {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] devtool: fix typo
2020-06-18 3:54 [PATCH 0/3] Misc fixes Paul Eggleton
2020-06-18 3:54 ` [PATCH 1/3] dpkg-native: rebase and reinstate fix for "tar: file changed as we read it" Paul Eggleton
2020-06-18 3:54 ` [PATCH 2/3] shadow-sysroot: drop unused SRC_URI checksums Paul Eggleton
@ 2020-06-18 3:54 ` Paul Eggleton
2020-06-18 4:02 ` ✗ patchtest: failure for Misc fixes Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2020-06-18 3:54 UTC (permalink / raw)
To: openembedded-core
specifiy -> specify
Signed-off-by: Paul Eggleton <paul.eggleton@linux.microsoft.com>
---
scripts/lib/devtool/deploy.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 6a99773..b1749ce 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -330,7 +330,7 @@ def register_commands(subparsers, context):
parser_deploy.add_argument('-e', '--ssh-exec', help='Executable to use in place of ssh')
parser_deploy.add_argument('-P', '--port', help='Specify port to use for connection to the target')
parser_deploy.add_argument('-I', '--key',
- help='Specifiy ssh private key for connection to the target')
+ help='Specify ssh private key for connection to the target')
strip_opts = parser_deploy.add_mutually_exclusive_group(required=False)
strip_opts.add_argument('-S', '--strip',
@@ -355,6 +355,6 @@ def register_commands(subparsers, context):
parser_undeploy.add_argument('-e', '--ssh-exec', help='Executable to use in place of ssh')
parser_undeploy.add_argument('-P', '--port', help='Specify port to use for connection to the target')
parser_undeploy.add_argument('-I', '--key',
- help='Specifiy ssh private key for connection to the target')
+ help='Specify ssh private key for connection to the target')
parser_undeploy.set_defaults(func=undeploy)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ patchtest: failure for Misc fixes
2020-06-18 3:54 [PATCH 0/3] Misc fixes Paul Eggleton
` (2 preceding siblings ...)
2020-06-18 3:54 ` [PATCH 3/3] devtool: fix typo Paul Eggleton
@ 2020-06-18 4:02 ` Patchwork
2020-06-18 4:11 ` [OE-core] " Paul Eggleton
3 siblings, 1 reply; 6+ messages in thread
From: Patchwork @ 2020-06-18 4:02 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
== Series Details ==
Series: Misc fixes
Revision: 1
URL : https://patchwork.openembedded.org/series/24727/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 6+ messages in thread