Merge pull request #836 from AVnu/open-avb-next

Open avb next
Avnu · Oct 8, 2018 · 8fa80d1 · 8fa80d1
2 parents df587b7 + f9991ab
commit 8fa80d1
Show file tree

Hide file tree

Showing 194 changed files with 4,747 additions and 76,362 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "avdecc-lib"]
 	path = avdecc-lib
 	url = ../../AVnu/avdecc-lib
+[submodule "lib/igb_avb"]
+	path = lib/igb_avb
+	url = https://github.com/AVnu/igb_avb.git
diff --git a/.travis.yml b/.travis.yml
@@ -27,21 +27,6 @@ install:
   - sudo apt-get update -qq
   - sudo apt-get install -y libpcap-dev libpci-dev libsndfile1-dev libjack-dev linux-headers-4.4.0-75-generic
   - sudo apt-get install -y libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libasound2-dev
-  - sudo apt-get install -y python3-pip
-  - curl -L "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"  -o ninja-linux.zip
-  - sudo unzip ninja-linux.zip -d /usr/local/bin
-  - sudo chmod 755 /usr/local/bin/ninja
-  - sudo pip3 install meson==0.44.0
-  - curl -L "https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz" -o cmocka-1.1.1.tar.xz
-  - tar -xf cmocka-1.1.1.tar.xz
-  - pushd cmocka-1.1.1
-  - mkdir build
-  - cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..
-  - make
-  - sudo make install
-  - popd
-  - sudo cp /usr/src/linux-headers-4.4.0-75/include/uapi/linux/if_ether.h /usr/include/linux
   - sudo cp /usr/src/linux-headers-4.4.0-75/include/uapi/linux/ethtool.h /usr/include/linux
   - sudo cp /usr/src/linux-headers-4.4.0-75/include/uapi/linux/ptp_clock.h /usr/include/linux
   - CMAKE_URL="https://cmake.org/files/v3.9/cmake-3.9.4-Linux-x86_64.tar.gz"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,6 @@ add_subdirectory("thirdparty/cpputest")
 add_subdirectory("daemons/common/tests")
 add_subdirectory("daemons/mrpd")
 add_subdirectory("daemons/maap")
-add_subdirectory("daemons/gptp")
 
 message("
 -------------------------------------------------------

diff --git a/Makefile b/Makefile
@@ -5,13 +5,10 @@ descend = \
 help:
 	@echo 'Possible targets:'
 	@echo ''
-	@echo '  igb               - igb module'
-	@echo ''
 	@echo '  lib               - igb library'
 	@echo ''
-	@echo '  daemons_all       - build all daemons (mrpd gptp maap shaper)'
+	@echo '  daemons_all       - build all daemons (mrpd maap shaper)'
 	@echo '  mrpd              - mrpd daemon'
-	@echo '  gptp              - gptp daemon for linux'
 	@echo '  maap              - maap daemon'
 	@echo '  shaper            - shaper daemon for linux'
 	@echo ''
@@ -35,18 +32,12 @@ help:
 	@echo '  clean: a summary clean target to clean _all_ folders'
 	@echo ''
 
-igb: FORCE
-	$(call descend,kmod/$@)
-
-igb_clean:
-	$(call descend,kmod/igb/,clean)
-
 lib: FORCE
-	$(call descend,lib/igb)
+	$(call descend,lib/igb_avb/lib)
 	$(call descend,lib/common)
 
 lib_clean:
-	$(call descend,lib/igb/,clean)
+	$(call descend,lib/igb_avb/lib/,clean)
 	$(call descend,lib/common/,clean)
 
 mrpd:
@@ -55,12 +46,6 @@ mrpd:
 mrpd_clean:
 	$(call descend,daemons/mrpd/,clean)
 
-gptp:
-	$(call descend,daemons/$@/linux/build/)
-
-gptp_clean:
-	$(call descend,daemons/gptp/linux/build/,clean)
-
 maap:
 	$(call descend,daemons/$@/linux/build/)
 
@@ -73,9 +58,9 @@ shaper:
 shaper_clean:
 	$(call descend,daemons/shaper/,clean)
 
-daemons_all: mrpd maap gptp shaper
+daemons_all: mrpd maap shaper
 
-daemons_all_clean: mrpd_clean gptp_clean maap_clean shaper_clean
+daemons_all_clean: mrpd_clean maap_clean shaper_clean
 
 examples_common:
 	$(call descend,examples/common)
@@ -155,8 +140,8 @@ examples_all: examples_common simple_talker simple_listener mrp_client live_stre
 examples_all_clean: examples_common_clean simple_talker_clean simple_listener_clean mrp_client_clean \
 	jackd-talker_clean jackd-listener_clean live_stream_clean simple_rx_clean
 
-all: igb lib daemons_all examples_all avtp_pipeline avtp_avdecc
+all: lib daemons_all examples_all avtp_pipeline avtp_avdecc
 
-clean: igb_clean lib_clean daemons_all_clean examples_all_clean avtp_pipeline_clean avtp_avdecc_clean
+clean: lib_clean daemons_all_clean examples_all_clean avtp_pipeline_clean avtp_avdecc_clean
 
 .PHONY: FORCE
diff --git a/README.rst b/README.rst
@@ -54,14 +54,6 @@ patches with GPL content into existing “BSD” licensed components. Third
 party copyrights can be included provided they do not narrow the licensing 
 terms of an existing component.
 
-Prior to accepting a commit, Intel may perform scans using third-party tools 
-to identify suspected hits of GPL code. Intel may also perform vulnerability 
-scans of patches in an attempt to find various coding errors such as memory 
-leaks, buffer overflows and usage of uninitialized variables. The submitter 
-will be asked to correct any detected issues prior to a commit. Owners
-of submitted third-party content are free to apply changes without supervision
-by Intel.
-
 The OpenAvnu project has a development mailing list. To subscribe, visit
 https://lists.sourceforge.net/lists/listinfo/open-avb-devel to sign up.
 

diff --git a/daemons/gptp/.gitignore b/daemons/gptp/.gitignore
diff --git a/daemons/gptp/CMakeLists.txt b/daemons/gptp/CMakeLists.txt
diff --git a/daemons/gptp/README.rst b/daemons/gptp/README.rst