* [Buildroot] [PATCH] package/lua-lunix: bump to version 20220331
@ 2022-09-03 13:58 Francois Perrad
2022-09-04 7:41 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Francois Perrad @ 2022-09-03 13:58 UTC (permalink / raw)
To: buildroot
remove merged patches
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/lua-lunix/0001-fix-with-uClibc.patch | 28 -------------------
...atch => 0001-remove-link-with-librt.patch} | 8 +++---
.../lua-lunix/0003-fix-sysctl-detection.patch | 24 ----------------
package/lua-lunix/lua-lunix.hash | 4 +--
package/lua-lunix/lua-lunix.mk | 2 +-
5 files changed, 7 insertions(+), 59 deletions(-)
delete mode 100644 package/lua-lunix/0001-fix-with-uClibc.patch
rename package/lua-lunix/{0002-remove-link-with-librt.patch => 0001-remove-link-with-librt.patch} (70%)
delete mode 100644 package/lua-lunix/0003-fix-sysctl-detection.patch
diff --git a/package/lua-lunix/0001-fix-with-uClibc.patch b/package/lua-lunix/0001-fix-with-uClibc.patch
deleted file mode 100644
index 236eec47a..000000000
--- a/package/lua-lunix/0001-fix-with-uClibc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ee41d97a80b978f54941ac6857c00b8a8f28de24 Mon Sep 17 00:00:00 2001
-From: Francois Perrad <francois.perrad@gadz.org>
-Date: Sun, 6 Jun 2021 17:55:06 +0200
-Subject: [PATCH] fix with uClibc
-
-uClibc doesn't have is no sys_siglist.
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
----
- lunix-rel-20170920/src/unix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c
-index 5f3a70a..e561ab2 100644
---- a/lunix-rel-20170920/src/unix.c
-+++ b/lunix-rel-20170920/src/unix.c
-@@ -438,7 +438,7 @@
- #endif
-
- #ifndef HAVE_SYS_SIGLIST
--#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX)
-+#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX && !__UCLIBC__)
- #endif
-
- #ifndef HAVE_UNLINKAT
---
-2.30.2
-
diff --git a/package/lua-lunix/0002-remove-link-with-librt.patch b/package/lua-lunix/0001-remove-link-with-librt.patch
similarity index 70%
rename from package/lua-lunix/0002-remove-link-with-librt.patch
rename to package/lua-lunix/0001-remove-link-with-librt.patch
index 7b1c8ddd5..2650e9117 100644
--- a/package/lua-lunix/0002-remove-link-with-librt.patch
+++ b/package/lua-lunix/0001-remove-link-with-librt.patch
@@ -7,13 +7,13 @@ librt is not available with musl
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
- lunix-rel-20170920/lunix-20170920-1.rockspec | 10 ----------
+ lunix-rel-20220331/lunix-20220331-1.rockspec | 10 ----------
1 file changed, 10 deletions(-)
-diff --git a/lunix-rel-20170920/lunix-20170920-1.rockspec b/lunix-rel-20170920/lunix-20170920-1.rockspec
+diff --git a/lunix-rel-20220331/lunix-20220331-1.rockspec b/lunix-rel-20220331/lunix-20220331-1.rockspec
index 741179d..76cafeb 100644
---- a/lunix-rel-20170920/lunix-20170920-1.rockspec
-+++ b/lunix-rel-20170920/lunix-20170920-1.rockspec
+--- a/lunix-rel-20220331/lunix-20220331-1.rockspec
++++ b/lunix-rel-20220331/lunix-20220331-1.rockspec
@@ -26,16 +26,6 @@ build = {
};
};
diff --git a/package/lua-lunix/0003-fix-sysctl-detection.patch b/package/lua-lunix/0003-fix-sysctl-detection.patch
deleted file mode 100644
index 18656b192..000000000
--- a/package/lua-lunix/0003-fix-sysctl-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-sys/sysctl.h was removed with glibc 2.32
-
-Fetched from: https://github.com/wahern/lunix/pull/20/files
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
----
- lunix-rel-20170920/src/unix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c
-index 272820a..fa00876 100644
---- a/lunix-rel-20170920/src/unix.c
-+++ b/lunix-rel-20170920/src/unix.c
-@@ -165,7 +165,7 @@
- #endif
-
- #ifndef HAVE_SYS_SYSCTL_H /* missing on musl libc */
--#define HAVE_SYS_SYSCTL_H (defined BSD || GLIBC_PREREQ(0,0) || UCLIBC_PREREQ(0,0,0))
-+#define HAVE_SYS_SYSCTL_H (defined BSD || (__GLIBC__ && !GLIBC_PREREQ(2,32)) || UCLIBC_PREREQ(0,0,0))
- #endif
-
- #ifndef HAVE_STRUCT_IN_PKTINFO
---
-2.30.2
-
diff --git a/package/lua-lunix/lua-lunix.hash b/package/lua-lunix/lua-lunix.hash
index 6e3c920db..911f475b0 100644
--- a/package/lua-lunix/lua-lunix.hash
+++ b/package/lua-lunix/lua-lunix.hash
@@ -1,3 +1,3 @@
# computed by luarocks/buildroot
-sha256 4a4007b394ae884e18e9d0319ea584e8b4a682d7bf8fa5b99c7eea9baf1e5ed6 lunix-20170920-1.src.rock
-sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20170920/LICENSE
+sha256 eb13e89e1dfcc82aec3915ed4185f3a2a9205ec3e98a991b13cc39d7f389c427 lunix-20220331-1.src.rock
+sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20220331/LICENSE
diff --git a/package/lua-lunix/lua-lunix.mk b/package/lua-lunix/lua-lunix.mk
index 28cb2dc41..f3c159cbf 100644
--- a/package/lua-lunix/lua-lunix.mk
+++ b/package/lua-lunix/lua-lunix.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LUA_LUNIX_VERSION_UPSTREAM = 20170920
+LUA_LUNIX_VERSION_UPSTREAM = 20220331
LUA_LUNIX_VERSION = $(LUA_LUNIX_VERSION_UPSTREAM)-1
LUA_LUNIX_NAME_UPSTREAM = lunix
LUA_LUNIX_SUBDIR = lunix-rel-$(LUA_LUNIX_VERSION_UPSTREAM)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH] package/lua-lunix: bump to version 20220331
2022-09-03 13:58 [Buildroot] [PATCH] package/lua-lunix: bump to version 20220331 Francois Perrad
@ 2022-09-04 7:41 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-09-04 7:41 UTC (permalink / raw)
To: Francois Perrad; +Cc: buildroot
François, All,
On 2022-09-03 15:58 +0200, Francois Perrad spake thusly:
> remove merged patches
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Applied to next, thanks.
Regards,
Yann E. MORIN.
> ---
> package/lua-lunix/0001-fix-with-uClibc.patch | 28 -------------------
> ...atch => 0001-remove-link-with-librt.patch} | 8 +++---
> .../lua-lunix/0003-fix-sysctl-detection.patch | 24 ----------------
> package/lua-lunix/lua-lunix.hash | 4 +--
> package/lua-lunix/lua-lunix.mk | 2 +-
> 5 files changed, 7 insertions(+), 59 deletions(-)
> delete mode 100644 package/lua-lunix/0001-fix-with-uClibc.patch
> rename package/lua-lunix/{0002-remove-link-with-librt.patch => 0001-remove-link-with-librt.patch} (70%)
> delete mode 100644 package/lua-lunix/0003-fix-sysctl-detection.patch
>
> diff --git a/package/lua-lunix/0001-fix-with-uClibc.patch b/package/lua-lunix/0001-fix-with-uClibc.patch
> deleted file mode 100644
> index 236eec47a..000000000
> --- a/package/lua-lunix/0001-fix-with-uClibc.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From ee41d97a80b978f54941ac6857c00b8a8f28de24 Mon Sep 17 00:00:00 2001
> -From: Francois Perrad <francois.perrad@gadz.org>
> -Date: Sun, 6 Jun 2021 17:55:06 +0200
> -Subject: [PATCH] fix with uClibc
> -
> -uClibc doesn't have is no sys_siglist.
> -
> -Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ----
> - lunix-rel-20170920/src/unix.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c
> -index 5f3a70a..e561ab2 100644
> ---- a/lunix-rel-20170920/src/unix.c
> -+++ b/lunix-rel-20170920/src/unix.c
> -@@ -438,7 +438,7 @@
> - #endif
> -
> - #ifndef HAVE_SYS_SIGLIST
> --#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX)
> -+#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX && !__UCLIBC__)
> - #endif
> -
> - #ifndef HAVE_UNLINKAT
> ---
> -2.30.2
> -
> diff --git a/package/lua-lunix/0002-remove-link-with-librt.patch b/package/lua-lunix/0001-remove-link-with-librt.patch
> similarity index 70%
> rename from package/lua-lunix/0002-remove-link-with-librt.patch
> rename to package/lua-lunix/0001-remove-link-with-librt.patch
> index 7b1c8ddd5..2650e9117 100644
> --- a/package/lua-lunix/0002-remove-link-with-librt.patch
> +++ b/package/lua-lunix/0001-remove-link-with-librt.patch
> @@ -7,13 +7,13 @@ librt is not available with musl
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> - lunix-rel-20170920/lunix-20170920-1.rockspec | 10 ----------
> + lunix-rel-20220331/lunix-20220331-1.rockspec | 10 ----------
> 1 file changed, 10 deletions(-)
>
> -diff --git a/lunix-rel-20170920/lunix-20170920-1.rockspec b/lunix-rel-20170920/lunix-20170920-1.rockspec
> +diff --git a/lunix-rel-20220331/lunix-20220331-1.rockspec b/lunix-rel-20220331/lunix-20220331-1.rockspec
> index 741179d..76cafeb 100644
> ---- a/lunix-rel-20170920/lunix-20170920-1.rockspec
> -+++ b/lunix-rel-20170920/lunix-20170920-1.rockspec
> +--- a/lunix-rel-20220331/lunix-20220331-1.rockspec
> ++++ b/lunix-rel-20220331/lunix-20220331-1.rockspec
> @@ -26,16 +26,6 @@ build = {
> };
> };
> diff --git a/package/lua-lunix/0003-fix-sysctl-detection.patch b/package/lua-lunix/0003-fix-sysctl-detection.patch
> deleted file mode 100644
> index 18656b192..000000000
> --- a/package/lua-lunix/0003-fix-sysctl-detection.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -sys/sysctl.h was removed with glibc 2.32
> -
> -Fetched from: https://github.com/wahern/lunix/pull/20/files
> -Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ----
> - lunix-rel-20170920/src/unix.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c
> -index 272820a..fa00876 100644
> ---- a/lunix-rel-20170920/src/unix.c
> -+++ b/lunix-rel-20170920/src/unix.c
> -@@ -165,7 +165,7 @@
> - #endif
> -
> - #ifndef HAVE_SYS_SYSCTL_H /* missing on musl libc */
> --#define HAVE_SYS_SYSCTL_H (defined BSD || GLIBC_PREREQ(0,0) || UCLIBC_PREREQ(0,0,0))
> -+#define HAVE_SYS_SYSCTL_H (defined BSD || (__GLIBC__ && !GLIBC_PREREQ(2,32)) || UCLIBC_PREREQ(0,0,0))
> - #endif
> -
> - #ifndef HAVE_STRUCT_IN_PKTINFO
> ---
> -2.30.2
> -
> diff --git a/package/lua-lunix/lua-lunix.hash b/package/lua-lunix/lua-lunix.hash
> index 6e3c920db..911f475b0 100644
> --- a/package/lua-lunix/lua-lunix.hash
> +++ b/package/lua-lunix/lua-lunix.hash
> @@ -1,3 +1,3 @@
> # computed by luarocks/buildroot
> -sha256 4a4007b394ae884e18e9d0319ea584e8b4a682d7bf8fa5b99c7eea9baf1e5ed6 lunix-20170920-1.src.rock
> -sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20170920/LICENSE
> +sha256 eb13e89e1dfcc82aec3915ed4185f3a2a9205ec3e98a991b13cc39d7f389c427 lunix-20220331-1.src.rock
> +sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20220331/LICENSE
> diff --git a/package/lua-lunix/lua-lunix.mk b/package/lua-lunix/lua-lunix.mk
> index 28cb2dc41..f3c159cbf 100644
> --- a/package/lua-lunix/lua-lunix.mk
> +++ b/package/lua-lunix/lua-lunix.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LUA_LUNIX_VERSION_UPSTREAM = 20170920
> +LUA_LUNIX_VERSION_UPSTREAM = 20220331
> LUA_LUNIX_VERSION = $(LUA_LUNIX_VERSION_UPSTREAM)-1
> LUA_LUNIX_NAME_UPSTREAM = lunix
> LUA_LUNIX_SUBDIR = lunix-rel-$(LUA_LUNIX_VERSION_UPSTREAM)
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-04 7:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-03 13:58 [Buildroot] [PATCH] package/lua-lunix: bump to version 20220331 Francois Perrad
2022-09-04 7:41 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.