Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file
@ 2014-12-02 23:21 Ryan Coe
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Ryan Coe @ 2014-12-02 23:21 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
 package/rp-pppoe/rp-pppoe.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 4e17f2d..70b4437 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -18,6 +18,8 @@ RP_PPPOE_CONF_ENV = \
 	PPPD_H=$(PPPD_DIR)/pppd/pppd.h
 
 define RP_PPPOE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/configs/pppoe.conf \
+		$(TARGET_DIR)/etc/ppp/pppoe.conf
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 	done
-- 
2.2.0

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-02 23:21 [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Ryan Coe
@ 2014-12-02 23:21 ` Ryan Coe
  2014-12-03 15:05   ` Matthew Weber
                     ` (2 more replies)
  2014-12-03 15:03 ` [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Matthew Weber
  2014-12-03 22:26 ` Peter Korsgaard
  2 siblings, 3 replies; 11+ messages in thread
From: Ryan Coe @ 2014-12-02 23:21 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
 package/rp-pppoe/rp-pppoe.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 70b4437..9c3e3e4 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -11,6 +11,8 @@ RP_PPPOE_LICENSE_FILES = doc/LICENSE
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
 RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
+RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \
+	pppoe-stop
 RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
 RP_PPPOE_CONF_OPTS = --disable-debugging
 RP_PPPOE_CONF_ENV = \
@@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 	done
+	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
+		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
+	done
 endef
 
 $(eval $(autotools-package))
-- 
2.2.0

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

* [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file
  2014-12-02 23:21 [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Ryan Coe
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
@ 2014-12-03 15:03 ` Matthew Weber
  2014-12-03 22:26 ` Peter Korsgaard
  2 siblings, 0 replies; 11+ messages in thread
From: Matthew Weber @ 2014-12-03 15:03 UTC (permalink / raw)
  To: buildroot

Ryan,

On Tue, Dec 2, 2014 at 5:21 PM, Ryan Coe <bluemrp9@gmail.com> wrote:
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> ---
>  package/rp-pppoe/rp-pppoe.mk | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
> index 4e17f2d..70b4437 100644
> --- a/package/rp-pppoe/rp-pppoe.mk
> +++ b/package/rp-pppoe/rp-pppoe.mk
> @@ -18,6 +18,8 @@ RP_PPPOE_CONF_ENV = \
>         PPPD_H=$(PPPD_DIR)/pppd/pppd.h
>
>  define RP_PPPOE_INSTALL_TARGET_CMDS
> +       $(INSTALL) -D -m 0644 $(@D)/configs/pppoe.conf \
> +               $(TARGET_DIR)/etc/ppp/pppoe.conf

Acked-by: Matt Weber <matthew.weber@rockwellcollins.com>

>         for ff in $(RP_PPPOE_TARGET_FILES); do \
>                 $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
>         done
> --
> 2.2.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
@ 2014-12-03 15:05   ` Matthew Weber
  2014-12-03 22:26   ` Thomas Petazzoni
  2014-12-03 22:26   ` Peter Korsgaard
  2 siblings, 0 replies; 11+ messages in thread
From: Matthew Weber @ 2014-12-03 15:05 UTC (permalink / raw)
  To: buildroot

Ryan,

On Tue, Dec 2, 2014 at 5:21 PM, Ryan Coe <bluemrp9@gmail.com> wrote:
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> ---
>  package/rp-pppoe/rp-pppoe.mk | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
> index 70b4437..9c3e3e4 100644
> --- a/package/rp-pppoe/rp-pppoe.mk
> +++ b/package/rp-pppoe/rp-pppoe.mk
> @@ -11,6 +11,8 @@ RP_PPPOE_LICENSE_FILES = doc/LICENSE
>  RP_PPPOE_DEPENDENCIES = pppd
>  RP_PPPOE_SUBDIR = src
>  RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
> +RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \
> +       pppoe-stop
>  RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
>  RP_PPPOE_CONF_OPTS = --disable-debugging
>  RP_PPPOE_CONF_ENV = \
> @@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
>         for ff in $(RP_PPPOE_TARGET_FILES); do \
>                 $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
>         done
> +       for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
> +               $(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
> +       done

Acked-by: Matt Weber <matthew.weber@rockwellcollins.com>

Thanks for submitting this, I was about to work on a similar patch set!

>  endef
>
>  $(eval $(autotools-package))
> --
> 2.2.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
  2014-12-03 15:05   ` Matthew Weber
@ 2014-12-03 22:26   ` Thomas Petazzoni
  2014-12-03 22:32     ` Peter Korsgaard
  2014-12-03 22:26   ` Peter Korsgaard
  2 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2014-12-03 22:26 UTC (permalink / raw)
  To: buildroot

Dear Ryan Coe,

On Tue,  2 Dec 2014 15:21:03 -0800, Ryan Coe wrote:
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> ---
>  package/rp-pppoe/rp-pppoe.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
> index 70b4437..9c3e3e4 100644
> --- a/package/rp-pppoe/rp-pppoe.mk
> +++ b/package/rp-pppoe/rp-pppoe.mk
> @@ -11,6 +11,8 @@ RP_PPPOE_LICENSE_FILES = doc/LICENSE
>  RP_PPPOE_DEPENDENCIES = pppd
>  RP_PPPOE_SUBDIR = src
>  RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
> +RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \
> +	pppoe-stop

Any reason why we need a new variable instead of adding new values to
RP_PPPOE_TARGET_FILES ?

> @@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
>  	for ff in $(RP_PPPOE_TARGET_FILES); do \
>  		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
>  	done
> +	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
> +		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
> +	done

Both variables do the same thing.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

* [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file
  2014-12-02 23:21 [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Ryan Coe
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
  2014-12-03 15:03 ` [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Matthew Weber
@ 2014-12-03 22:26 ` Peter Korsgaard
  2 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-12-03 22:26 UTC (permalink / raw)
  To: buildroot

>>>>> "Ryan" == Ryan Coe <bluemrp9@gmail.com> writes:

 > Signed-off-by: Ryan Coe <bluemrp9@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
  2014-12-03 15:05   ` Matthew Weber
  2014-12-03 22:26   ` Thomas Petazzoni
@ 2014-12-03 22:26   ` Peter Korsgaard
  2 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-12-03 22:26 UTC (permalink / raw)
  To: buildroot

>>>>> "Ryan" == Ryan Coe <bluemrp9@gmail.com> writes:

 > Signed-off-by: Ryan Coe <bluemrp9@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-03 22:26   ` Thomas Petazzoni
@ 2014-12-03 22:32     ` Peter Korsgaard
  2014-12-03 22:38       ` Thomas Petazzoni
  0 siblings, 1 reply; 11+ messages in thread
From: Peter Korsgaard @ 2014-12-03 22:32 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Dear Ryan Coe,
 > On Tue,  2 Dec 2014 15:21:03 -0800, Ryan Coe wrote:
 >> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
 >> ---
 >> package/rp-pppoe/rp-pppoe.mk | 5 +++++
 >> 1 file changed, 5 insertions(+)
 >> 
 >> diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
 >> index 70b4437..9c3e3e4 100644
 >> --- a/package/rp-pppoe/rp-pppoe.mk
 >> +++ b/package/rp-pppoe/rp-pppoe.mk
 >> @@ -11,6 +11,8 @@ RP_PPPOE_LICENSE_FILES = doc/LICENSE
 >> RP_PPPOE_DEPENDENCIES = pppd
 >> RP_PPPOE_SUBDIR = src
 >> RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
 >> +RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \
 >> +	pppoe-stop

 > Any reason why we need a new variable instead of adding new values to
 > RP_PPPOE_TARGET_FILES ?

 >> @@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
 >> for ff in $(RP_PPPOE_TARGET_FILES); do \
 >> $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 >> done
 >> +	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
 >> +		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 >> +	done

 > Both variables do the same thing.

No, they copy from two different subdirs?

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-03 22:32     ` Peter Korsgaard
@ 2014-12-03 22:38       ` Thomas Petazzoni
  2014-12-03 22:39         ` Thomas Petazzoni
  0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2014-12-03 22:38 UTC (permalink / raw)
  To: buildroot

Dear Peter Korsgaard,

On Wed, 03 Dec 2014 23:32:08 +0100, Peter Korsgaard wrote:
>  >> @@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
>  >> for ff in $(RP_PPPOE_TARGET_FILES); do \
>  >> $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
>  >> done
>  >> +	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
>  >> +		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
>  >> +	done
> 
>  > Both variables do the same thing.
> 
> No, they copy from two different subdirs?

Gaah, my bad, I overlooked that. Indeed, both variables are needed
then. So the patch looks OK to me.

Sorry for the noise :/

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-03 22:38       ` Thomas Petazzoni
@ 2014-12-03 22:39         ` Thomas Petazzoni
  2014-12-03 22:45           ` Peter Korsgaard
  0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2014-12-03 22:39 UTC (permalink / raw)
  To: buildroot

Dear Thomas Petazzoni,

On Wed, 3 Dec 2014 23:38:32 +0100, Thomas Petazzoni wrote:
> Dear Peter Korsgaard,
> 
> On Wed, 03 Dec 2014 23:32:08 +0100, Peter Korsgaard wrote:
> >  >> @@ -23,6 +25,9 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
> >  >> for ff in $(RP_PPPOE_TARGET_FILES); do \
> >  >> $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
> >  >> done
> >  >> +	for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \
> >  >> +		$(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
> >  >> +	done
> > 
> >  > Both variables do the same thing.
> > 
> > No, they copy from two different subdirs?
> 
> Gaah, my bad, I overlooked that. Indeed, both variables are needed
> then. So the patch looks OK to me.
> 
> Sorry for the noise :/

On a second thought, we could do:

RP_PPPOE_TARGET_FILES = src/foo src/bar scripts/baz scripts/bleh

and then do:

	for ff in $(RP_PPPOE_TARGET_FILES); do \
		$(INSTALL) -m 0755 $(@D)/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
	done

Not sure it matters much, though.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

* [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts
  2014-12-03 22:39         ` Thomas Petazzoni
@ 2014-12-03 22:45           ` Peter Korsgaard
  0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-12-03 22:45 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 > On a second thought, we could do:

 > RP_PPPOE_TARGET_FILES = src/foo src/bar scripts/baz scripts/bleh

 > and then do:

 > 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 > 		$(INSTALL) -m 0755 $(@D)/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 > 	done

Then you whould need to strip the directory part of $$ff for the
destination to not end up in $(TARGET_DIR)/usr/sbin/src/foo.

 > Not sure it matters much, though.

I think keeping it in two loops is a bit more readable.

-- 
Venlig hilsen,
Peter Korsgaard 

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

end of thread, other threads:[~2014-12-03 22:45 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-02 23:21 [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Ryan Coe
2014-12-02 23:21 ` [Buildroot] [PATCH 2/2] rp-pppoe: install helper scripts Ryan Coe
2014-12-03 15:05   ` Matthew Weber
2014-12-03 22:26   ` Thomas Petazzoni
2014-12-03 22:32     ` Peter Korsgaard
2014-12-03 22:38       ` Thomas Petazzoni
2014-12-03 22:39         ` Thomas Petazzoni
2014-12-03 22:45           ` Peter Korsgaard
2014-12-03 22:26   ` Peter Korsgaard
2014-12-03 15:03 ` [Buildroot] [PATCH 1/2] rp-pppoe: install default conf file Matthew Weber
2014-12-03 22:26 ` Peter Korsgaard

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