Also sort alphabetically.
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
rules/v4l-utils.in | 54 +++++++++++++++++++++++++++++++++++++++-------------
rules/v4l-utils.make | 45 +++++++++++++++++++++++++++----------------
2 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 1dff76fdd..b73032c10 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -30,35 +30,63 @@ config V4L_UTILS_LIBV4LCONVERT
bool
prompt "install libv4lconvert"
+config V4L_UTILS_CECCOMPLIANCE
+ bool
+ prompt "install cec-compliance"
+
+config V4L_UTILS_CECCTL
+ bool
+ prompt "install cec-ctl"
+
+config V4L_UTILS_CECFOLLOWER
+ bool
+ prompt "install cec-follower"
+
+config V4L_UTILS_CECFOLLOWER
+ bool
+ prompt "install cx18-ctl"
+
+config V4L_UTILS_DECODETM6000
+ bool
+ prompt "install decode_tm6000"
+
+config V4L_UTILS_IRCTL
+ bool
+ prompt "install ir-ctl"
+
+config V4L_UTILS_IRKEYTABLE
+ bool
+ prompt "install ir-keytable"
+
+config V4L_UTILS_IVTVCTL
+ bool
+ prompt "install ivtv-ctl"
+
config V4L_UTILS_MEDIACTL
bool
prompt "install media-ctl"
+config V4L_UTILS_RDSCTL
+ bool
+ prompt "install rds-ctl"
+
config V4L_UTILS_V4L2COMPLIANCE
bool
select V4L_UTILS_LIBV4L2
- prompt "install v4l2compliance"
+ prompt "install v4l2-compliance"
config V4L_UTILS_V4L2DBG
bool
select V4L_UTILS_LIBV4L2
- prompt "install v4l-dbg"
+ prompt "install v4l2-dbg"
config V4L_UTILS_V4L2CTL
bool
select V4L_UTILS_LIBV4L2
- prompt "install v4l-ctl"
+ prompt "install v4l2-ctl"
-config V4L_UTILS_CECCTL
+config V4L_UTILS_V4L2SYSFSPATH
bool
- prompt "install cec-ctl"
-
-config V4L_UTILS_CECCOMPLIANCE
- bool
- prompt "install cec-compliance"
-
-config V4L_UTILS_CECFOLLOWER
- bool
- prompt "install cec-follower"
+ prompt "install v4l2-sysfs-path"
endif
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index 5c94fdd01..ba3a14568 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -64,35 +64,48 @@ endif
ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
endif
-
+ifdef PTXCONF_V4L_UTILS_CECCOMPLIANCE
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-compliance)
+endif
+ifdef PTXCONF_V4L_UTILS_CECCTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_CECFOLLOWER
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-follower)
+endif
+ifdef PTXCONF_V4L_UTILS_CX18CTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cx18-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_DECODETM6000
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/decode_tm6000)
+endif
+ifdef PTXCONF_V4L_UTILS_IRCTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ir-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_IRKEYTABLE
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ir-keytable)
+endif
+ifdef PTXCONF_V4L_UTILS_IVTVCTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ivtv-ctl)
+endif
ifdef PTXCONF_V4L_UTILS_MEDIACTL
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/media-ctl)
endif
-
+ifdef PTXCONF_V4L_UTILS_RDSCTL
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/rds-ctl)
+endif
ifdef PTXCONF_V4L_UTILS_V4L2COMPLIANCE
@$(call install_copy, v4l-utils, 0, 0, 0755, -,
/usr/bin/v4l2-compliance)
endif
-
ifdef PTXCONF_V4L_UTILS_V4L2DBG
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/sbin/v4l2-dbg)
endif
-
ifdef PTXCONF_V4L_UTILS_V4L2CTL
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-ctl)
endif
-
-ifdef PTXCONF_V4L_UTILS_CECCTL
- @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-ctl)
+ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH
+ @$(call install_copy, v4l-utils, 0, 0, 0755, -,
/usr/bin/v4l2-sysfs-path)
endif
-
-ifdef PTXCONF_V4L_UTILS_CECCOMPLIANCE
- @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-compliance)
-endif
-
-ifdef PTXCONF_V4L_UTILS_CECFOLLOWER
- @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-follower)
-endif
-
@$(call install_finish, v4l-utils)
@$(call touch)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
