diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | data/package-lists/vyos-dev.list.chroot | 2 | ||||
| -rwxr-xr-x | scripts/build-flavour | 26 | ||||
| -rwxr-xr-x | scripts/query-config | 36 |
4 files changed, 67 insertions, 0 deletions
@@ -12,11 +12,14 @@ prepare: @scripts/check-build-env @scripts/check-config + rm -rf build/config/* @scripts/live-build-config cp -r data/live-build-config/* build/config/ @scripts/make-version-file + @scripts/build-flavour + .PHONY: iso .ONESHELL: iso: prepare diff --git a/data/package-lists/vyos-dev.list.chroot b/data/package-lists/vyos-dev.list.chroot new file mode 100644 index 00000000..d057008f --- /dev/null +++ b/data/package-lists/vyos-dev.list.chroot @@ -0,0 +1,2 @@ +gdb +strace diff --git a/scripts/build-flavour b/scripts/build-flavour new file mode 100755 index 00000000..8cbdc10e --- /dev/null +++ b/scripts/build-flavour @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright (C) 2016 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# File: build-flavour +# Purpose: Adds various data files to the build config +# depending on the build flavour. + + +BUILD_TYPE=$(scripts/query-config build_type) + +# 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 diff --git a/scripts/query-config b/scripts/query-config new file mode 100755 index 00000000..7d7146e0 --- /dev/null +++ b/scripts/query-config @@ -0,0 +1,36 @@ +#!/usr/bin/python +# Copyright (C) 2015 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# File: query-config +# Purpose: Extracts field values from the build config, +# for use in languages that can't handle JSON easily, +# (I'm looking at you, Bourne shell!) + + +import sys +import json + +import defaults +import util + +if len(sys.argv) < 2: + print("Usage: {0} <config field name>".format(sys.argv[0])) + sys.exit(1) + +util.check_build_config() +with open(defaults.BUILD_CONFIG, 'r') as f: + build_config = json.load(f) + +print(build_config[sys.argv[1]]) |