diff options
| author | hagbard-01 <39653662+hagbard-01@users.noreply.github.com> | 2019-02-02 09:39:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 09:39:58 -0800 |
| commit | 4dc57689dea77003e9d0e54c7f0324122964d0d2 (patch) | |
| tree | c9a90d301ebf7c0143a8c174ee2fbccea4070cd7 | |
| parent | 82e47dc6150c83e27dbe0b5d3b76a6fe7fa1dd5e (diff) | |
| parent | 274ebdb02582cc52237c95b1884b1cb24884d6f1 (diff) | |
| download | vyos-build-4dc57689dea77003e9d0e54c7f0324122964d0d2.tar.gz vyos-build-4dc57689dea77003e9d0e54c7f0324122964d0d2.zip | |
Merge pull request #45 from njh/i386
Changed architecture name for 32-bit x86 to 'i386'
| -rwxr-xr-x | scripts/build-config | 2 | ||||
| -rwxr-xr-x | scripts/build-flavour | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build-config b/scripts/build-config index 3b44df77..db870be7 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -52,7 +52,7 @@ def get_validator(optdict, name): # Options dict format: # '$option_name_without_leading_dashes': { ('$help_string', $default_value_generator_thunk, $value_checker_thunk) } options = { - 'architecture': ('Image target architecture (amd64 or i586 or armhf)', lambda: 'amd64', lambda x: x in ['amd64', 'i586', 'armhf']), + 'architecture': ('Image target architecture (amd64 or i386 or armhf)', lambda: 'amd64', lambda x: x in ['amd64', 'i386', 'armhf']), 'build-by': ('Builder identifier (e.g. jrandomhacker@example.net)', get_default_build_by, None), 'debian-mirror': ('Debian repository mirror for ISO build', lambda: defaults.DEBIAN_MIRROR, None), 'debian-security-mirror': ('Debian security updated mirror', lambda: defaults.DEBIAN_SECURITY_MIRROR, None), diff --git a/scripts/build-flavour b/scripts/build-flavour index c14f5735..5e76672b 100755 --- a/scripts/build-flavour +++ b/scripts/build-flavour @@ -27,7 +27,7 @@ if [ $BUILD_TYPE = "development" ]; then fi # Install grub-pc if it's an x86 build -if [ $BUILD_ARCH = 'amd64' -o $BUILD_ARCH = 'i686' ]; then +if [ $BUILD_ARCH = 'amd64' -o $BUILD_ARCH = 'i386' ]; then cp data/package-lists/vyos-x86.list.chroot build/config/package-lists/ fi |