Skip to contentSkip to conversation

nilfs-utils: no comment if BR2_USE_MMU is true

PATCH New Fabrice Fontaine 4 participants 10 messages Sep 26, 2018 – Oct 5, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 nilfs-utils: no comment if BR2_USE_MMU is true

Don't display comment if BR2_USE_MMU is true
Moreover, move BR2_USE_MMU dependency at the top of dependency list

---
 package/nilfs-utils/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/nilfs-utils/Config.in +2 -1
index e49cab369b..e245dc4656 100644
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_NILFS_UTILS
 	bool "nilfs-utils"
+	depends on BR2_USE_MMU # util-linux libmount, libblkid
 	depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open()
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
-	depends on BR2_USE_MMU # util-linux libmount, libblkid
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
@@ -13,5 +13,6 @@ config BR2_PACKAGE_NILFS_UTILS
 	  https://github.com/nilfs-dev/nilfs-utils
 
 comment "nilfs-utils needs a toolchain w/ threads, NPTL"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 nilfs-utils: drop NPTL dependency

The latest uClibc-ng version (1.0.30) provides clock_nanosleep() even for non NPTL configurations.

---
 package/nilfs-utils/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/nilfs-utils/Config.in +2 -4
index e245dc4656..7b239b1af5 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NILFS_UTILS
 	bool "nilfs-utils"
 	depends on BR2_USE_MMU # util-linux libmount, libblkid
 	depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open()
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
@@ -12,7 +11,6 @@ config BR2_PACKAGE_NILFS_UTILS
 
 	  https://github.com/nilfs-dev/nilfs-utils
 
-comment "nilfs-utils needs a toolchain w/ threads, NPTL"
+comment "nilfs-utils needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 nilfs-utils: drop NPTL dependency

Quoted 2 lines · Fabrice Fontaine

The latest uClibc-ng version (1.0.30) provides clock_nanosleep() even for non NPTL configurations.

Do you mean that buildroot must only be built with uClibc-ng > 1.0.30?

Quoted 11 lines
---
 package/nilfs-utils/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/nilfs-utils/Config.in +0 -0
index e245dc4656..7b239b1af5 100644

package/nilfs-utils/Config.in config BR2_PACKAGE_NILFS_UTILS · line 5

Quoted 4 lines
package/nilfs-utils/Config.in +0 -1
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NILFS_UTILS
 	bool "nilfs-utils"
 	depends on BR2_USE_MMU # util-linux libmount, libblkid
 	depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open()
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()

I think you break other configurations here.
Did you try testbuilds with this change?

I remember a strong debate some time ago where the final outcome was that this constructs is put on several places, and that it would be better to introduce something like BR2_TOOLCHAIN_HAS_CLOCK_NANOSLEEP or something alike instead. This would really solve the issue.

package/nilfs-utils/Config.in config BR2_PACKAGE_NILFS_UTILS · line 16

Quoted 13 lines
package/nilfs-utils/Config.in +2 -3
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
@@ -12,7 +11,6 @@ config BR2_PACKAGE_NILFS_UTILS
 
 	  https://github.com/nilfs-dev/nilfs-utils
 
-comment "nilfs-utils needs a toolchain w/ threads, NPTL"
+comment "nilfs-utils needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

Kurt

#3 lore raw

PATCH 2/2 nilfs-utils: drop NPTL dependency

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Kurt" == Kurt Van Dijck <[email protected]> writes:

Quoted 2 lines · Fabrice Fontaine

The latest uClibc-ng version (1.0.30) provides clock_nanosleep() even for non NPTL configurations.

Do you mean that buildroot must only be built with uClibc-ng > 1.0.30?

I guess you mean >= . Indeed, only uClibc-ng 1.0.30 built with our defconfig is really supported.

1.0.30 was released back in April, so requiring this for our November release is IMHO OK.

Quoted 6 lines
Quoted 6 lines

---
package/nilfs-utils/Config.in | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
Quoted 12 lines

package/nilfs-utils/Config.in config BR2_PACKAGE_NILFS_UTILS · line 5

Quoted 9 lines
package/nilfs-utils/Config.in +0 -0
index e245dc4656..7b239b1af5 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NILFS_UTILS

bool "nilfs-utils"
depends on BR2_USE_MMU # util-linux libmount, libblkid depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open()

package/nilfs-utils/Config.in +0 -1
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()

I think you break other configurations here.
Did you try testbuilds with this change?

It does not introduce breakage as such. Before, if you had an uClibc-ng config without NPTL you couldn't enable this package - Now you can. If you are using an old pre-1.0.30 external uClibc-ng toolchain then it will not actually build, but that is a general problem with external uClibc-ng toolchains if they are not in sync with the internal toolchain.

In any case, the solution is simply - Just rebuild your toolchain.

Quoted 4 lines

I remember a strong debate some time ago where the final outcome was that this constructs is put on several places, and that it would be better to introduce something like BR2_TOOLCHAIN_HAS_CLOCK_NANOSLEEP or something alike instead. This would really solve the issue.

The problem is that a user of an external uClibc-ng toolchain has to answer all these fine grained configuration options (and we have to verify them), so it doesn't really scale.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/2 nilfs-utils: no comment if BR2_USE_MMU is true

In reply to Fabrice Fontaine
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Don't display comment if BR2_USE_MMU is true
Moreover, move BR2_USE_MMU dependency at the top of dependency list

I'm not sure if that is really any better. I don't think we have any strong rules about this, but in lack of other rules I would say sort alphabetically.

But ok, I don't feel strongly about it.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/2 nilfs-utils: no comment if BR2_USE_MMU is true

Quoted 8 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Don't display comment if BR2_USE_MMU is true
Moreover, move BR2_USE_MMU dependency at the top of dependency list

I'm not sure if that is really any better. I don't think we have any strong rules about this, but in lack of other rules I would say sort alphabetically.

I thought we had a weak rule of:

- first arch dependencies (i.e. where you have no choice);

- then toolchain dependencies (i.e. where you can enable them, and which need a
comment);

- then package dependencies;

- then select.

And alphabetical within each category.

Regards,
Arnout

Quoted 5 lines

But ok, I don't feel strongly about it.

Committed, thanks.

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#8 lore raw

PATCH 1/2 nilfs-utils: no comment if BR2_USE_MMU is true

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Quoted 8 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Don't display comment if BR2_USE_MMU is true
Moreover, move BR2_USE_MMU dependency at the top of dependency list

I'm not sure if that is really any better. I don't think we have any strong rules about this, but in lack of other rules I would say sort alphabetically.

I thought we had a weak rule of:

- first arch dependencies (i.e. where you have no choice);

Quoted 8 lines

- then toolchain dependencies (i.e. where you can enable them, and which need a
comment);

- then package dependencies;

- then select.

And alphabetical within each category.

Sounds sensible, but I don't think this is written down anywhere official.

Signature · 1 line
Bye, Peter Korsgaard
#9 lore raw

PATCH 1/2 nilfs-utils: no comment if BR2_USE_MMU is true

In reply to Fabrice Fontaine
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Don't display comment if BR2_USE_MMU is true
Moreover, move BR2_USE_MMU dependency at the top of dependency list

Committed to 2018.02.x, 2018.05.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard