All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man
@ 2022-04-01 17:02 Fabrice Fontaine
  2022-04-04 18:02 ` Arnout Vandecappelle
  2022-04-08 12:40 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-04-01 17:02 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

udpcast unconditionally build manpages which will raise the following
build failure without pod2man since at least bump to version 20200328 in
commit 4fb91d8b9dff314fc53438144f843b3e3ceaacaa:

sh: line 1: pod2man: command not found

To fix this issue, rework how udpcast is built and installed to always
build and install the sender or the receiver and never build the
manpages. As a side effect, this will also avoid to install the unneeded
rateGovernor.h

Fixes:
 - http://autobuild.buildroot.org/results/ce602a09357e950d79794391cd4a852d565914f1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/udpcast/Config.in  |  2 ++
 package/udpcast/udpcast.mk | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index ef94b30a99..cc38c6e57c 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_UDPCAST
 	bool "udpcast"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_UDPCAST_SENDER \
+		if !BR2_PACKAGE_UDPCAST_RECEIVER
 	help
 	  A multicast protocol implementation which happens to
 	  be very handy for imaging drives over the network.
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index 34ebddd2d5..4c151bb41f 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -9,23 +9,15 @@ UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_DEPENDENCIES = host-m4
 UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+
 UDPCAST_LICENSE_FILES = COPYING
+UDPCAST_TARGETS = \
+	$(if $(BR2_PACKAGE_UDPCAST_RECEIVER),udp-receiver) \
+	$(if $(BR2_PACKAGE_UDPCAST_SENDER),udp-sender)
+UDPCAST_MAKE_OPTS = $(UDPCAST_TARGETS)
 
-define UDPCAST_REMOVE_UDP_SENDER
-	rm -f $(TARGET_DIR)/usr/sbin/udp-sender
-	rm -f $(TARGET_DIR)/usr/sbin/udp-sender.1
+define UDPCAST_INSTALL_TARGET_CMDS
+	$(foreach f,$(UDPCAST_TARGETS),\
+		$(INSTALL) -D -m 755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(f)
+	)
 endef
 
-ifneq ($(BR2_PACKAGE_UDPCAST_SENDER),y)
-UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_SENDER
-endif
-
-define UDPCAST_REMOVE_UDP_RECEIVER
-	rm -f $(TARGET_DIR)/usr/sbin/udp-receiver
-	rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1
-endef
-
-ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
-UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER
-endif
-
 $(eval $(autotools-package))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man
  2022-04-01 17:02 [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man Fabrice Fontaine
@ 2022-04-04 18:02 ` Arnout Vandecappelle
  2022-04-08 12:40 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2022-04-04 18:02 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot



On 01/04/2022 19:02, Fabrice Fontaine wrote:
> udpcast unconditionally build manpages which will raise the following
> build failure without pod2man since at least bump to version 20200328 in
> commit 4fb91d8b9dff314fc53438144f843b3e3ceaacaa:
> 
> sh: line 1: pod2man: command not found
> 
> To fix this issue, rework how udpcast is built and installed to always
> build and install the sender or the receiver and never build the
> manpages. As a side effect, this will also avoid to install the unneeded
> rateGovernor.h
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/ce602a09357e950d79794391cd4a852d565914f1
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/udpcast/Config.in  |  2 ++
>   package/udpcast/udpcast.mk | 24 ++++++++----------------
>   2 files changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
> index ef94b30a99..cc38c6e57c 100644
> --- a/package/udpcast/Config.in
> +++ b/package/udpcast/Config.in
> @@ -6,6 +6,8 @@ config BR2_PACKAGE_UDPCAST
>   	bool "udpcast"
>   	depends on BR2_TOOLCHAIN_HAS_THREADS
>   	depends on BR2_USE_MMU # fork()
> +	select BR2_PACKAGE_UDPCAST_SENDER \
> +		if !BR2_PACKAGE_UDPCAST_RECEIVER
>   	help
>   	  A multicast protocol implementation which happens to
>   	  be very handy for imaging drives over the network.
> diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
> index 34ebddd2d5..4c151bb41f 100644
> --- a/package/udpcast/udpcast.mk
> +++ b/package/udpcast/udpcast.mk
> @@ -9,23 +9,15 @@ UDPCAST_SITE = http://www.udpcast.linux.lu/download
>   UDPCAST_DEPENDENCIES = host-m4
>   UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+
>   UDPCAST_LICENSE_FILES = COPYING
> +UDPCAST_TARGETS = \
> +	$(if $(BR2_PACKAGE_UDPCAST_RECEIVER),udp-receiver) \
> +	$(if $(BR2_PACKAGE_UDPCAST_SENDER),udp-sender)
> +UDPCAST_MAKE_OPTS = $(UDPCAST_TARGETS)
>   
> -define UDPCAST_REMOVE_UDP_SENDER
> -	rm -f $(TARGET_DIR)/usr/sbin/udp-sender
> -	rm -f $(TARGET_DIR)/usr/sbin/udp-sender.1
> +define UDPCAST_INSTALL_TARGET_CMDS
> +	$(foreach f,$(UDPCAST_TARGETS),\
> +		$(INSTALL) -D -m 755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(f)
> +	)
>   endef
>   
> -ifneq ($(BR2_PACKAGE_UDPCAST_SENDER),y)
> -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_SENDER
> -endif
> -
> -define UDPCAST_REMOVE_UDP_RECEIVER
> -	rm -f $(TARGET_DIR)/usr/sbin/udp-receiver
> -	rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1
> -endef
> -
> -ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
> -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER
> -endif
> -
>   $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man
  2022-04-01 17:02 [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man Fabrice Fontaine
  2022-04-04 18:02 ` Arnout Vandecappelle
@ 2022-04-08 12:40 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-04-08 12:40 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > udpcast unconditionally build manpages which will raise the following
 > build failure without pod2man since at least bump to version 20200328 in
 > commit 4fb91d8b9dff314fc53438144f843b3e3ceaacaa:

 > sh: line 1: pod2man: command not found

 > To fix this issue, rework how udpcast is built and installed to always
 > build and install the sender or the receiver and never build the
 > manpages. As a side effect, this will also avoid to install the unneeded
 > rateGovernor.h

 > Fixes:
 >  - http://autobuild.buildroot.org/results/ce602a09357e950d79794391cd4a852d565914f1

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-08 12:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01 17:02 [Buildroot] [PATCH 1/1] package/udpcast: fix build without pod2man Fabrice Fontaine
2022-04-04 18:02 ` Arnout Vandecappelle
2022-04-08 12:40 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.