[ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/net-snmp.make |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 24efa72..4151d2b 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -240,14 +240,15 @@ NET_SNMP_RFCMIBS := IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
 			SNMP-USM-DH-OBJECTS-MIB.txt
 
 NET_SNMP_NETSNMPMIBS := NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
-			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
+			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt \
+			NET-SNMP-PASS-MIB.txt
 
 NET_SNMP_UCDMIBS := UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
 			UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
 
 ## FIXME:  for now, you need to manually edit this list to represent what mibs to install on target.
 NET_SNMP_MIBS := $(NET_SNMP_V1MIBS) $(NET_SNMP_V2MIBS) $(NET_SNMP_V3MIBS) \
-	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNNP_UCDMIBS)
+	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNMP_UCDMIBS)
 
 $(STATEDIR)/net-snmp.targetinstall:
 	@$(call targetinfo)
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] net-snmp: version bump to 5.7.x LTS branch

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 .../0001-net-snmp-config-add-SYSROOT-support.patch |   50 -------------------
 patches/net-snmp-5.6.1/series                      |    1 -
 .../0001-net-snmp-config-add-SYSROOT-support.patch |   52 ++++++++++++++++++++
 patches/net-snmp-5.7.2/series                      |    4 ++
 rules/net-snmp.in                                  |    2 -
 rules/net-snmp.make                                |    4 +-
 6 files changed, 58 insertions(+), 55 deletions(-)
 delete mode 100644 patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
 delete mode 100644 patches/net-snmp-5.6.1/series
 create mode 100644 patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
 create mode 100644 patches/net-snmp-5.7.2/series

diff --git a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
deleted file mode 100644
index 4ddf848..0000000
--- a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2ffcbd9a46108c837b8f5c577a71de4160007678 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 00:33:45 +0100
-Subject: [PATCH] net-snmp-config; add SYSROOT support
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
-Adapted to 5.6.1
-
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-
----
- net-snmp-config.in |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: net-snmp-config.in
-===================================================================
---- net-snmp-config.in.orig
-+++ net-snmp-config.in
-@@ -49,7 +49,7 @@ datarootdir=@datarootdir@
- NSC_LDFLAGS="@LDFLAGS@"
- NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
- NSC_INCLUDEDIR=${includedir}
--NSC_LIBDIR=-L${libdir}
-+NSC_LIBDIR=-L${SYSROOT}${libdir}
- NSC_LIBS="@LIBS@"
- NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
- NSC_PREFIX=$prefix
-@@ -127,10 +127,10 @@ else
-       ;;
-     #################################################### compile
-     --base-cflags)
--      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
-+      echo @CFLAGS@ @CPPFLAGS@ -I${SYSROOT}${NSC_INCLUDEDIR}
-       ;;
-     --cflags|--cf*)
--      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
-+      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR}
-       ;;
-     --srcdir)
-       echo $NSC_SRCDIR
-@@ -588,7 +588,7 @@ EOF
-         echo "Ack.  Can't create $tmpfile."
- 	exit 1
-       fi
--      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
-+      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
-       echo "running: $cmd"
-       `$cmd`
-       if test "x$norm" != "x1" ; then
diff --git a/patches/net-snmp-5.6.1/series b/patches/net-snmp-5.6.1/series
deleted file mode 100644
index 89093b4..0000000
--- a/patches/net-snmp-5.6.1/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-net-snmp-config-add-SYSROOT-support.patch -p0
diff --git a/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
new file mode 100644
index 0000000..9c46268
--- /dev/null
+++ b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
@@ -0,0 +1,52 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 10 Jan 2010 00:33:45 +0100
+Subject: [PATCH] net-snmp-config; add SYSROOT support
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+Adapted to 5.6.1
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+
+Adapted to 5.7.2
+
+Signed-off-by: Alexander Dahl <post@lespocky.de>
+---
+ net-snmp-config.in |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net-snmp-config.in b/net-snmp-config.in
+index 2300fe1..361c658 100644
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -54,7 +54,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
+ NSC_LMIBLIBS="@LMIBLIBS@"
+ 
+ NSC_INCLUDEDIR=${includedir}
+-NSC_LIBDIR=-L${libdir}
++NSC_LIBDIR=-L${SYSROOT}${libdir}
+ 
+ NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}"
+ NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}"
+@@ -138,10 +138,10 @@ else
+       ;;
+     #################################################### compile
+     --base-cflags)
+-      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
++      echo @CFLAGS@ @CPPFLAGS@ -I${SYSROOT}${NSC_INCLUDEDIR}
+       ;;
+     --cflags|--cf*)
+-      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
++      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR}
+       ;;
+     --srcdir)
+       echo $NSC_SRCDIR
+@@ -598,7 +598,7 @@ EOF
+         echo "Ack.  Can't create $tmpfile."
+ 	exit 1
+       fi
+-      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
++      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${SYSROOT}${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
+       echo "running: $cmd"
+       `$cmd`
+       if test "x$norm" != "x1" ; then
diff --git a/patches/net-snmp-5.7.2/series b/patches/net-snmp-5.7.2/series
new file mode 100644
index 0000000..bc12d06
--- /dev/null
+++ b/patches/net-snmp-5.7.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-net-snmp-config-add-SYSROOT-support.patch
+# c0c32590b398be9cff8f7a3d62d3efe4  - git-ptx-patches magic
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 6205a19..10dbab0 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -6,8 +6,6 @@ menuconfig NET_SNMP
 	select GCCLIBS_GCC_S	if NET_SNMP_AGENT
 	select LIBC_DL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
 	select LIBNL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
-	select NET_SNMP_MD5
-#	^ build fix for 5.6.1 (see http://sourceforge.net/tracker/index.php?func=detail&aid=3184697&group_id=12694&atid=112694)
 
 if NET_SNMP
 
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 4151d2b..dfc0ff6 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
 #
 # Paths and names
 #
-NET_SNMP_VERSION	:= 5.6.1
-NET_SNMP_MD5		:= b4e30ead5783b0bb1d280172c6095ea4
+NET_SNMP_VERSION	:= 5.7.2
+NET_SNMP_MD5		:= 5bddd02e2f82b62daa79f82717737a14
 NET_SNMP		:= net-snmp-$(NET_SNMP_VERSION)
 NET_SNMP_SUFFIX		:= tar.gz
 NET_SNMP_URL		:= $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX))
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/3] net-snmp: version bump to 5.7.x LTS branch

