All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/rpm: support lua v5.3+
@ 2021-09-12  0:42 James Knight
  2021-09-12  7:50 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: James Knight @ 2021-09-12  0:42 UTC (permalink / raw)
  To: buildroot; +Cc: James Knight

The version bump [1] for the rpm package to v4.17 added the newly
required dependency to Lua; however, the change limited support to only
v5.3 (and not higher). Correcting support for v5.3 or higher by making
a dependency on the Lua package and omitting older versions which are
not supported (specifically, the v5.1 series)

[1]: 429e247b869027f6ecd4efa0f31bccd2765e3875

Signed-off-by: James Knight <james.d.knight@live.com>
---
 package/rpm/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 2af04b41b4be8f779912644245e3ee5f2a3422b8..e4a7e00a4c705f31a7ab47aa64a4bec1f86c1ec0 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,6 +1,6 @@
 comment "rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_PACKAGE_LUA_5_3
+		|| !BR2_PACKAGE_LUA || BR2_PACKAGE_LUA_5_1
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	depends on BR2_USE_MMU
 
@@ -8,7 +8,7 @@ config BR2_PACKAGE_RPM
 	bool "rpm"
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	depends on BR2_PACKAGE_LUA_5_3
+	depends on BR2_PACKAGE_LUA && !BR2_PACKAGE_LUA_5_1
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
-- 
2.28.0.windows.1

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/rpm: support lua v5.3+
  2021-09-12  0:42 [Buildroot] [PATCH 1/1] package/rpm: support lua v5.3+ James Knight
@ 2021-09-12  7:50 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2021-09-12  7:50 UTC (permalink / raw)
  To: James Knight; +Cc: buildroot

James, All,

On 2021-09-11 20:42 -0400, James Knight spake thusly:
> The version bump [1] for the rpm package to v4.17 added the newly
> required dependency to Lua; however, the change limited support to only
> v5.3 (and not higher). Correcting support for v5.3 or higher by making
> a dependency on the Lua package and omitting older versions which are
> not supported (specifically, the v5.1 series)
> 
> [1]: 429e247b869027f6ecd4efa0f31bccd2765e3875
> 
> Signed-off-by: James Knight <james.d.knight@live.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/rpm/Config.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/rpm/Config.in b/package/rpm/Config.in
> index 2af04b41b4be8f779912644245e3ee5f2a3422b8..e4a7e00a4c705f31a7ab47aa64a4bec1f86c1ec0 100644
> --- a/package/rpm/Config.in
> +++ b/package/rpm/Config.in
> @@ -1,6 +1,6 @@
>  comment "rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3"
>  	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
> -		|| !BR2_PACKAGE_LUA_5_3
> +		|| !BR2_PACKAGE_LUA || BR2_PACKAGE_LUA_5_1
>  	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
>  	depends on BR2_USE_MMU
>  
> @@ -8,7 +8,7 @@ config BR2_PACKAGE_RPM
>  	bool "rpm"
>  	depends on !BR2_STATIC_LIBS # dlfcn.h
>  	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> -	depends on BR2_PACKAGE_LUA_5_3
> +	depends on BR2_PACKAGE_LUA && !BR2_PACKAGE_LUA_5_1
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_USE_MMU # fork()
>  	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
> -- 
> 2.28.0.windows.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-12  7:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-12  0:42 [Buildroot] [PATCH 1/1] package/rpm: support lua v5.3+ James Knight
2021-09-12  7:50 ` 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.