diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-04-13 03:17:45 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2016-04-13 03:17:45 -0400 |
| commit | 6bf7fdff0f7e64bbd2b231a4041bbfaffa36223b (patch) | |
| tree | a4fbd95c499d979389a666cead35835bb9275953 | |
| parent | 08a6856b3c8f3146343647f996fca9c48fb4e960 (diff) | |
| download | vyos-build-6bf7fdff0f7e64bbd2b231a4041bbfaffa36223b.tar.gz vyos-build-6bf7fdff0f7e64bbd2b231a4041bbfaffa36223b.zip | |
For the ARM porting story: add copying a package list with arch-specific packages
to the build-flavour script.
Right now it only includes grub-pc.
| -rw-r--r-- | data/package-lists/vyos-x86.list.chroot | 1 | ||||
| -rwxr-xr-x | scripts/build-flavour | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot new file mode 100644 index 00000000..c20456df --- /dev/null +++ b/data/package-lists/vyos-x86.list.chroot @@ -0,0 +1 @@ +grub-pc diff --git a/scripts/build-flavour b/scripts/build-flavour index c97903f5..389be980 100755 --- a/scripts/build-flavour +++ b/scripts/build-flavour @@ -19,8 +19,14 @@ BUILD_TYPE=$(scripts/query-json build/build-config.json build_type) +BUILD_ARCH=$(scripts/query-json build/build-config.json architecture) # Add debug tools if it's a development image if [ $BUILD_TYPE = "development" ]; then cp data/package-lists/vyos-dev.list.chroot build/config/package-lists/ fi + +# Install grub-pc if it's an x86 build +if [ $BUILD_ARCH = 'amd64' -o $BUILD_ARCH = 'i686' ]; then + cp data/package-lists/vyos-x86.list.chroot build/config/package-lists/ +fi |