[Uwe Kleine-König]

On Thu, Sep 05, 2013 at 04:06:45PM +0200, Alexander Dahl wrote:
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  .../0001-net-snmp-config-add-SYSROOT-support.patch |   50 -------------------
>  patches/net-snmp-5.6.1/series                      |    1 -
>  .../0001-net-snmp-config-add-SYSROOT-support.patch |   52 ++++++++++++++++++++
>  patches/net-snmp-5.7.2/series                      |    4 ++
>  rules/net-snmp.in                                  |    2 -
>  rules/net-snmp.make                                |    4 +-
I guess adding -M to format-patch would be nice here.

Did you see my net-snmp patches on the list?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/3] net-snmp: version bump to 5.7.x LTS branch

[Alexander Dahl]

[-- Attachment #1.1: Type: text/plain, Size: 737 bytes --]

Hei hei, 

On Thu, Sep 05, 2013 at 09:09:01PM +0200, Uwe Kleine-König wrote:
> I guess adding -M to format-patch would be nice here.

You're right. I assumed this to be default, would at least make sense
for me. So I should do this one again, huh? ;-)

> Did you see my net-snmp patches on the list?

Yes, but they're not pushed yet and I didn't pulled them into my tree.
But as far as what I saw, there won't be much conflicts.

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] net-snmp: version bump to 5.7.x LTS branch

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 patches/net-snmp-5.6.1/series                      |    1 -
 .../0001-net-snmp-config-add-SYSROOT-support.patch |   28 +++++++++++---------
 patches/net-snmp-5.7.2/series                      |    4 +++
 rules/net-snmp.in                                  |    2 --
 rules/net-snmp.make                                |    4 +--
 5 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 patches/net-snmp-5.6.1/series
 rename patches/{net-snmp-5.6.1 => net-snmp-5.7.2}/0001-net-snmp-config-add-SYSROOT-support.patch (74%)
 create mode 100644 patches/net-snmp-5.7.2/series

