Skip to contentSkip to conversation

package/cryptsetup: really break circular dependency

PATCH New Romain Naour 3 participants 3 messages Nov 13, 2020 – Nov 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cryptsetup: really break circular dependency

The commit [1] should fix a circular dependency by using util-linux-libs instead of util-linux if BR2_PACKAGE_UTIL_LINUX_LIBS is set.

But util-linux is still in CRYPTSETUP_DEPENDENCIES. Remove it to really break the circular dependency.

[1] e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab

Cc Fabrice Fontaine <[email protected]>
Cc Yann E. MORIN <[email protected]>
---
 package/cryptsetup/cryptsetup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/cryptsetup/cryptsetup.mk +1 -1
index 60097595b4..a59a0c7570 100644
@@ -9,7 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = \
-	lvm2 popt util-linux host-pkgconf json-c libargon2 \
+	lvm2 popt host-pkgconf json-c libargon2 \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
 	$(TARGET_NLS_DEPENDENCIES)
Signature · 1 line
2.25.4
#1 lore raw

PATCH 1/1 package/cryptsetup: really break circular dependency

Hi Romain,

Le ven. 13 nov. 2020 ? 23:52, Romain Naour <[email protected]> a ?crit :

Quoted 7 lines

The commit [1] should fix a circular dependency by using util-linux-libs instead of util-linux if BR2_PACKAGE_UTIL_LINUX_LIBS is set.

But util-linux is still in CRYPTSETUP_DEPENDENCIES. Remove it to really break the circular dependency.

Thanks for fixing this mistake.

Quoted 24 lines

[1] e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab

Cc Fabrice Fontaine <[email protected]>
Cc Yann E. MORIN <[email protected]>
---
 package/cryptsetup/cryptsetup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/cryptsetup/cryptsetup.mk +1 -2
index 60097595b4..a59a0c7570 100644
@@ -9,7 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = \
-       lvm2 popt util-linux host-pkgconf json-c libargon2 \
+       lvm2 popt host-pkgconf json-c libargon2 \
        $(if $(BR2_PACKAGE_LIBICONV),libiconv) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
        $(TARGET_NLS_DEPENDENCIES)
--
Quoted 2 lines

2.25.4

Best Regards,

Fabrice

#2 lore raw

PATCH 1/1 package/cryptsetup: really break circular dependency

In reply to Romain Naour

Romain, All,

On 2020-11-13 23:52 +0100, Romain Naour spake thusly:

Quoted 4 lines

The commit [1] should fix a circular dependency by using util-linux-libs instead of util-linux if BR2_PACKAGE_UTIL_LINUX_LIBS is set.

Quoted 8 lines

But util-linux is still in CRYPTSETUP_DEPENDENCIES. Remove it to really break the circular dependency.

[1] e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab

Cc Fabrice Fontaine <[email protected]>
Cc Yann E. MORIN <[email protected]>

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 20 lines
---
 package/cryptsetup/cryptsetup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/cryptsetup/cryptsetup.mk +1 -1
index 60097595b4..a59a0c7570 100644
@@ -9,7 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = \
-	lvm2 popt util-linux host-pkgconf json-c libargon2 \
+	lvm2 popt host-pkgconf json-c libargon2 \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
 	$(TARGET_NLS_DEPENDENCIES)
Signature · 1 line
2.25.4
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'