diff mbox series

[meta-webserver] nginx: update versions for both the stable branch and mainline

Message ID 20231214162338.1753262-1-derek@asterius.io
State Changes Requested
Headers show
Series [meta-webserver] nginx: update versions for both the stable branch and mainline | expand

Commit Message

Derek Straka Dec. 14, 2023, 4:23 p.m. UTC 
Mainline version 1.25.2 -> 1.25.3
Stable: None -> 1.24.0
Legacy Mainline 1.21.1 -> Removed

Signed-off-by: Derek Straka <derek@asterius.io>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 10 ----------
 meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb |  6 ++++++
 meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb |  6 ------
 meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb |  9 +++++++++
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb

Comments

Khem Raj Dec. 14, 2023, 6 p.m. UTC | #1 
Derek

Please rebase it on master-next and resend please. Portion of patch is
not needed as it has been covered by another pull.

On Thu, Dec 14, 2023 at 8:23 AM Derek Straka <derek@asterius.io> wrote:
>
> Mainline version 1.25.2 -> 1.25.3
> Stable: None -> 1.24.0
> Legacy Mainline 1.21.1 -> Removed
>
> Signed-off-by: Derek Straka <derek@asterius.io>
> ---
>  meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 10 ----------
>  meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb |  6 ++++++
>  meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb |  6 ------
>  meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb |  9 +++++++++
>  4 files changed, 15 insertions(+), 16 deletions(-)
>  delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
>  create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
>  delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
>  create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
>
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
> deleted file mode 100644
> index b69fd7dab..000000000
> --- a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -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"
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
> new file mode 100644
> index 000000000..2e865e400
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
> @@ -0,0 +1,6 @@
> +require nginx.inc
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=175abb631c799f54573dc481454c8632"
> +
> +SRC_URI[sha256sum] = "77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d"
> +
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
> deleted file mode 100644
> index 66eef2389..000000000
> --- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require nginx.inc
> -
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
> -
> -SRC_URI[sha256sum] = "05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711"
> -
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
> new file mode 100644
> index 000000000..e893fc3a0
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
> @@ -0,0 +1,9 @@
> +require nginx.inc
> +
> +# 1.24.x branch is the current stable branch, the recommended default
> +# 1.25.x is the current mainline branches containing all new features
> +DEFAULT_PREFERENCE = "-1"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
> +
> +SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107452): https://lists.openembedded.org/g/openembedded-devel/message/107452
> Mute This Topic: https://lists.openembedded.org/mt/103172966/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
deleted file mode 100644
index b69fd7dab..000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-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"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
new file mode 100644
index 000000000..2e865e400
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb
@@ -0,0 +1,6 @@ 
+require nginx.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=175abb631c799f54573dc481454c8632"
+
+SRC_URI[sha256sum] = "77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d"
+
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
deleted file mode 100644
index 66eef2389..000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@ 
-require nginx.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
-
-SRC_URI[sha256sum] = "05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711"
-
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
new file mode 100644
index 000000000..e893fc3a0
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
@@ -0,0 +1,9 @@ 
+require nginx.inc
+
+# 1.24.x branch is the current stable branch, the recommended default
+# 1.25.x is the current mainline branches containing all new features
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
+
+SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"