[ptxdist] [PATCH 1/3] procps: prevent conflict with new busybox applet

[ptxdist] [PATCH 1/3] procps: prevent conflict with new busybox applet

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/procps.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/procps.in b/rules/procps.in
index 762fc1839..8aee7d8ae 100644
--- a/rules/procps.in
+++ b/rules/procps.in
@@ -162,9 +162,13 @@ config PROCPS_VMSTAT
 config PROCPS_W
 	bool
 	prompt "w"
+	depends on !BUSYBOX_W || ALLYES
 	help
 	  Show who is logged on and what they are doing.
 
+comment "busybox' w is selected!"
+	depends on BUSYBOX_W
+
 config PROCPS_WATCH
 	bool
 	prompt "watch"
-- 
2.14.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] coreutils: prevent conflicts with new busybox applets

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/coreutils.in | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/rules/coreutils.in b/rules/coreutils.in
index 8eff96b69..75d897440 100644
--- a/rules/coreutils.in
+++ b/rules/coreutils.in
@@ -211,6 +211,10 @@ comment "busybox' cut is selected!"
 config COREUTILS_SHRED
 	bool
 	prompt "shred"
+	depends on !BUSYBOX_SHRED || ALLYES
+
+comment "busybox' shred is selected!"
+	depends on BUSYBOX_SHRED
 
 config COREUTILS_OD
 	bool
@@ -283,6 +287,10 @@ comment "busybox' touch is selected!"
 config COREUTILS_PASTE
 	bool
 	prompt "paste"
+	depends on !BUSYBOX_PASTE || ALLYES
+
+comment "busybox' paste is selected!"
+	depends on BUSYBOX_PASTE
 
 config COREUTILS_MKNOD
 	bool
@@ -372,6 +380,10 @@ comment "busybox' yes is selected!"
 config COREUTILS_FACTOR
 	bool
 	prompt "factor"
+	depends on !BUSYBOX_FACTOR || ALLYES
+
+comment "busybox' factor is selected!"
+	depends on BUSYBOX_FACTOR
 
 config COREUTILS_JOIN
 	bool
@@ -504,6 +516,10 @@ comment "busybox' id is selected!"
 config COREUTILS_LINK
 	bool
 	prompt "link"
+	depends on !BUSYBOX_LINK || ALLYES
+
+comment "busybox' link is selected!"
+	depends on BUSYBOX_LINK
 
 config COREUTILS_SLEEP
 	bool
@@ -568,6 +584,10 @@ config COREUTILS_PATHCHK
 config COREUTILS_NL
 	bool
 	prompt "nl"
+	depends on !BUSYBOX_NL || ALLYES
+
+comment "busybox' nl is selected!"
+	depends on BUSYBOX_NL
 
 config COREUTILS_WC
 	bool
@@ -592,6 +612,10 @@ comment "busybox' unexpand is selected!"
 config COREUTILS_NPROC
 	bool
 	prompt "nproc"
+	depends on !BUSYBOX_NPROC || ALLYES
+
+comment "busybox' nproc is selected!"
+	depends on BUSYBOX_NPROC
 
 config COREUTILS_NUMFMT
 	bool
-- 
2.14.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] e2fsprogs: remove mkfs.ext4dev

[Clemens Gruber]

Remove the rest of the legacy ext4dev tools.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/e2fsprogs.in   | 7 -------
 rules/e2fsprogs.make | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index f4dae9dfd..769d49e6d 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -244,13 +244,6 @@ config E2FSPROGS_INSTALL_MKFS_EXT4
 	help
 	  Create link to mkfs.ext4 program.
 
-config E2FSPROGS_INSTALL_MKFS_EXT4DEV
-	bool
-	prompt "mkfs.ext4dev"
-	select E2FSPROGS_INSTALL_MKE2FS
-	help
-	  Create link to mkfs.ext4dev program.
-
 endif
 
 config E2FSPROGS_INSTALL_MKLOSTANDFOUND
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index c4f2e3bb8..0b0a81668 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -188,9 +188,6 @@ endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4
 	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV
-	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4dev)
-endif
 
 
 ifdef PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND
-- 
2.14.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de