diff --git a/patches/net-snmp-5.6.1/series b/patches/net-snmp-5.6.1/series
deleted file mode 100644
index 89093b4..0000000
--- a/patches/net-snmp-5.6.1/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-net-snmp-config-add-SYSROOT-support.patch -p0
diff --git a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
similarity index 74%
rename from patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
rename to patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
index 4ddf848..9c46268 100644
--- a/patches/net-snmp-5.6.1/0001-net-snmp-config-add-SYSROOT-support.patch
+++ b/patches/net-snmp-5.7.2/0001-net-snmp-config-add-SYSROOT-support.patch
@@ -1,4 +1,3 @@
-From 2ffcbd9a46108c837b8f5c577a71de4160007678 Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
 Date: Sun, 10 Jan 2010 00:33:45 +0100
 Subject: [PATCH] net-snmp-config; add SYSROOT support
@@ -9,24 +8,27 @@ Adapted to 5.6.1
 
 Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
 
+Adapted to 5.7.2
+
+Signed-off-by: Alexander Dahl <post@lespocky.de>
 ---
  net-snmp-config.in |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: net-snmp-config.in
-===================================================================
---- net-snmp-config.in.orig
-+++ net-snmp-config.in
-@@ -49,7 +49,7 @@ datarootdir=@datarootdir@
- NSC_LDFLAGS="@LDFLAGS@"
- NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
+diff --git a/net-snmp-config.in b/net-snmp-config.in
+index 2300fe1..361c658 100644
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -54,7 +54,7 @@ NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
+ NSC_LMIBLIBS="@LMIBLIBS@"
+ 
  NSC_INCLUDEDIR=${includedir}
 -NSC_LIBDIR=-L${libdir}
 +NSC_LIBDIR=-L${SYSROOT}${libdir}
- NSC_LIBS="@LIBS@"
- NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
- NSC_PREFIX=$prefix
-@@ -127,10 +127,10 @@ else
+ 
+ NSC_SNMPLIBS="-lnetsnmp ${NSC_LNETSNMPLIBS}"
+ NSC_SUBAGENTLIBS="-lnetsnmpagent ${NSC_LAGENTLIBS} ${NSC_SNMPLIBS}"
+@@ -138,10 +138,10 @@ else
        ;;
      #################################################### compile
      --base-cflags)
@@ -39,7 +41,7 @@ Index: net-snmp-config.in
        ;;
      --srcdir)
        echo $NSC_SRCDIR
-@@ -588,7 +588,7 @@ EOF
+@@ -598,7 +598,7 @@ EOF
          echo "Ack.  Can't create $tmpfile."
  	exit 1
        fi
diff --git a/patches/net-snmp-5.7.2/series b/patches/net-snmp-5.7.2/series
new file mode 100644
index 0000000..bc12d06
--- /dev/null
+++ b/patches/net-snmp-5.7.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-net-snmp-config-add-SYSROOT-support.patch
+# c0c32590b398be9cff8f7a3d62d3efe4  - git-ptx-patches magic
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 6205a19..10dbab0 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -6,8 +6,6 @@ menuconfig NET_SNMP
 	select GCCLIBS_GCC_S	if NET_SNMP_AGENT
 	select LIBC_DL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
 	select LIBNL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
-	select NET_SNMP_MD5
-#	^ build fix for 5.6.1 (see http://sourceforge.net/tracker/index.php?func=detail&aid=3184697&group_id=12694&atid=112694)
 
 if NET_SNMP
 
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 4151d2b..dfc0ff6 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NET_SNMP) += net-snmp
 #
 # Paths and names
 #
-NET_SNMP_VERSION	:= 5.6.1
-NET_SNMP_MD5		:= b4e30ead5783b0bb1d280172c6095ea4
+NET_SNMP_VERSION	:= 5.7.2
+NET_SNMP_MD5		:= 5bddd02e2f82b62daa79f82717737a14
 NET_SNMP		:= net-snmp-$(NET_SNMP_VERSION)
 NET_SNMP_SUFFIX		:= tar.gz
 NET_SNMP_URL		:= $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX))
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] net-snmp: fix vim mode lines

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/net-snmp.in   |    2 ++
 rules/net-snmp.make |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 10dbab0..649fb98 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -117,3 +117,5 @@ config NET_SNMP_MIB_INSTALL_DIR
 	default	"/usr/share/snmp/mibs"
 
 endif
