mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-07 03:29:59 +00:00
Code Issues Projects Releases Wiki Activity

nginx: refresh patches

Browse Source 
WARNING: nginx-1.12.2-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch nginx-cross.patch
patching file auto/feature
patching file auto/options
Hunk #1 succeeded at 386 (offset 33 lines).
Hunk #2 succeeded at 580 (offset 35 lines).
Hunk #3 succeeded at 599 (offset 22 lines).
patching file auto/types/sizeof
patching file auto/unix
Hunk #1 succeeded at 587 (offset 194 lines).
Hunk #2 succeeded at 604 with fuzz 1 (offset 188 lines).
Hunk #3 succeeded at 620 with fuzz 2 (offset 188 lines).

Now at patch nginx-cross.patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-04-07 23:14:43 -07:00
parent 3ab88a7f43
commit cf2be348ae
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
+30 -26
View File
@@ -3,10 +3,11 @@ We do not have capability to run binaries when cross compiling
Upstream-Status: Pending Upstream-Status: Pending
diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature Index: nginx-1.12.2/auto/feature
--- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 ===================================================================
+++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 --- nginx-1.12.2.orig/auto/feature
@@ -49,12 +49,20 @@ +++ nginx-1.12.2/auto/feature
@@ -49,12 +49,20 @@ eval "/bin/sh -c \"$ngx_test\" >> $NGX_A
if [ -x $NGX_AUTOTEST ]; then if [ -x $NGX_AUTOTEST ]; then
@@ -29,7 +30,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature
ngx_found=yes ngx_found=yes
if test -n "$ngx_feature_name"; then if test -n "$ngx_feature_name"; then
@@ -68,17 +75,27 @@ @@ -68,17 +76,27 @@ if [ -x $NGX_AUTOTEST ]; then
value) value)
# /bin/sh is used to intercept "Killed" or "Abort trap" messages # /bin/sh is used to intercept "Killed" or "Abort trap" messages
@@ -61,7 +62,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature
else else
echo " found but is not working" echo " found but is not working"
fi fi
@@ -86,7 +105,7 @@ @@ -86,7 +104,7 @@ END
bug) bug)
# /bin/sh is used to intercept "Killed" or "Abort trap" messages # /bin/sh is used to intercept "Killed" or "Abort trap" messages
@@ -70,10 +71,11 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature
echo " not found" echo " not found"
else else
diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options Index: nginx-1.12.2/auto/options
--- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 ===================================================================
+++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 --- nginx-1.12.2.orig/auto/options
@@ -353,6 +353,18 @@ +++ nginx-1.12.2/auto/options
@@ -386,6 +386,18 @@ $0: warning: the \"--with-sha1-asm\" opt
--test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;;
--test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
@@ -92,7 +94,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options
*) *)
echo "$0: error: invalid option \"$option\"" echo "$0: error: invalid option \"$option\""
exit 1 exit 1
@@ -533,6 +445,17 @@ @@ -568,6 +580,17 @@ cat << END
--with-debug enable debug logging --with-debug enable debug logging
@@ -110,7 +112,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options
END END
exit 1 exit 1
@@ -554,6 +577,8 @@ @@ -576,6 +599,8 @@ fi
if [ ".$NGX_PLATFORM" = ".win32" ]; then if [ ".$NGX_PLATFORM" = ".win32" ]; then
NGX_WINE=$WINE NGX_WINE=$WINE
@@ -119,10 +121,11 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options
fi fi
diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof Index: nginx-1.12.2/auto/types/sizeof
--- nginx-1.0.11.orig/auto/types/sizeof 2006-06-28 11:00:26.000000000 -0500 ===================================================================
+++ nginx-1.0.11/auto/types/sizeof 2011-12-27 13:56:42.323370040 -0600 --- nginx-1.12.2.orig/auto/types/sizeof
@@ -12,9 +12,12 @@ +++ nginx-1.12.2/auto/types/sizeof
@@ -12,9 +12,12 @@ checking for $ngx_type size
END END
@@ -137,7 +140,7 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
@@ -33,15 +36,16 @@ @@ -33,15 +36,16 @@ int main(void) {
END END
@@ -160,10 +163,11 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof
fi fi
diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix Index: nginx-1.12.2/auto/unix
--- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 ===================================================================
+++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 --- nginx-1.12.2.orig/auto/unix
@@ -393,13 +393,13 @@ +++ nginx-1.12.2/auto/unix
@@ -587,13 +587,13 @@ ngx_feature_libs=
# C types # C types
@@ -181,8 +185,8 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix
ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value
@@ -416,7 +416,7 @@ @@ -604,7 +604,7 @@ NGX_INCLUDE_AUTO_CONFIG_H="#include \"ng
ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef
ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef
-ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef -ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef
@@ -190,9 +194,9 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix
. auto/types/sizeof . auto/types/sizeof
ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value
@@ -432,15 +432,15 @@ @@ -620,15 +620,15 @@ ngx_type="rlim_t"; ngx_types="int"; . au
. auto/endianess . auto/endianness
-ngx_type="size_t"; . auto/types/sizeof -ngx_type="size_t"; . auto/types/sizeof
+ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof +ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof
@@ -208,4 +212,4 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix
+ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof +ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof
ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value
ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value