net-snmp: backport updates from master

This commit is contained in:
Celedhrim 2017-11-16 14:03:45 +01:00 committed by Christian Hewitt
parent 2dab8326c4
commit 4ca25d29a7
4 changed files with 50 additions and 11 deletions

View File

@ -1,3 +1,14 @@
104
- Change daemon startup option
103
- update config.sub to support new hardware
- disable mini-agent in config options to get system MIB
- compile static binary to avoid cross compiling linking issue
102
-version bump
101
- make addon configurable

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -18,7 +18,7 @@
PKG_NAME="net-snmp"
PKG_VERSION="5.7.3"
PKG_REV="101"
PKG_REV="104"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://www.net-snmp.org"
@ -40,9 +40,8 @@ PKG_CONFIGURE_OPTS_TARGET="--with-defaults \
--disable-deprecated \
--disable-snmptrapd-subagent \
--disable-scripts \
--enable-static=no \
--enable-shared=yes \
--enable-mini-agent \
--enable-static=yes \
--enable-shared=no \
--with-nl \
--with-logfile=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID} \
--with-persistent-directory=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID} \
@ -67,9 +66,4 @@ makeinstall_target() {
addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -r $PKG_BUILD/.$TARGET_NAME/storage/.kodi/addons/${PKG_ADDON_ID}/bin $PKG_BUILD/.$TARGET_NAME/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share $ADDON_BUILD/$PKG_ADDON_ID/
#Do not copy symlinks
find $PKG_BUILD/.$TARGET_NAME/storage/.kodi/addons/${PKG_ADDON_ID}/lib/ -type f -name '*.so.*' -exec cp '{}' $ADDON_BUILD/$PKG_ADDON_ID/lib/ \;
#remove all but major version from so file
for f in $ADDON_BUILD/$PKG_ADDON_ID/lib/*.so.* ; do mv "$f" "${f%.*.*}" ; done
}

View File

@ -0,0 +1,34 @@
diff -ur net-snmp-5.7.3/config.sub net-snmp-5.7.3.new/config.sub
--- net-snmp-5.7.3/config.sub 2014-12-08 21:23:22.000000000 +0100
+++ net-snmp-5.7.3.new/config.sub 2017-11-09 18:39:31.638689732 +0100
@@ -247,10 +247,11 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -339,6 +340,7 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
@@ -1171,6 +1173,9 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32

View File

@ -24,4 +24,4 @@ ADDON_ID=service.net-snmp
ADDON_DIR="$HOME/.kodi/addons/$ADDON_ID"
ADDON_HOME="$HOME/.kodi/userdata/addon_data/$ADDON_ID"
$ADDON_DIR/bin/snmpd -f -LS0-6d -c $ADDON_HOME/share/snmp/snmpd.conf -M $ADDON_DIR/share/snmp/mibs -p /var/run/snmpd.pid
$ADDON_DIR/bin/snmpd -f -LS0-6d -C -c $ADDON_HOME/share/snmp/snmpd.conf -M $ADDON_DIR/share/snmp/mibs -p /var/run/snmpd.pid