nginx: upgrade 1.18.0 -> 1.20.1
PATCH 1/2 nginx: upgrade 1.18.0 -> 1.20.1
From: Changqing Li <[email protected]>
License-Update: Copyright Year Updated
Signed-off-by Changqing Li <[email protected]>
--- meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb | 6 ------ meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb
meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "b2d33d24d89b8b1f87ff5d251aa27eb8" -SRC_URI[sha256sum] = "4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99"
meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb new file +6 -0
@@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505" + +SRC_URI[md5sum] = "8ca6edd5076bdfad30a69c9c9b41cc68" +SRC_URI[sha256sum] = "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49"
Signature · 1 line
2.17.1
PATCH 2/2 nginx: upgrade 1.19.6 -> 1.21.1
From: Changqing Li <[email protected]>
License-Update: Copyright Year Updated
Signed-off-by Changqing Li <[email protected]>
--- meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb | 10 ---------- meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb deleted +0 -10
@@ -1,10 +0,0 @@ -require nginx.inc - -# 1.18.x branch is the current stable branch, the recommended default -# 1.19.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "0be1d90b45b1bdfcf8339f299e74063a" -SRC_URI[sha256sum] = "b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5"
meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb new file +10 -0
@@ -0,0 +1,10 @@ +require nginx.inc + +# 1.20.x branch is the current stable branch, the recommended default +# 1.21.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505" + +SRC_URI[md5sum] = "7dce9e2136ec32dfd823736e871815b1" +SRC_URI[sha256sum] = "68ba0311342115163a0354cad34f90c05a7e8bf689dc498abf07899eda155560"
Signature · 1 line
2.17.1
can you check/rebase with latest master ? I think these patches are already applied.
Quoted 43 lines · Changqing Li
From: Changqing Li <[email protected]>
License-Update: Copyright Year Updated
Signed-off-by Changqing Li <[email protected]>--- meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb | 6 ------ meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bbmeta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb deleted +0
-6@@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "b2d33d24d89b8b1f87ff5d251aa27eb8" -SRC_URI[sha256sum] = "4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99"meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb new file +6
-1@@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505" + +SRC_URI[md5sum] = "8ca6edd5076bdfad30a69c9c9b41cc68" +SRC_URI[sha256sum] = "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49" --2.17.1