+
+# vim: ft=kconfig noet tw=72
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index dfc0ff6..e1c3705 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -321,4 +321,4 @@ endif
 	@$(call install_finish, net-snmp)
 	@$(call touch)
 
-# vim: syntax=make
+# vim: ft=make noet
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Michael Olbrich]

On Thu, Sep 05, 2013 at 04:06:44PM +0200, Alexander Dahl wrote:
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  rules/net-snmp.make |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/net-snmp.make b/rules/net-snmp.make
> index 24efa72..4151d2b 100644
> --- a/rules/net-snmp.make
> +++ b/rules/net-snmp.make
> @@ -240,14 +240,15 @@ NET_SNMP_RFCMIBS := IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
>  			SNMP-USM-DH-OBJECTS-MIB.txt
>  
>  NET_SNMP_NETSNMPMIBS := NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
> -			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
> +			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt \
> +			NET-SNMP-PASS-MIB.txt
>  
>  NET_SNMP_UCDMIBS := UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
>  			UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
>  
>  ## FIXME:  for now, you need to manually edit this list to represent what mibs to install on target.
>  NET_SNMP_MIBS := $(NET_SNMP_V1MIBS) $(NET_SNMP_V2MIBS) $(NET_SNMP_V3MIBS) \
> -	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNNP_UCDMIBS)
> +	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNMP_UCDMIBS)

When I checked the list after applying all patches, there where 4 files not
installed. Maybe that is caused by the next patch (the new version)? As I
don't know anything about this stuff, can you please check and add them as
appropriate?

Michael

>  $(STATEDIR)/net-snmp.targetinstall:
>  	@$(call targetinfo)
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Alexander Dahl]

Hei hei, 

Am 2013-09-09 12:03, schrieb Michael Olbrich:
> On Thu, Sep 05, 2013 at 04:06:44PM +0200, Alexander Dahl wrote:
>>
>> Signed-off-by: Alexander Dahl <post@lespocky.de>
>> ---
>>  rules/net-snmp.make |    5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/rules/net-snmp.make b/rules/net-snmp.make
>> index 24efa72..4151d2b 100644
>> --- a/rules/net-snmp.make
>> +++ b/rules/net-snmp.make
>> @@ -240,14 +240,15 @@ NET_SNMP_RFCMIBS := IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
>>  			SNMP-USM-DH-OBJECTS-MIB.txt
>>
>>  NET_SNMP_NETSNMPMIBS := NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
>> -			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
>> +			NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt \
>> +			NET-SNMP-PASS-MIB.txt

This is just one more file net-snmp complains is missing when starting
on target.

>>  NET_SNMP_MIBS := $(NET_SNMP_V1MIBS) $(NET_SNMP_V2MIBS) $(NET_SNMP_V3MIBS) \
>> -	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNNP_UCDMIBS)
>> +	$(NET_SNMP_AGENTMIBS) $(NET_SNMP_IANAMIBS) $(NET_SNMP_RFCMIBS) $(NET_SNMP_NETSNMPMIBS) $(NET_SNMP_UCDMIBS)

This is "NET_SNNP_UCDMIBS" replaced by "NET_SNMP_UCDMIBS" (the typo).
After fixing this typo the MIB files defined in $(NET_SNMP_UCDMIBS) some
lines above in the net-snmp.make are actually installed to the target.
This was not the case before and net-snmp complained on start.

> When I checked the list after applying all patches, there where 4 files not
> installed. Maybe that is caused by the next patch (the new version)? As I
> don't know anything about this stuff, can you please check and add them as
> appropriate?

Sorry, I read this twice today and after reading it a third time I have
still no clue what you mean in this paragraph. :-/

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Michael Olbrich]

