[ptxdist] [PATCH v2] networkmanager: version bump 1.6.0 -> 1.6.2
Also install libnm-ppp-plugin as ppp support was modularized in 1.6.0 and fix config options, so $(PPP_SHARED_INST_PATH) gets expanded. Signed-off-by: Ladislav Michl --- Changes: v2 - as := was used for assignment, $(PPP_SHARED_INST_PATH) evalueated empty and networkmanager configure scripts used default path /usr/lib/pppd/2.4.5 rules/networkmanager.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 90654d8d2..1b522f3b7 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.6.0 -NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0 +NETWORKMANAGER_VERSION := 1.6.2 +NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) @@ -33,7 +33,7 @@ NETWORKMANAGER_DIR:= $(BUILDDIR)/$(NETWORKMANAGER) # autoconf # NETWORKMANAGER_CONF_TOOL := autoconf -NETWORKMANAGER_CONF_OPT := \ +NETWORKMANAGER_CONF_OPT = \ $(CROSS_AUTOCONF_USR) \ --disable-static \ --enable-shared \ @@ -210,6 +210,7 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-wwan) endif ifdef PTXCONF_NETWORKMANAGER_PPP + @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-ppp-plugin) @$(call install_copy, networkmanager, 0, 0, 0644, -, $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so) endif @$(call install_lib, networkmanager, 0, 0, 0644, libnm) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ppp: version bump 2.4.5 -> 2.4.7
Signed-off-by: Ladislav Michl
---
Note: patches were not refreshed and renumbered as it
would make review more difficult. I'm ready to send
v2, eventually.
patches/ppp-2.4.5/0001-git-20100307.patch | 134 -
patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch | 21 ---
patches/ppp-2.4.5/0004-use_system_logwtmp.patch| 28
patches/ppp-2.4.5/0005-update_if_pppol2tp.patch| 61
.../ppp-2.4.5/0006-dont-exit-pado-timeout.patch| 50 ---
patches/ppp-2.4.5/0007-fix_warnings.patch | 38 -
patches/ppp-2.4.5/0008-man_syntax_errors.patch | 63
patches/ppp-2.4.5/0013-documentation_typos.patch | 95
patches/ppp-2.4.5/0015-fix_null_pppdb.patch| 35 -
patches/ppp-2.4.5/0024-radius_enanchements.patch | 166 -
patches/ppp-2.4.5/0030-no_crypt_hack.patch | 62
...Remove-old-version-of-Linux-if_pppol2tp.h.patch | 104 -
.../0003-adaptive_echos.patch | 0
.../0009-makefiles_cleanup.patch | 0
.../0010-always_setsid.patch | 0
.../0011-close_dev_ppp.patch | 0
.../{ppp-2.4.5 => ppp-2.4.7}/0012-chat_man.patch | 0
.../0014-fix_linkpidfile.patch | 0
.../0016-pppdump_use_zlib.patch| 0
.../0017-pppoatm_resolver_light.patch | 0
.../0018-pppoatm_cleanup.patch | 0
.../0019-pppoe_noads.patch | 0
.../0020-readable_connerrs.patch | 0
.../0021-011_scripts_redialer.diff.patch | 0
.../0022-cifdefroute.dif.patch | 0
.../0023-ppp-2.3.11-oedod.dif.patch| 0
.../{ppp-2.4.5 => ppp-2.4.7}/0025-radius_mtu.patch | 0
.../0026-018_ip-up_option.diff.patch | 0
.../0027-ppp-2.4.2-stripMSdomain.patch | 0
.../0028-setenv_call_file.patch| 0
.../0029-010_scripts_README.diff.patch | 0
.../0031-resolv.conf_no_log.patch | 0
.../{ppp-2.4.5 => ppp-2.4.7}/0032-zzz_config.patch | 5 +-
.../0033-pppd-make-makefile-sysroot-aware.patch| 0
...-make-the-self-made-configure-cross-aware.patch | 0
.../0035-use-CPPFLAGS-when-compiling.patch | 0
patches/{ppp-2.4.5 => ppp-2.4.7}/series| 11 --
rules/ppp.make | 4 +-
38 files changed, 4 insertions(+), 873 deletions(-)
diff --git a/patches/ppp-2.4.5/0001-git-20100307.patch
b/patches/ppp-2.4.5/0001-git-20100307.patch
deleted file mode 100644
index d0d0e5b4a..0
--- a/patches/ppp-2.4.5/0001-git-20100307.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Marco d'Itri
-Date: Wed, 25 Jan 2012 19:14:26 +0100
-Subject: [PATCH] git-20100307
-
- pppd/lcp.c | 28 +++-
- pppd/plugins/pppol2tp/Makefile.linux |2 +-
- pppd/plugins/rp-pppoe/plugin.c |4 ++--
- pppd/pppd.8 |8
- 4 files changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/lcp.c b/pppd/lcp.c
-index 5c77490..8ed2778 100644
a/pppd/lcp.c
-+++ b/pppd/lcp.c
-@@ -397,21 +397,29 @@ lcp_close(unit, reason)
- char *reason;
- {
- fsm *f = &lcp_fsm[unit];
-+int oldstate;
-
- if (phase != PHASE_DEAD && phase != PHASE_MASTER)
- new_phase(PHASE_TERMINATE);
--if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
-+
-+if (f->flags & DELAYED_UP) {
-+ untimeout(lcp_delayed_up, f);
-+ f->state = STOPPED;
-+}
-+oldstate = f->state;
-+
-+fsm_close(f, reason);
-+if (oldstate == STOPPED && f->flags &
(OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
- /*
-* This action is not strictly according to the FSM in RFC1548,
-* but it does mean that the program terminates if you do a
-- * lcp_close() in passive/silent mode when a connection hasn't
-- * been established.
-+ * lcp_close() when a connection hasn't been established
-+ * because we are in passive/silent mode or because we have
-+ * delayed the fsm_lowerup() call and it hasn't happened yet.
-*/
-- f->state = CLOSED;
-+ f->flags &= ~DELAYED_UP;
- lcp_finished(f);
--
--} else
-- fsm_close(f, reason);
-+}
- }
-
-
-@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
- {
- fsm *f = &lcp_fsm[unit];
-
--if (f->flags & DELAYED_UP)
-+if (f->flags & DELAYED_UP) {
- f->flags &= ~DELAYED_UP;
--else
-+ untimeout(lcp_delayed_up, f);
-+} else
- fsm_lowerdown(&lcp_fsm[unit]);
- }
-
-@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
-
- if (f->flags & DELAYED_UP) {
- f->flags &= ~DELAYED_UP;
-+ untimeout(lcp_delayed_up, f);
- fsm_lowerup(f);
- }
- fsm_input(f, p, len);
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux
b/pppd/plugins
[ptxdist] [PATCH] networkmanager: version bump 1.6.0 -> 1.6.2
Also install libnm-ppp-plugin as ppp support was modularized in 1.6.0. Signed-off-by: Ladislav Michl --- rules/networkmanager.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 90654d8d2..7508f3a02 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.6.0 -NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0 +NETWORKMANAGER_VERSION := 1.6.2 +NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) @@ -210,6 +210,7 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-wwan) endif ifdef PTXCONF_NETWORKMANAGER_PPP + @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-ppp-plugin) @$(call install_copy, networkmanager, 0, 0, 0644, -, $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so) endif @$(call install_lib, networkmanager, 0, 0, 0644, libnm) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] v4l-utils: add instalation options for all available utilities
Also sort alphabetically. Signed-off-by: Ladislav Michl --- 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
[ptxdist] [PATCH] Install tar from CONFIG_TAR to /bin/ instead /usr/bin/
Debian and Ubuntu install tar in /bin. This is the same in ptxdist when BUSYBOX_TAR is selected. If CONFIG_TAR is selected ptxdist installs tar to /usr/bin. Signed-off-by: Gavin Schenk --- rules/tar.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/tar.make b/rules/tar.make index 1b25c621a..35ccd2e28 100644 --- a/rules/tar.make +++ b/rules/tar.make @@ -52,7 +52,7 @@ $(STATEDIR)/tar.targetinstall: @$(call install_fixup, tar,AUTHOR,"Michael Olbrich ") @$(call install_fixup, tar,DESCRIPTION,missing) - @$(call install_copy, tar, 0, 0, 0755, -, /usr/bin/tar) + @$(call install_copy, tar, 0, 0, 0755, -, /bin/tar) @$(call install_finish, tar) -- 2.11.0 Eckelmann AG Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann Vorsitzender des Aufsichtsrats: Hubertus G. Krossa Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636 http://www.eckelmann.de ___ ptxdist mailing list ptxdist@pengutronix.de
