diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-10-10 13:57:51 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-10-10 14:13:32 +0200 |
| commit | 8a0b7eed668827eaf3f387b3ef4155c5b2a7c5a9 (patch) | |
| tree | ad80a0866d47adbc48c0fc7e2d991b04f3847f56 | |
| parent | 549134ef10d9066b720690ca8bb758e07c29f65b (diff) | |
Additional fix related to cf931fda6bfb3925555c7bd11d950a886676bcb3.fix/configure-seed-leftover
* configure.seed references removed
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | packages/openwrt/Makefile | 9 | ||||
| -rw-r--r-- | packages/openwrt/Makefile.dev | 7 |
3 files changed, 2 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index d2710f391..fcc4403ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libndpi.pc -EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh configure.seed wireshark python windows utils packages example/MacOS doc/api.rst doc/conf.py doc/flow_risks.rst doc/guide/nDPI_QuickStartGuide.pages doc/guide/nDPI_QuickStartGuide.pdf doc/img/logo.png doc/index.rst doc/Makefile doc/what_is_ndpi.rst +EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh wireshark python windows utils packages example/MacOS doc/api.rst doc/conf.py doc/flow_risks.rst doc/guide/nDPI_QuickStartGuide.pages doc/guide/nDPI_QuickStartGuide.pdf doc/img/logo.png doc/index.rst doc/Makefile doc/what_is_ndpi.rst changelog: git log --since={`curl -s https://github.com/ntop/ndpi/releases | grep datetime | head -n1 | egrep -o "[0-9]+\-[0-9]+\-[0-9]+"`} --name-only --pretty=format:" - %s" | grep "^ " > CHANGELOG.latest diff --git a/packages/openwrt/Makefile b/packages/openwrt/Makefile index 3e12d45b0..e24b5d5ed 100644 --- a/packages/openwrt/Makefile +++ b/packages/openwrt/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi -PKG_VERSION:=3.4 +PKG_VERSION:=4.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -58,13 +58,6 @@ endef define Build/Prepare $(PKG_UNPACK) $(Build/Patch) - mv $(PKG_BUILD_DIR)/configure.seed $(PKG_BUILD_DIR)/configure.ac - $(SED) "s/@NDPI_MAJOR@/3/g" \ - -e "s/@NDPI_MINOR@/4/g" \ - -e "s/@NDPI_PATCH@/0/g" \ - -e "s/@NDPI_VERSION_SHORT@/3.4.0/g" \ - -e "s/@FUZZY@/dnl> /g" \ - $(PKG_BUILD_DIR)/configure.ac endef define Build/InstallDev diff --git a/packages/openwrt/Makefile.dev b/packages/openwrt/Makefile.dev index 3fc571255..5f11eceea 100644 --- a/packages/openwrt/Makefile.dev +++ b/packages/openwrt/Makefile.dev @@ -58,13 +58,6 @@ define Build/Prepare cp -r $(SOURCE_DIR)/* $(PKG_BUILD_DIR) $(PKG_UNPACK) $(Build/Patch) - mv $(PKG_BUILD_DIR)/configure.seed $(PKG_BUILD_DIR)/configure.ac - $(SED) "s/@NDPI_MAJOR@/3/g" \ - -e "s/@NDPI_MINOR@/4/g" \ - -e "s/@NDPI_PATCH@/0/g" \ - -e "s/@NDPI_VERSION_SHORT@/3.4.0/g" \ - -e "s/@FUZZY@/dnl> /g" \ - $(PKG_BUILD_DIR)/configure.ac endef define Build/InstallDev |