diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-08 20:17:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-09 09:16:03 -0800 |
commit | a70103a6e400caaa87e1d36a7e59be7f3059a3bb (patch) | |
tree | 1c2cc7a2967bab4f240b226c74c31b7501bbaa70 /meta/recipes-devtools/apt/apt/disable-test.patch | |
parent | bed5ea53c74c4b444b2145e7a83ca9fd44ea30ec (diff) | |
download | openembedded-core-contrib-a70103a6e400caaa87e1d36a7e59be7f3059a3bb.tar.gz |
apt: 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.
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>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/disable-test.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/disable-test.patch | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch index 0532671747..d16b5c771b 100644 --- a/meta/recipes-devtools/apt/apt/disable-test.patch +++ b/meta/recipes-devtools/apt/apt/disable-test.patch @@ -17,10 +17,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> configure.ac | 7 ------- 2 files changed, 3 insertions(+), 13 deletions(-) -diff --git a/Makefile b/Makefile -index 7680f08..69527a5 100644 ---- a/Makefile -+++ b/Makefile +Index: apt-1.2.24/Makefile +=================================================================== +--- apt-1.2.24.orig/Makefile ++++ apt-1.2.24/Makefile @@ -9,8 +9,8 @@ endif .PHONY: default default: startup all @@ -32,9 +32,9 @@ index 7680f08..69527a5 100644 $(MAKE) -C vendor $@ $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ -@@ -21,8 +21,6 @@ all headers library clean veryclean binary program doc manpages docbook test upd +@@ -21,8 +21,6 @@ all headers library clean veryclean bina $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ + # $(MAKE) -C doc $@ $(MAKE) -C po $@ - # FIXME: -C test has issue swith parallel builds, investigate! - -$(MAKE) -C test $@ @@ -52,10 +52,10 @@ index 7680f08..69527a5 100644 dirs: startup -diff --git a/configure.ac b/configure.ac -index 1f05da5..e47f459 100644 ---- a/configure.ac -+++ b/configure.ac +Index: apt-1.2.24/configure.ac +=================================================================== +--- apt-1.2.24.orig/configure.ac ++++ apt-1.2.24/configure.ac @@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_MSG_ERROR([failed: I need CURL due https support]), ) @@ -70,6 +70,3 @@ index 1f05da5..e47f459 100644 AC_SUBST(BDBLIB) HAVE_ZLIB=no --- -2.1.4 - |