diff options
-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 1cbf059ef..d5c7f5f1c 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> | |||
12 | refresh patch to 4.0 | 12 | refresh patch to 4.0 |
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
14 | --- | 14 | --- |
15 | autogen.sh | 9 --------- | 15 | autogen.sh | 7 ------- |
16 | 1 file changed, 9 deletions(-) | 16 | 1 file changed, 7 deletions(-) |
17 | 17 | ||
18 | diff --git a/autogen.sh b/autogen.sh | 18 | diff --git a/autogen.sh b/autogen.sh |
19 | index cf5d7057..cb73cf9d 100755 | 19 | index 0aa7507..36e0423 100755 |
20 | --- a/autogen.sh | 20 | --- a/autogen.sh |
21 | +++ b/autogen.sh | 21 | +++ b/autogen.sh |
22 | @@ -52,12 +52,3 @@ cat configure.seed | sed \ | 22 | @@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then |
23 | -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ | 23 | echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" |
24 | -e "s/@FUZZY@/$FUZZY/g" \ | 24 | exit |
25 | > configure.ac | 25 | fi |
26 | - | 26 | - |
27 | -autoreconf -ivf | 27 | -autoreconf -ivf |
28 | -cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp | ||
29 | -cat configure.tmp > configure | ||
30 | - | 28 | - |
31 | -echo "./configure $@" | 29 | -echo "./configure $@" |
32 | -chmod +x configure | 30 | -chmod +x configure |
33 | -./configure $@ | 31 | -./configure $@ |
34 | - | 32 | - |
35 | -- | 33 | -- |
36 | 2.17.1 | 34 | 2.25.1 |
37 | 35 | ||
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.0.bb b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb index 960c4c201..352d2d242 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" | |||
8 | LICENSE = "GPLv3" | 8 | LICENSE = "GPLv3" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" |
10 | 10 | ||
11 | SRCREV = "dabab0e9515c2e6a71a91bdc807453e416f831ca" | 11 | SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" |
12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable;protocol=https \ | 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ |
13 | file://0001-autogen.sh-not-generate-configure.patch \ | 13 | file://0001-autogen.sh-not-generate-configure.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||