diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-22 13:58:46 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-31 15:36:20 +0100 |
commit | f3c995ee4be8de52e07d9d1320c5ea3b06d9141f (patch) | |
tree | f55900eabcfcf66bf12d9dcbd2cf2bfc07ff6f2f /meta/recipes-devtools | |
parent | 024825532e9a855403cd0d2b08d8d9da4b9f0f5e (diff) | |
download | poky-f3c995ee4be8de52e07d9d1320c5ea3b06d9141f.tar.gz |
dpkg: Remove workaround patches for no longer supported host distributions
(From OE-Core rev: 282ddd265d8c63975750a604bc4ac2c1ffbcbd76)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
3 files changed, 1 insertions, 142 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch b/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch deleted file mode 100644 index b368508862..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 26 Aug 2015 16:28:59 +0300 | ||
4 | Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Remove the -Wvla flag from the set of compiler warning flags, since gcc | ||
10 | on old host systems such as CentOS 5.8 doesn't support it, and it | ||
11 | causes a build error for dpkg-native. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Donn Seeley <donn.seeley@windriver.com> | ||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
18 | |||
19 | Update patch context for dpkg 1.19.4. | ||
20 | |||
21 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
22 | --- | ||
23 | m4/dpkg-compiler.m4 | 1 - | ||
24 | 1 file changed, 1 deletion(-) | ||
25 | |||
26 | diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 | ||
27 | index a6192f6..4c7bf2e 100644 | ||
28 | --- a/m4/dpkg-compiler.m4 | ||
29 | +++ b/m4/dpkg-compiler.m4 | ||
30 | @@ -67,7 +67,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ | ||
31 | DPKG_CHECK_COMPILER_FLAG([-Wshift-negative-value]) | ||
32 | DPKG_CHECK_COMPILER_FLAG([-Wsizeof-array-argument]) | ||
33 | DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool]) | ||
34 | - DPKG_CHECK_COMPILER_FLAG([-Wvla]) | ||
35 | DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) | ||
36 | |||
37 | AC_LANG_CASE( | ||
38 | -- | ||
39 | 2.1.4 | ||
40 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch deleted file mode 100644 index 5debcc5209..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | From 9d260d408f9e17abd1d1dccd685bd7e80a3655a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Donn Seeley <donn.seeley@windriver.com> | ||
3 | Date: Tue, 25 Feb 2014 17:44:04 +0800 | ||
4 | Subject: [PATCH] dpkg: fix a link problem for dpkg-native on CentOS 5.8 | ||
5 | |||
6 | CentOS 5.8 kernels and headers support the sync_file_range() system call, | ||
7 | but glibc 2.5 doesn't provide the syscall stub. It appears that this | ||
8 | problem is known but will never be fixed: | ||
9 | |||
10 | https://bugzilla.redhat.com/show_bug.cgi?id=518581 | ||
11 | |||
12 | Bug 518581 - [RHEL5] glibc misses sync_file_range syscall interface | ||
13 | |||
14 | Status: CLOSED CANTFIX | ||
15 | Last Closed: 2009-11-22 22:19:55 | ||
16 | |||
17 | Kirby Zhou 2009-08-20 23:37:55 EDT | ||
18 | |||
19 | Description of problem: | ||
20 | |||
21 | glibc misses sync_file_range syscall interface. The header file and | ||
22 | man page both say 'sync_file_range' should exist. From man page, | ||
23 | sync_file_range should exist sinc kernel-2.6.17 | ||
24 | |||
25 | Andreas Schwab 2009-08-21 03:24:24 EDT | ||
26 | |||
27 | It has only been added to glibc 2.6, and cannot be backported due to | ||
28 | ABI breakage. You can always fall back to syscall(3). | ||
29 | |||
30 | Ulrich Drepper 2009-11-22 22:19:55 EST | ||
31 | |||
32 | As comment #1 says, no chance to backport this. | ||
33 | |||
34 | See the syscall man page for instructions. | ||
35 | |||
36 | Jon E 2010-03-19 10:32:37 EDT | ||
37 | |||
38 | then why document it if it's broken and you're not going to fix it? | ||
39 | .. might want to FTFM over at sync_file_range(2) - in the meantime - | ||
40 | borrowing from glibc 2.6 .. any thoughts on this implementation for a | ||
41 | hacky workaround for those still on your "ancient releases" .. (eg: | ||
42 | RHEL5.3)?: | ||
43 | |||
44 | #ifdef ULI_WONT_FIX_THIS_IN_GLIBC2.5 | ||
45 | #define NR_sync_file_range 277 | ||
46 | int sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) | ||
47 | { | ||
48 | return syscall (NR_sync_file_range, fd, | ||
49 | __LONG_LONG_PAIR ((long) (from >> 32), (long) from), | ||
50 | __LONG_LONG_PAIR ((long) (to >> 32), (long) to), | ||
51 | flags); | ||
52 | } | ||
53 | #endif | ||
54 | |||
55 | assuming of course that you're on an x86_64 and include/asm- | ||
56 | x86_64/unistd.h has the correct entry | ||
57 | |||
58 | (fwiw - fio is starting to use this now) | ||
59 | |||
60 | Rather than attempting to provide an implementation using syscall(), | ||
61 | we take the more conservative route and ignore header support for | ||
62 | sync_file_range() flags when the glibc version is <= 2.5. | ||
63 | |||
64 | Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)] | ||
65 | |||
66 | Signed-off-by: Donn Seeley <donn.seeley@windriver.com> | ||
67 | Signed-off-by: Lei Liu <lei.liu2@windriver.com> | ||
68 | |||
69 | Update patch context for dpkg 1.19.4. | ||
70 | |||
71 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
72 | --- | ||
73 | src/archives.c | 4 ++-- | ||
74 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
75 | |||
76 | diff --git a/src/archives.c b/src/archives.c | ||
77 | index 8476a5c..b05a63f 100644 | ||
78 | --- a/src/archives.c | ||
79 | +++ b/src/archives.c | ||
80 | @@ -68,7 +68,7 @@ fd_writeback_init(int fd) | ||
81 | /* Ignore the return code as it should be considered equivalent to an | ||
82 | * asynchronous hint for the kernel, we are doing an fsync() later on | ||
83 | * anyway. */ | ||
84 | -#if defined(SYNC_FILE_RANGE_WRITE) | ||
85 | +#if defined(SYNC_FILE_RANGE_WRITE) && __GLIBC_PREREQ(2, 6) | ||
86 | sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); | ||
87 | #elif defined(HAVE_POSIX_FADVISE) | ||
88 | posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); | ||
89 | @@ -1093,7 +1093,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) | ||
90 | return 0; | ||
91 | } | ||
92 | |||
93 | -#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) | ||
94 | +#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) && __GLIBC_PREREQ(2, 6) | ||
95 | static void | ||
96 | tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg) | ||
97 | { | ||
98 | -- | ||
99 | 2.16.2 | ||
100 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb b/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb index c3dbda77a4..77fbfb5c91 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb | |||
@@ -9,12 +9,11 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ | |||
9 | file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ | 9 | file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ |
10 | file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ | 10 | file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ |
11 | file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ | 11 | file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ |
12 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ | ||
13 | file://0006-add-musleabi-to-known-target-tripets.patch \ | 12 | file://0006-add-musleabi-to-known-target-tripets.patch \ |
14 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ | 13 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ |
15 | file://0001-dpkg-Support-muslx32-build.patch \ | 14 | file://0001-dpkg-Support-muslx32-build.patch \ |
16 | " | 15 | " |
17 | SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch \ | 16 | SRC_URI_append_class-native = " \ |
18 | file://tweak-options-require-tar-1.27.patch \ | 17 | file://tweak-options-require-tar-1.27.patch \ |
19 | " | 18 | " |
20 | 19 | ||