Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [RFC PATCH v3 1/2] makedevs: only warn when xattr support disabled
@ 2019-07-30 20:31 Petr Vorel
  2019-07-30 20:31 ` [Buildroot] [RFC PATCH v3 2/2] iputils: add capability for clockdiff, ping, traceroute6 Petr Vorel
  2019-07-30 20:57 ` [Buildroot] [RFC PATCH v3 1/2] makedevs: only warn when xattr support disabled Yann E. MORIN
  0 siblings, 2 replies; 4+ messages in thread
From: Petr Vorel @ 2019-07-30 20:31 UTC (permalink / raw)
  To: buildroot

Previously makedevs failed when xattr configuration defined while
disabled BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES.
Therefore check for this configuration would be required
in each use. Therefore only print warning with number of discharged lines.

No package is using this feature so far (it's used only in tests),
thus no need to change any package config.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Changes v2->v3:
* print warning only once at the end, print number of discharged lines
* put into single line (feel free to add new line)

 package/makedevs/makedevs.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c
index c57b964f5c..aa0b4b4cba 100644
--- a/package/makedevs/makedevs.c
+++ b/package/makedevs/makedevs.c
@@ -493,6 +493,7 @@ int main(int argc, char **argv)
 		printf("table=<stdin>\n");
 	}
 
+	unsigned int xattr_warned = 0;
 	while ((line = bb_get_chomped_line_from_file(table))) {
 		char type;
 		unsigned int mode = 0755;
@@ -518,9 +519,7 @@ int main(int argc, char **argv)
 			if (bb_set_xattr(full_name, xattr) < 0)
 				bb_error_msg_and_die("can't set cap %s on file %s\n", xattr, full_name);
 #else
-			bb_error_msg_and_die("line %d not supported: '%s'\nDid you forget to enable "
-					     "BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES?\n",
-					     linenum, line);
+			xattr_warned++;
 #endif /* EXTENDED_ATTRIBUTES */
 			continue;
 		}
@@ -641,6 +640,15 @@ int main(int argc, char **argv)
 loop:
 		free(line);
 	}
+
+	if (xattr_warned) {
+			bb_error_msg("%u lines with xattr configuration discharged, enable "
+					     "BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES "
+						 "to get xattr support\n",
+					     xattr_warned);
+			ret = EXIT_FAILURE;
+	}
+
 	fclose(table);
 
 	return ret;
-- 
2.22.0

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

end of thread, other threads:[~2019-07-30 21:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-30 20:31 [Buildroot] [RFC PATCH v3 1/2] makedevs: only warn when xattr support disabled Petr Vorel
2019-07-30 20:31 ` [Buildroot] [RFC PATCH v3 2/2] iputils: add capability for clockdiff, ping, traceroute6 Petr Vorel
2019-07-30 20:57 ` [Buildroot] [RFC PATCH v3 1/2] makedevs: only warn when xattr support disabled Yann E. MORIN
2019-07-30 21:42   ` Petr Vorel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox