-#!/bin/sh
+#!/bin/sh -e
# Copyright (c) 2016 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
#
BUILD_DIR="$(dirname $0)/build"
-BUILDROOT_NAME='buildroot-2016.02'
+BUILDROOT_NAME='buildroot-2017.05.2'
BUILDROOT_DIR="${BUILD_DIR}/${BUILDROOT_NAME}"
BUILDROOT_TARBALL="${BUILDROOT_NAME}.tar.gz"
BUILDROOT_URL="https://buildroot.org/downloads/${BUILDROOT_TARBALL}"
wget -P ${BUILD_DIR} -N $BUILDROOT_URL
tar -C ${BUILD_DIR} -xzf ${BUILD_DIR}/$BUILDROOT_TARBALL
+# Apply DPDK patch to buildroot. Do not fail if this patch has already been applied.
+patch -N -d ${BUILDROOT_DIR} -p1 < buildroot-patches/dpdk.patch || /bin/true
+
cp -p buildroot-config $BUILDROOT_DIR/.config
cp -p kernel-defconfig $BUILDROOT_DIR/kernel-defconfig
make -C $BUILDROOT_DIR
echo "Applying patches/modifications"
mydir=$(pwd)
cd ${MOUNT_TMPDIR}
-sudo run-parts -v ${mydir}/patches
+sudo run-parts -v ${mydir}/image-patches
cd ${mydir}
# Copy version and changelog
# Install GRUB bootloader on the disk image
${BUILDROOT_DIR}/output/host/sbin/grub --device-map=/dev/null <<_EOF
device (hd0) ${img_name}
-geometry (hd0) ${disk_cylinders} ${DISK_HEADS} ${DISK_SECT_PER_TRACK}
+geometry (hd0)
root (hd0,0)
setup (hd0)
quit