diff options
Diffstat (limited to 'meta-networking/recipes-support')
| -rw-r--r-- | meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch | 18 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ntopng/ndpi_4.2.bb (renamed from meta-networking/recipes-support/ntopng/ndpi_4.0.bb) | 6 |
2 files changed, 11 insertions, 13 deletions
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch index 1cbf059efd..d5c7f5f1cc 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch @@ -12,26 +12,24 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> refresh patch to 4.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - autogen.sh | 9 --------- - 1 file changed, 9 deletions(-) + autogen.sh | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/autogen.sh b/autogen.sh -index cf5d7057..cb73cf9d 100755 +index 0aa7507..36e0423 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -52,12 +52,3 @@ cat configure.seed | sed \ - -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ - -e "s/@FUZZY@/$FUZZY/g" \ - > configure.ac +@@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then + echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" + exit + fi - -autoreconf -ivf --cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp --cat configure.tmp > configure - -echo "./configure $@" -chmod +x configure -./configure $@ - -- -2.17.1 +2.25.1 diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.0.bb b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb index 960c4c2012..352d2d2426 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_4.0.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb @@ -8,10 +8,10 @@ RDEPENDS:${PN} += " libpcap" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" -SRCREV = "dabab0e9515c2e6a71a91bdc807453e416f831ca" -SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable;protocol=https \ +SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ file://0001-autogen.sh-not-generate-configure.patch \ -" + " S = "${WORKDIR}/git" |