On Mon, Sep 09, 2013 at 05:31:31PM +0200, Alexander Dahl wrote:
> > When I checked the list after applying all patches, there where 4 files not
> > installed. Maybe that is caused by the next patch (the new version)? As I
> > don't know anything about this stuff, can you please check and add them as
> > appropriate?
> 
> Sorry, I read this twice today and after reading it a third time I have
> still no clue what you mean in this paragraph. :-/

In <platform>/packages/net-snmp-5.7.2/usr/share/snmp/mibs/ there are 4
files that are not listed in $(NET_SNMP_MIBS).
I don't know if this is intentional because I don't know that this stuff is
for.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Alexander Dahl]

Hei hei,

Am 2013-09-09 17:49, schrieb Michael Olbrich:
> In <platform>/packages/net-snmp-5.7.2/usr/share/snmp/mibs/ there are 4
> files that are not listed in $(NET_SNMP_MIBS).
> I don't know if this is intentional because I don't know that this stuff is
> for.

I had a look in this and first tried to find out which MIB files:

  ls -1 <platform>/packages/net-snmp-5.7.2/usr/share/snmp/mibs/ | sort >
net-snmp-mibs_ls.txt
  ptxdist print NET_SNMP_MIBS | tr ' ' '\n' | sort >
net-snmp-mibs_make.txt

A diff on the two files shows there are indeed four files and those are
BRIDGE-MIB.txt, IPV6-FLOW-LABEL-MIB.txt, SCTP-MIB.txt, and
TUNNEL-MIB.txt. Those files exist in
<platform>/sysroot-target/usr/share/snmp/mibs because of the install
stage. After a `ptxdist clean net-snmp` and following `ptxdist go` they
are not in <platform>/root/usr/share/snmp/mibs but in
<platform>/packages/net-snmp-5.7.2 but this folder was gone after
cleaning the package. Those files are not in targetinstall part, and
actually I have no clue how they get into the package. :-/

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Michael Olbrich]

Hi,

On Tue, Sep 10, 2013 at 10:56:20AM +0200, Alexander Dahl wrote:
> Am 2013-09-09 17:49, schrieb Michael Olbrich:
> > In <platform>/packages/net-snmp-5.7.2/usr/share/snmp/mibs/ there are 4
> > files that are not listed in $(NET_SNMP_MIBS).
> > I don't know if this is intentional because I don't know that this stuff is
> > for.
> 
> I had a look in this and first tried to find out which MIB files:
> 
>   ls -1 <platform>/packages/net-snmp-5.7.2/usr/share/snmp/mibs/ | sort >
> net-snmp-mibs_ls.txt
>   ptxdist print NET_SNMP_MIBS | tr ' ' '\n' | sort >
> net-snmp-mibs_make.txt
> 
> A diff on the two files shows there are indeed four files and those are
> BRIDGE-MIB.txt, IPV6-FLOW-LABEL-MIB.txt, SCTP-MIB.txt, and
> TUNNEL-MIB.txt. Those files exist in
> <platform>/sysroot-target/usr/share/snmp/mibs because of the install
> stage. After a `ptxdist clean net-snmp` and following `ptxdist go` they
> are not in <platform>/root/usr/share/snmp/mibs but in
> <platform>/packages/net-snmp-5.7.2 but this folder was gone after
> cleaning the package. Those files are not in targetinstall part, and
> actually I have no clue how they get into the package. :-/

You misunderstood. The files are installed with "make install" during the
install stage but _not_ installed in the targetinstall stage. I'm wondering
if the should be installed in the targetinstall stage.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] net-snmp: fix installed MIB files (one typo, one missing)

[Alexander Dahl]

Hei hei, 

Am 2013-09-16 10:25, schrieb Michael Olbrich:
> You misunderstood. The files are installed with "make install" during the
> install stage but _not_ installed in the targetinstall stage. I'm wondering
> if the should be installed in the targetinstall stage.

If it's the files I listed, I would not (target)install them until
needed. I guess that was the whole point of splitting it up in
net-snmp.make but I just used, what was there.

On the other hand we could simplify this and install all MIB files if
NET_SNMP_MIBS is selected. This would sum up to 2.0 MB or 374kB tar.gz.

Or we (I could do this) make it configurable which MIB files should be
installed like the FIXME and TODO parts in net-snmp.make suggest.

Three options, I would be fine with each one.

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de