diff mbox

[2/2] Add package hackrf-tools

Message ID 1444546853-1505-2-git-send-email-jrspruitt@gmail.com
State Changes Requested
Headers show

Commit Message

Jason Pruitt Oct. 11, 2015, 7 a.m. UTC
Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
---
 package/Config.in                    |  1 +
 package/hackrf-tools/Config.in       |  8 ++++++++
 package/hackrf-tools/hackrf-tools.mk | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/hackrf-tools/Config.in
 create mode 100644 package/hackrf-tools/hackrf-tools.mk

Comments

Samuel Martin Oct. 11, 2015, 8:12 a.m. UTC | #1
Hi Jason,

On Sun, Oct 11, 2015 at 9:00 AM, Jason Pruitt <jrspruitt@gmail.com> wrote:
> Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
> ---
>  package/Config.in                    |  1 +
>  package/hackrf-tools/Config.in       |  8 ++++++++
>  package/hackrf-tools/hackrf-tools.mk | 14 ++++++++++++++
>  3 files changed, 23 insertions(+)
>  create mode 100644 package/hackrf-tools/Config.in
>  create mode 100644 package/hackrf-tools/hackrf-tools.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 0184e46..fe3f057 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -352,6 +352,7 @@ endif
>         source "package/gpsd/Config.in"
>         source "package/gptfdisk/Config.in"
>         source "package/gvfs/Config.in"
> +       source "package/hackrf-tools/Config.in
>  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
>         source "package/hdparm/Config.in"
>  endif
> diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
> new file mode 100644
> index 0000000..71fced6
> --- /dev/null
> +++ b/package/hackrf-tools/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_HACKRF_TOOLS
> +       bool "hackrf-tools"
> +    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)
> +       help
> +         Tools for interacting with and updating HackRF boards.
> +
> +         https://github.com/mossmann/hackrf/host/hackrf-tools

The right url seems to be:
https://github.com/mossmann/hackrf/tree/master/host/hackrf-tools

> +
> diff --git a/package/hackrf-tools/hackrf-tools.mk b/package/hackrf-tools/hackrf-tools.mk
> new file mode 100644
> index 0000000..40bccae
> --- /dev/null
> +++ b/package/hackrf-tools/hackrf-tools.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# hackrf-tools
> +#
> +################################################################################
> +
> +HACKRF_TOOLS_VERSION = v2015.07.2
> +HACKRF_TOOLS_SITE = $(call github,mossmann,hackrf,$(HACKRF_TOOLS_VERSION))
> +HACKRF_TOOLS_LICENSE = GPLv2+
> +HACKRF_TOOLS_LICENSE_FILES = COPYING
> +HACKRF_TOOLS_DEPENDENCIES = libhackrf
> +HACKRF_TOOLS_SUBDIR = host/hackrf-tools
> +
> +$(eval $(cmake-package))
> --
> 2.1.4
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Otherwise, it looks pretty good :)

Regards,
Thomas Petazzoni Oct. 11, 2015, 9:18 a.m. UTC | #2
Dear Jason Pruitt,

On Sun, 11 Oct 2015 00:00:53 -0700, Jason Pruitt wrote:

> diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
> new file mode 100644
> index 0000000..71fced6
> --- /dev/null
> +++ b/package/hackrf-tools/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_HACKRF_TOOLS
> +	bool "hackrf-tools"
> +    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)

Improper indentation. Besides that, if something doesn't build with
pure static libraries, we normally do:

	depends on !BR2_STATIC_LIBS

and add a comment:

comment "hackrf-tools needs a toolchain w/ dynamic library"
	depends on BR2_STATIC_LIBS

Regarding the "depends on BR2_PACKAGE_LIBHACKRF", it should be a
"select" instead:

	select BR2_PACKAGE_LIBHACKRF

and then you need to propagate the reverse dependencies of libhackrf:

	depends on BR2_TOOLCHAIN_HAS_THREADS

and of course keep a comment about this thread dependency. So the
comment above should in fact be:

comment "hackrf-tools needs a toolchain w/ threads, dynamic library"
	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

However, this is all moot if you merge both packages into one, as
suggested in my review of the libhackrf package.

> +	help
> +	  Tools for interacting with and updating HackRF boards.
> +
> +	  https://github.com/mossmann/hackrf/host/hackrf-tools
> +

Unneeded empty new line.

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 0184e46..fe3f057 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -352,6 +352,7 @@  endif
 	source "package/gpsd/Config.in"
 	source "package/gptfdisk/Config.in"
 	source "package/gvfs/Config.in"
+	source "package/hackrf-tools/Config.in
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/hdparm/Config.in"
 endif
diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
new file mode 100644
index 0000000..71fced6
--- /dev/null
+++ b/package/hackrf-tools/Config.in
@@ -0,0 +1,8 @@ 
+config BR2_PACKAGE_HACKRF_TOOLS
+	bool "hackrf-tools"
+    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)
+	help
+	  Tools for interacting with and updating HackRF boards.
+
+	  https://github.com/mossmann/hackrf/host/hackrf-tools
+
diff --git a/package/hackrf-tools/hackrf-tools.mk b/package/hackrf-tools/hackrf-tools.mk
new file mode 100644
index 0000000..40bccae
--- /dev/null
+++ b/package/hackrf-tools/hackrf-tools.mk
@@ -0,0 +1,14 @@ 
+################################################################################
+#
+# hackrf-tools
+#
+################################################################################
+
+HACKRF_TOOLS_VERSION = v2015.07.2
+HACKRF_TOOLS_SITE = $(call github,mossmann,hackrf,$(HACKRF_TOOLS_VERSION))
+HACKRF_TOOLS_LICENSE = GPLv2+
+HACKRF_TOOLS_LICENSE_FILES = COPYING
+HACKRF_TOOLS_DEPENDENCIES = libhackrf
+HACKRF_TOOLS_SUBDIR = host/hackrf-tools
+
+$(eval $(cmake-package))