Merge branch 'source-build' of github.com:c-po/vyos-build into current

* 'source-build' of github.com:c-po/vyos-build:
  build-submodules: ease FRR build procedure
  build-kernel: no need to build source and debug package
  Remove wrong vyos-xe-guest-utilities submodule in root folder
  Docker: build libyang Debian package

5 files changed, 10 insertions, 19 deletions

diff --git a/.gitmodules b/.gitmodules
index ee1f8009..22bb87d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -221,10 +221,6 @@
 	path = packages/vyos-vmwaretools-scripts
 	url = https://github.com/vyos/vyos-vmwaretools-scripts.git
 	branch = current
-[submodule "vyos-xe-guest-utilities"]
-	path = vyos-xe-guest-utilities
-	url = https://github.com/vyos/vyos-xe-guest-utilities.git
-	branch = current
 [submodule "packages/vyconf"]
 	path = packages/vyconf
 	url = https://github.com/vyos/vyconf.git
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b874bf92..bca48ff8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -150,11 +150,16 @@ RUN export RTRLIB_COMMIT="v0.6.3" && \
 # Prerequisites for building FRR from source
 # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
 #
-RUN export LIBYANG_COMMIT="v0.16-r2" && \
-    git clone https://github.com/CESNET/libyang.git && \
+RUN apt-get update && apt-get install -y -t jessie-backports \
+      swig \
+      libcmocka-dev \
+      libcmocka0
+
+RUN export LIBYANG_COMMIT="179da47f2e8de" && \
+    git clone https://github.com/opensourcerouting/libyang.git && \
     cd libyang && git checkout $LIBYANG_COMMIT && mkdir build && cd build && \
-    cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && \
-    make && make install
+    cmake .. && make build-deb && \
+    dpkg -i debs/*.deb
 
 # Packages needed for frr
 RUN apt-get update && apt-get install -y \
diff --git a/scripts/build-kernel b/scripts/build-kernel
index 4a23d9c7..e58d2d5a 100755
--- a/scripts/build-kernel
+++ b/scripts/build-kernel
@@ -20,7 +20,7 @@ ARCH=$(dpkg --print-architecture)
 case "$ARCH" in
     amd64)
         make x86_64_vyos_defconfig
-        TARGETS="kernel_source kernel_debug kernel_headers kernel_image"
+        TARGETS="kernel_headers kernel_image"
         # the following targets are not supported for Linux Kernels > 4.14 as
         # they have been removed from the Makefile (commits 18afab8c1d3c2 &
         # 22cba31bae9dc).
diff --git a/scripts/build-submodules b/scripts/build-submodules
index 3502a7d4..0d11c059 100755
--- a/scripts/build-submodules
+++ b/scripts/build-submodules
@@ -175,16 +175,6 @@ build_frr() {
     source /etc/os-release
     tar xf ../../frr_*${ID}${VERSION_ID}*.debian.tar.xz
 
-    # As libyang is not (yet) build and installed as native Debian package FRR
-    # build system reports the following error:
-    #
-    #   "dpkg-shlibdeps: error: no dependency information found for
-    #       /usr/lib/x86_64-linux-gnu/libyang.so.0.16"
-    #
-    # It is "overruled" by
-    sed '/dh_systemd_enable frr.service/ a \\noverride_dh_shlibdeps:\n\tdh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info\n' -i debian/rules
-
-
     # Build Debian Package
     debuild --no-lintian --set-envvar=WANT_SNMP=1 --set-envvar=WANT_RPKI=1 \
         --set-envvar=WANT_CUMULUS_MODE=0 -b -uc -us \
diff --git a/vyos-xe-guest-utilities b/vyos-xe-guest-utilities
deleted file mode 160000
-Subproject f720a86bb30b96733f24a70249f0ee586c29b1c