diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-01-26 22:08:03 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-01-26 22:08:03 +0100 |
| commit | 5c71eee90b61dbddaf54bd49b79c541587d8fa6f (patch) | |
| tree | 9e954eddae3f5818b99827475fae602a5d22855f /scripts | |
| parent | c268053839010c5abbef223498a71a5ecce8a632 (diff) | |
| parent | 4d073e64d0b9ee61d30592b8b324560da08c31c2 (diff) | |
| download | vyos-build-5c71eee90b61dbddaf54bd49b79c541587d8fa6f.tar.gz vyos-build-5c71eee90b61dbddaf54bd49b79c541587d8fa6f.zip | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-kernel | 2 | ||||
| -rwxr-xr-x | scripts/build-submodules | 10 |
2 files changed, 1 insertions, 11 deletions
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 \ |