Browse Source

feat(common): use defconfig instead of full configs

pull/64/head
Tom Hiller 5 years ago
parent
commit
3d2d0aa362
2 changed files with 22 additions and 8 deletions
  1. +21
    -8
      common/config_and_make.sh
  2. +1
    -0
      common/variables.sh

+ 21
- 8
common/config_and_make.sh View File

@ -14,15 +14,22 @@ function configAndMake() {
###################### ######################
if [ -f "$DOCKER_COREBOOT_DIR/.config" ]; then if [ -f "$DOCKER_COREBOOT_DIR/.config" ]; then
echo "Using existing config" echo "Using existing config"
# clean config to regenerate
make savedefconfig
if [ -s "$DOCKER_COREBOOT_DIR/defconfig" ]; then
mv "$DOCKER_COREBOOT_DIR/defconfig" "$DOCKER_COREBOOT_CONFIG_DIR/"
fi
else else
if [ -f "$DOCKER_SCRIPT_DIR/config-$COREBOOT_COMMIT" ]; then
cp "$DOCKER_SCRIPT_DIR/config-$COREBOOT_COMMIT" "$DOCKER_COREBOOT_DIR/.config"
if [ -f "$DOCKER_SCRIPT_DIR/defconfig-$COREBOOT_COMMIT" ]; then
cp "$DOCKER_SCRIPT_DIR/defconfig-$COREBOOT_COMMIT" "$DOCKER_COREBOOT_CONFIG_DIR/defconfig"
echo "Using config-$COREBOOT_COMMIT" echo "Using config-$COREBOOT_COMMIT"
elif [ -f "$DOCKER_SCRIPT_DIR/config-$COREBOOT_TAG" ]; then
cp "$DOCKER_SCRIPT_DIR/config-$COREBOOT_TAG" "$DOCKER_COREBOOT_DIR/.config"
elif [ -f "$DOCKER_SCRIPT_DIR/defconfig-$COREBOOT_TAG" ]; then
cp "$DOCKER_SCRIPT_DIR/defconfig-$COREBOOT_TAG" "$DOCKER_COREBOOT_CONFIG_DIR/defconfig"
echo "Using config-$COREBOOT_TAG" echo "Using config-$COREBOOT_TAG"
else else
cp "$DOCKER_SCRIPT_DIR/config" "$DOCKER_COREBOOT_DIR/.config"
cp "$DOCKER_SCRIPT_DIR/defconfig" "$DOCKER_COREBOOT_CONFIG_DIR/defconfig"
echo "Using default config" echo "Using default config"
fi fi
fi fi
@ -41,14 +48,20 @@ function configAndMake() {
cp "$DOCKER_SCRIPT_DIR/bootsplash.jpg" "$DOCKER_COREBOOT_DIR/bootsplash.jpg" cp "$DOCKER_SCRIPT_DIR/bootsplash.jpg" "$DOCKER_COREBOOT_DIR/bootsplash.jpg"
fi fi
##############
## make ##
##############
cd "$DOCKER_COREBOOT_DIR" || exit; cd "$DOCKER_COREBOOT_DIR" || exit;
################
## Config ##
###############
make defconfig
if [ "$COREBOOT_CONFIG" ]; then if [ "$COREBOOT_CONFIG" ]; then
make nconfig make nconfig
fi fi
##############
## make ##
##############
make make
} }

+ 1
- 0
common/variables.sh View File

@ -11,3 +11,4 @@ export DOCKER_ROOT_DIR="/home/coreboot"
export DOCKER_SCRIPT_DIR="$DOCKER_ROOT_DIR/scripts" export DOCKER_SCRIPT_DIR="$DOCKER_ROOT_DIR/scripts"
export DOCKER_COMMON_SCRIPT_DIR="$DOCKER_ROOT_DIR/common_scripts" export DOCKER_COMMON_SCRIPT_DIR="$DOCKER_ROOT_DIR/common_scripts"
export DOCKER_COREBOOT_DIR="$DOCKER_ROOT_DIR/cb_build" export DOCKER_COREBOOT_DIR="$DOCKER_ROOT_DIR/cb_build"
export DOCKER_COREBOOT_CONFIG_DIR="$DOCKER_COREBOOT_DIR/configs"

Loading…
Cancel
Save