mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] PPP: some fixes
@ 2014-02-04  9:58 Juergen Beisert
  2014-02-04  9:58 ` [ptxdist] [PATCH 1/2] PPP: fix config variable to do the right thing Juergen Beisert
  2014-02-04  9:58 ` [ptxdist] [PATCH 2/2] PPP: another package which needs the Linux kernel version Juergen Beisert
  0 siblings, 2 replies; 3+ messages in thread
From: Juergen Beisert @ 2014-02-04  9:58 UTC (permalink / raw)
  To: ptxdist

This series addresses two issues. One reported by Bart and the second is the
usage of the kernel version and arch.

Juergen


-- 
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 1/2] PPP: fix config variable to do the right thing
  2014-02-04  9:58 [ptxdist] [PATCH] PPP: some fixes Juergen Beisert
@ 2014-02-04  9:58 ` Juergen Beisert
  2014-02-04  9:58 ` [ptxdist] [PATCH 2/2] PPP: another package which needs the Linux kernel version Juergen Beisert
  1 sibling, 0 replies; 3+ messages in thread
From: Juergen Beisert @ 2014-02-04  9:58 UTC (permalink / raw)
  To: ptxdist

Using the correct config var name will really install ppp with suid permissions

Reported-by: Bart Vanhaute <bart.vanhaute@trimbletl.com>
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 rules/ppp.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/ppp.make b/rules/ppp.make
index d4d0171..f9c5917 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -147,7 +147,7 @@ $(STATEDIR)/ppp.targetinstall:
 	@$(call install_fixup, ppp,AUTHOR,"Robert Schwebel (r.schwebel@pengutronix.de)")
 	@$(call install_fixup, ppp,DESCRIPTION,missing)
 
-ifdef PTXCONFIG_PPP_SUID
+ifdef PTXCONF_PPP_SUID
 	@$(call install_copy, ppp, 0, 0, 4755, -, /usr/sbin/pppd)
 else
 	@$(call install_copy, ppp, 0, 0, 0755, -, /usr/sbin/pppd)
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 2/2] PPP: another package which needs the Linux kernel version
  2014-02-04  9:58 [ptxdist] [PATCH] PPP: some fixes Juergen Beisert
  2014-02-04  9:58 ` [ptxdist] [PATCH 1/2] PPP: fix config variable to do the right thing Juergen Beisert
@ 2014-02-04  9:58 ` Juergen Beisert
  1 sibling, 0 replies; 3+ messages in thread
From: Juergen Beisert @ 2014-02-04  9:58 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 rules/ppp.make | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/rules/ppp.make b/rules/ppp.make
index f9c5917..304589c 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -31,10 +31,22 @@ PPP_LICENSE	:= BSD,GPLv2
 # Prepare
 # ----------------------------------------------------------------------------
 
+PPP_KERNEL_VERSION := $(if $(KERNEL_HEADER_VERSION),$(KERNEL_HEADER_VERSION),$(KERNEL_VERSION))
+
+ifdef PTXCONF_PPP
+ifeq ($(PPP_KERNEL_VERSION),)
+ $(warning ######################### ERROR ###########################)
+ $(warning # Linux kernel version required in order to make ppp work #)
+ $(warning #   Define a platform kernel or the kernel headers        #)
+ $(warning ###########################################################)
+ $(error )
+endif
+endif
+
 PPP_CONF_ENV	:= \
 	TARGET_OS=Linux \
-	TARGET_OS_VER=$(KERNEL_HEADER_VERSION) \
-	TARGET_OS_ARCH=$(KERNEL_HEADER_ARCH) \
+	TARGET_OS_VER=$(PPP_KERNEL_VERSION) \
+	TARGET_OS_ARCH=$(GENERIC_KERNEL_ARCH)
 
 PPP_MAKE_ENV	:= $(CROSS_ENV)
 PPP_MAKE_PAR	:= NO
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

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

end of thread, other threads:[~2014-02-04  9:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-04  9:58 [ptxdist] [PATCH] PPP: some fixes Juergen Beisert
2014-02-04  9:58 ` [ptxdist] [PATCH 1/2] PPP: fix config variable to do the right thing Juergen Beisert
2014-02-04  9:58 ` [ptxdist] [PATCH 2/2] PPP: another package which needs the Linux kernel version Juergen Beisert

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