diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 13:01:12 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 13:01:12 +0100 |
| commit | f7ce0d8a692f2d09a6d5bc536d6dd8a81edc440d (patch) | |
| tree | a84eebb9dda6022b245226694e0f496a5adddfa6 | |
| parent | e2559c975d22593d6edc087c51805f36ba1b7e57 (diff) | |
| download | vyos-build-f7ce0d8a692f2d09a6d5bc536d6dd8a81edc440d.tar.gz vyos-build-f7ce0d8a692f2d09a6d5bc536d6dd8a81edc440d.zip | |
Switch from Debian Jessie (8) to Debian Buster (10)
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | data/versions | 3 | ||||
| -rwxr-xr-x | scripts/build-packages | 2 | ||||
| -rwxr-xr-x | scripts/live-build-config | 2 |
4 files changed, 4 insertions, 7 deletions
@@ -266,9 +266,7 @@ Then checkout the correct branch or commit you want to build before building the $ mkdir packages $ cd packages $ git clone git@github.com:myname/vyos-1x.git -$ cd vyos-1x -$ git checkout equuleus -$ cd ../.. +$ cd .. $ docker run --rm -it -v $(pwd):/vyos -w /vyos/packages/PACKAGENAME \ --sysctl net.ipv6.conf.lo.disable_ipv6=0 \ vyos-builder scripts/build-packages -b vyos-1x diff --git a/data/versions b/data/versions index b5d0fcb6..05fe35a0 100644 --- a/data/versions +++ b/data/versions @@ -1,4 +1,3 @@ { - "equuleus": "1.3", - "current": "1.2" + "current": "1.3" } diff --git a/scripts/build-packages b/scripts/build-packages index 0d81ef91..f9b38e8f 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -11,7 +11,7 @@ current_working_directory = os.getcwd() repo_root = subprocess.check_output('git rev-parse --show-toplevel', shell=True, universal_newlines=True).rstrip('\n') repo_sha = subprocess.check_output('git rev-parse --short=12 HEAD', shell=True, universal_newlines=True).rstrip('\n') -def add_package(name, url=None, commit='HEAD', branch='equuleus', tag=None, custombuild_cmd=None): +def add_package(name, url=None, commit='HEAD', branch='current', tag=None, custombuild_cmd=None): """ Build up source package with URL and build commands executed during the later called build_package step. diff --git a/scripts/live-build-config b/scripts/live-build-config index 171b827d..61e71c0d 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -57,7 +57,7 @@ lb config noauto \ --firmware-binary false \ --updates true \ --security true \ - --apt-options "--yes -oAPT::Default-Release="equuleus" -oAPT::Get::allow-downgrades=true" \ + --apt-options "--yes -oAPT::Default-Release="current" -oAPT::Get::allow-downgrades=true" \ --apt-indices false "${@}" """ |