diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2016-05-26 16:18:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-04 14:13:35 +0100 |
commit | 81b59a19ad6df490f1edbea70b2612d7a8e43164 (patch) | |
tree | 2d0b29d49c0a17233d94d342a4dd764d6d8935f6 /meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch | |
parent | b7644fc0490c019a404f5870fbe544c76f2ce99b (diff) | |
download | poky-81b59a19ad6df490f1edbea70b2612d7a8e43164.tar.gz |
dpkg: Upgrade to 1.18.7
Rebased patches:
0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
add_armeb_triplet_entry.patchadd_armeb_triplet_entry.patch
Patches removed already in upstream:
[1] 0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
[2] fix-abs-redefine.patch
(From OE-Core rev: 3812f58b3a438ae533c282170416cdd1681868e0)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
[1] https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/dpkg-deb/build.c?id=7a91341446851cd3594a8b752823b8c1f26d652a
[2] https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/lib/dpkg/i18n.h?id=ecd4baa091619cbbdd70043129dd992573580371
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch b/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch deleted file mode 100644 index 49ef853ff2..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From e391bdba238d1371fc5b67cdae08b06eb5ada5c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 26 Aug 2015 15:48:13 +0300 | ||
4 | Subject: [PATCH] When running do_package_write_deb, we have trees of | ||
5 | hardlinked files such as the dbg source files in ${PN}-dbg. If something | ||
6 | makes another copy of one of those files (or deletes one), the number of | ||
7 | links a file has changes and tar can notice this, e.g.: | ||
8 | |||
9 | | DEBUG: Executing python function do_package_deb | ||
10 | | 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'. | ||
11 | | tar: ./usr/lib/sed/ptest/testsuite/tst-regex2: file changed as we read it | ||
12 | | dpkg-deb: error: subprocess tar -cf returned error exit status 1 | ||
13 | |||
14 | Tar returns an error of 1 when files 'change' and other errors codes | ||
15 | in other error cases. We tweak dpkg-deb here so that it ignores an exit | ||
16 | code of 1 from tar. The files don't really change (and we have locking in | ||
17 | place to avoid that kind of issue). | ||
18 | |||
19 | Upstream-Status: Inappropriate | ||
20 | RP 2015/3/27 | ||
21 | --- | ||
22 | dpkg-deb/build.c | 12 ++++++++---- | ||
23 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c | ||
26 | index 2ddeec6..af363f0 100644 | ||
27 | --- a/dpkg-deb/build.c | ||
28 | +++ b/dpkg-deb/build.c | ||
29 | @@ -452,7 +452,7 @@ static void | ||
30 | tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | ||
31 | struct compress_params *tar_compress_params, int fd_out) | ||
32 | { | ||
33 | - int pipe_filenames[2], pipe_tarball[2]; | ||
34 | + int pipe_filenames[2], pipe_tarball[2], rc; | ||
35 | pid_t pid_tar, pid_comp; | ||
36 | |||
37 | /* Fork off a tar. We will feed it a list of filenames on stdin later. */ | ||
38 | @@ -493,7 +493,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | ||
39 | /* All done, clean up wait for tar and <compress> to finish their job. */ | ||
40 | close(pipe_filenames[1]); | ||
41 | subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); | ||
42 | - subproc_reap(pid_tar, "tar -cf", 0); | ||
43 | + rc = subproc_reap(pid_tar, "tar -cf", SUBPROC_RETERROR); | ||
44 | + if (rc && rc != 1) | ||
45 | + ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); | ||
46 | } | ||
47 | |||
48 | /** | ||
49 | @@ -509,7 +511,7 @@ do_build(const char *const *argv) | ||
50 | char *debar; | ||
51 | char *tfbuf; | ||
52 | int arfd; | ||
53 | - int p1[2], gzfd; | ||
54 | + int p1[2], gzfd, rc; | ||
55 | pid_t c1, c2; | ||
56 | |||
57 | /* Decode our arguments. */ | ||
58 | @@ -590,7 +592,9 @@ do_build(const char *const *argv) | ||
59 | } | ||
60 | close(p1[0]); | ||
61 | subproc_reap(c2, _("<compress> from tar -cf"), 0); | ||
62 | - subproc_reap(c1, "tar -cf", 0); | ||
63 | + rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); | ||
64 | + if (rc && rc != 1) | ||
65 | + ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); | ||
66 | |||
67 | if (lseek(gzfd, 0, SEEK_SET)) | ||
68 | ohshite(_("failed to rewind temporary file (%s)"), _("control member")); | ||
69 | -- | ||
70 | 2.7.0 | ||
71 | |||