diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch | 14 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/noman.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.21.2.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.21.1.bb) | 2 |
7 files changed, 59 insertions, 52 deletions
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 index 4d3f238012..dc0d9bfc2e 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From cb47e9cd6735fcafd231748dab8884ae991b669c Mon Sep 17 00:00:00 2001 | 1 | From 839f228556c00739f72534e8635195935eb3752f Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> |
3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 | 3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 |
4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf | 4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf |
@@ -25,13 +25,13 @@ Original patch by RP 2015/3/27, rebased by Paul Eggleton | |||
25 | Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> | 25 | Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> |
26 | 26 | ||
27 | --- | 27 | --- |
28 | dpkg-deb/build.c | 5 ++++- | 28 | src/deb/build.c | 5 ++++- |
29 | 1 file changed, 4 insertions(+), 1 deletion(-) | 29 | 1 file changed, 4 insertions(+), 1 deletion(-) |
30 | 30 | ||
31 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c | 31 | diff --git a/src/deb/build.c b/src/deb/build.c |
32 | index 76613adec..7c216d1a9 100644 | 32 | index 76613ad..7c216d1 100644 |
33 | --- a/dpkg-deb/build.c | 33 | --- a/src/deb/build.c |
34 | +++ b/dpkg-deb/build.c | 34 | +++ b/src/deb/build.c |
35 | @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 35 | @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
36 | { | 36 | { |
37 | int pipe_filenames[2], pipe_tarball[2]; | 37 | int pipe_filenames[2], pipe_tarball[2]; |
@@ -51,3 +51,6 @@ index 76613adec..7c216d1a9 100644 | |||
51 | } | 51 | } |
52 | 52 | ||
53 | static intmax_t | 53 | static intmax_t |
54 | -- | ||
55 | 2.25.1 | ||
56 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index 9ca7262eb9..75ae848264 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch | |||
@@ -12,14 +12,14 @@ ALIMON 2016/05/26 | |||
12 | ALIMON 2017/02/21 | 12 | ALIMON 2017/02/21 |
13 | KKang 2019/02/20 | 13 | KKang 2019/02/20 |
14 | --- | 14 | --- |
15 | src/script.c | 53 +++------------------------------------------------- | 15 | src/main/script.c | 54 +++-------------------------------------------- |
16 | 1 file changed, 3 insertions(+), 50 deletions(-) | 16 | 1 file changed, 3 insertions(+), 51 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/script.c b/src/script.c | 18 | diff --git a/src/main/script.c b/src/main/script.c |
19 | index abe65b6f7..621ff9b27 100644 | 19 | index abe65b6..0edb8f1 100644 |
20 | --- a/src/script.c | 20 | --- a/src/main/script.c |
21 | +++ b/src/script.c | 21 | +++ b/src/main/script.c |
22 | @@ -96,58 +96,11 @@ setexecute(const char *path, struct stat *stab) | 22 | @@ -96,58 +96,10 @@ setexecute(const char *path, struct stat *stab) |
23 | static const char * | 23 | static const char * |
24 | maintscript_pre_exec(struct command *cmd) | 24 | maintscript_pre_exec(struct command *cmd) |
25 | { | 25 | { |
@@ -49,9 +49,7 @@ index abe65b6f7..621ff9b27 100644 | |||
49 | - "using --force-script-chrootless?")); | 49 | - "using --force-script-chrootless?")); |
50 | - else if (rc) | 50 | - else if (rc) |
51 | - ohshite(_("failed to chroot to '%.250s'"), instdir); | 51 | - ohshite(_("failed to chroot to '%.250s'"), instdir); |
52 | + if (*instdir) { | 52 | - } |
53 | + setenv("D", instdir, 1); | ||
54 | } | ||
55 | - /* Switch to a known good directory to give the maintainer script | 53 | - /* Switch to a known good directory to give the maintainer script |
56 | - * a saner environment, also needed after the chroot(). */ | 54 | - * a saner environment, also needed after the chroot(). */ |
57 | - if (chdir(changedir)) | 55 | - if (chdir(changedir)) |
@@ -68,19 +66,21 @@ index abe65b6f7..621ff9b27 100644 | |||
68 | - debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, | 66 | - debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, |
69 | - args.buf); | 67 | - args.buf); |
70 | - varbuf_destroy(&args); | 68 | - varbuf_destroy(&args); |
71 | - } | 69 | + if (*instdir) { |
70 | + setenv("D", instdir, 1); | ||
71 | } | ||
72 | - if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS)) | 72 | - if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS)) |
73 | - return cmd->filename; | 73 | - return cmd->filename; |
74 | - | 74 | - |
75 | - if (strlen(cmd->filename) < instdirlen) | 75 | - if (strlen(cmd->filename) < instdirlen) |
76 | - internerr("maintscript name '%s' length < instdir length %zd", | 76 | - internerr("maintscript name '%s' length < instdir length %zd", |
77 | - cmd->filename, instdirlen); | 77 | - cmd->filename, instdirlen); |
78 | 78 | - | |
79 | - return cmd->filename + instdirlen; | 79 | - return cmd->filename + instdirlen; |
80 | + return cmd->filename; | 80 | + return cmd->filename; |
81 | } | 81 | } |
82 | 82 | ||
83 | /** | 83 | /** |
84 | -- | 84 | -- |
85 | 2.17.1 | 85 | 2.25.1 |
86 | 86 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch index 56c85c7733..bbd5aba418 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch | |||
@@ -8,14 +8,14 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [embedded specific] | 9 | Upstream-Status: Inappropriate [embedded specific] |
10 | --- | 10 | --- |
11 | src/archives.c | 3 ++- | 11 | src/main/archives.c | 3 ++- |
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 12 | 1 file changed, 2 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/src/archives.c b/src/archives.c | 14 | diff --git a/src/main/archives.c b/src/main/archives.c |
15 | index bff5f14..b711013 100644 | 15 | index 92340b9..7a55c27 100644 |
16 | --- a/src/archives.c | 16 | --- a/src/main/archives.c |
17 | +++ b/src/archives.c | 17 | +++ b/src/main/archives.c |
18 | @@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) | 18 | @@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) |
19 | 19 | ||
20 | if (te->type == TAR_FILETYPE_SYMLINK) { | 20 | if (te->type == TAR_FILETYPE_SYMLINK) { |
21 | #ifdef HAVE_LUTIMES | 21 | #ifdef HAVE_LUTIMES |
@@ -27,5 +27,5 @@ index bff5f14..b711013 100644 | |||
27 | } else { | 27 | } else { |
28 | if (utimes(path, tv)) | 28 | if (utimes(path, tv)) |
29 | -- | 29 | -- |
30 | 2.1.4 | 30 | 2.25.1 |
31 | 31 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch index 4f79a40d8b..117f9234ad 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | |||
@@ -2,9 +2,6 @@ From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 | |||
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | 2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> |
3 | Date: Tue, 21 Feb 2017 11:23:27 -0600 | 3 | Date: Tue, 21 Feb 2017 11:23:27 -0600 |
4 | Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar | 4 | Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | 5 | ||
9 | Recently dpkg added --clamp-mtime to tar to create reproducible | 6 | Recently dpkg added --clamp-mtime to tar to create reproducible |
10 | build tarballs [1]. | 7 | build tarballs [1]. |
@@ -23,14 +20,14 @@ Update patch context for dpkg 1.19.4. | |||
23 | 20 | ||
24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 21 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
25 | --- | 22 | --- |
26 | dpkg-deb/build.c | 2 +- | 23 | src/deb/build.c | 2 +- |
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
28 | 25 | ||
29 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c | 26 | diff --git a/src/deb/build.c b/src/deb/build.c |
30 | index 68d1875..053fcb7 100644 | 27 | index 5c74ff3..76613ad 100644 |
31 | --- a/dpkg-deb/build.c | 28 | --- a/src/deb/build.c |
32 | +++ b/dpkg-deb/build.c | 29 | +++ b/src/deb/build.c |
33 | @@ -457,7 +457,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 30 | @@ -505,7 +505,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
34 | 31 | ||
35 | command_init(&cmd, TAR, "tar -cf"); | 32 | command_init(&cmd, TAR, "tar -cf"); |
36 | command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", | 33 | command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", |
@@ -40,4 +37,5 @@ index 68d1875..053fcb7 100644 | |||
40 | if (options->mode) | 37 | if (options->mode) |
41 | command_add_args(&cmd, "--mode", options->mode, NULL); | 38 | command_add_args(&cmd, "--mode", options->mode, NULL); |
42 | -- | 39 | -- |
43 | 2.11.0 | 40 | 2.25.1 |
41 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index a7f3cb8f45..6900716b11 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch | |||
@@ -1,22 +1,21 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | 1 | Upstream-Status: Inappropriate [disable feature] |
2 | 2 | ||
3 | --- | 3 | --- |
4 | Makefile.am | 3 +-- | 4 | Makefile.am | 1 - |
5 | 1 file changed, 1 insertion(+), 2 deletions(-) | 5 | 1 file changed, 1 deletion(-) |
6 | 6 | ||
7 | diff --git a/Makefile.am b/Makefile.am | 7 | diff --git a/Makefile.am b/Makefile.am |
8 | index 0da52cb16..a1f79e0a2 100644 | 8 | index d963a10..7cef7f5 100644 |
9 | --- a/Makefile.am | 9 | --- a/Makefile.am |
10 | +++ b/Makefile.am | 10 | +++ b/Makefile.am |
11 | @@ -13,8 +13,7 @@ SUBDIRS = \ | 11 | @@ -11,7 +11,6 @@ SUBDIRS = \ |
12 | $(MAYBE_DSELECT) \ | 12 | $(MAYBE_DSELECT) \ |
13 | scripts \ | 13 | scripts \ |
14 | t-func \ | 14 | po \ |
15 | - po \ | 15 | - man \ |
16 | - man | 16 | # EOL |
17 | + po | ||
18 | 17 | ||
19 | ACLOCAL_AMFLAGS = -I m4 | 18 | ACLOCAL_AMFLAGS = -I m4 |
20 | |||
21 | -- | 19 | -- |
22 | 2.11.0 | 20 | 2.25.1 |
21 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch index 4f408ff777..ebf838ffe9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch | |||
@@ -3,11 +3,15 @@ busybox-1.19.4 tar utility doesn't support --warning=no-timestamp | |||
3 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 3 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [configuration] | 5 | Upstream-Status: Inappropriate [configuration] |
6 | Index: dpkg-1.17.1/dpkg-deb/extract.c | 6 | --- |
7 | =================================================================== | 7 | src/deb/extract.c | 1 - |
8 | --- dpkg-1.17.1.orig/dpkg-deb/extract.c | 8 | 1 file changed, 1 deletion(-) |
9 | +++ dpkg-1.17.1/dpkg-deb/extract.c | 9 | |
10 | @@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha | 10 | diff --git a/src/deb/extract.c b/src/deb/extract.c |
11 | index a1b2dc0..95e2372 100644 | ||
12 | --- a/src/deb/extract.c | ||
13 | +++ b/src/deb/extract.c | ||
14 | @@ -333,7 +333,6 @@ extracthalf(const char *debar, const char *dir, | ||
11 | 15 | ||
12 | command_add_arg(&cmd, "-f"); | 16 | command_add_arg(&cmd, "-f"); |
13 | command_add_arg(&cmd, "-"); | 17 | command_add_arg(&cmd, "-"); |
@@ -15,3 +19,6 @@ Index: dpkg-1.17.1/dpkg-deb/extract.c | |||
15 | 19 | ||
16 | m_dup2(p2[0],0); | 20 | m_dup2(p2[0],0); |
17 | close(p2[0]); | 21 | close(p2[0]); |
22 | -- | ||
23 | 2.25.1 | ||
24 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb index ccb4f06d32..ef2e06ee4a 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.2.bb | |||
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main | |||
18 | 18 | ||
19 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" | 19 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" |
20 | 20 | ||
21 | SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151" | 21 | SRCREV = "a9580d3aec5f487a81664a462ec70ec1993f19f8" |
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |