summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/parted
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit17ba4f4f6afa50aa2f3305eb76333158807e05d4 (patch)
tree0877ae409683e900b77a2433ddc9657b980271f9 /meta/recipes-extended/parted
parentb65741860f311fd6d0a0dbfd0633837ba1b6f3b0 (diff)
downloadpoky-17ba4f4f6afa50aa2f3305eb76333158807e05d4.tar.gz
parted: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: fa3180007502affabbe57cb6366be18fbb9e94f8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/parted')
-rw-r--r--meta/recipes-extended/parted/files/no_check.patch10
-rw-r--r--meta/recipes-extended/parted/files/syscalls.patch12
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-extended/parted/files/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch
index 58d8db4426..e6a26d11a5 100644
--- a/meta/recipes-extended/parted/files/no_check.patch
+++ b/meta/recipes-extended/parted/files/no_check.patch
@@ -5,12 +5,12 @@ it to be disabled.
5 5
6RP - 4/11/08 6RP - 4/11/08
7 7
8Index: parted-1.9.0/configure.ac 8Index: parted-3.2/configure.ac
9=================================================================== 9===================================================================
10--- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100 10--- parted-3.2.orig/configure.ac
11+++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000 11+++ parted-3.2/configure.ac
12@@ -477,7 +477,7 @@ 12@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [
13 AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux]) 13 AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x])
14 14
15 dnl check for "check", unit testing library/header 15 dnl check for "check", unit testing library/header
16-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) 16-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
diff --git a/meta/recipes-extended/parted/files/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch
index e9bbe9a956..93205a0a80 100644
--- a/meta/recipes-extended/parted/files/syscalls.patch
+++ b/meta/recipes-extended/parted/files/syscalls.patch
@@ -4,10 +4,10 @@ Upstream-Status: Pending
4 libparted/arch/linux.c | 13 +++++++++++++ 4 libparted/arch/linux.c | 13 +++++++++++++
5 1 file changed, 13 insertions(+) 5 1 file changed, 13 insertions(+)
6 6
7Index: parted-1.9.0/libparted/arch/linux.c 7Index: parted-3.2/libparted/arch/linux.c
8=================================================================== 8===================================================================
9--- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100 9--- parted-3.2.orig/libparted/arch/linux.c
10+++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000 10+++ parted-3.2/libparted/arch/linux.c
11@@ -17,6 +17,8 @@ 11@@ -17,6 +17,8 @@
12 12
13 #define PROC_DEVICES_BUFSIZ 16384 13 #define PROC_DEVICES_BUFSIZ 16384
@@ -16,8 +16,8 @@ Index: parted-1.9.0/libparted/arch/linux.c
16+ 16+
17 #include <config.h> 17 #include <config.h>
18 #include <arch/linux.h> 18 #include <arch/linux.h>
19 19 #include <linux/blkpg.h>
20@@ -1477,12 +1479,14 @@ 20@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev)
21 21
22 #if SIZEOF_OFF_T < 8 22 #if SIZEOF_OFF_T < 8
23 23
@@ -32,7 +32,7 @@ Index: parted-1.9.0/libparted/arch/linux.c
32 32
33 loff_t 33 loff_t
34 llseek (unsigned int fd, loff_t offset, unsigned int whence) 34 llseek (unsigned int fd, loff_t offset, unsigned int whence)
35@@ -1490,11 +1494,20 @@ 35@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset,
36 loff_t result; 36 loff_t result;
37 int retval; 37 int retval;
38 38