Migrate buildroot & kernel config to buildroot-customizations.

buildroot-config/.config → buildroot-customizations/configs/jc11_defconfig

@@ -3,7 +3,7 @@
 # Buildroot 2023.02.9 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_EXTERNAL_MIXXX_PATH="/home/icedream/Documents/Source/Git/github.com/ghuntley/denon-prime4/buildroot-customizations"
+BR2_EXTERNAL_MIXXX_PATH="/home/icedream/Documents/Source/Git/github.com/icedream/denon-prime4/buildroot-customizations"
 BR2_HOST_GCC_AT_LEAST_4_9=y
 BR2_HOST_GCC_AT_LEAST_5=y
 BR2_HOST_GCC_AT_LEAST_6=y
@@ -4861,7 +4861,7 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 #
 
 #
-# Mixxx (in /home/icedream/Documents/Source/Git/github.com/ghuntley/denon-prime4/buildroot-customizations)
+# Mixxx (in /home/icedream/Documents/Source/Git/github.com/icedream/denon-prime4/buildroot-customizations)
 #
 
 #

clone-buildroot.sh

@@ -30,5 +30,3 @@ git init "buildroot/${VERSION_ID}"
       "${patches_dir}"/*.patch
   fi
 )
-
-cp -rv buildroot-config/. buildroot/"${VERSION_ID}"

compile-buildroot.sh

@@ -80,7 +80,9 @@ if [ -n "${BR2_CCACHE_DIR:-}" ]; then
   make_flags+=(BR2_CCACHE_DIR="${BR2_CCACHE_DIR}")
 fi
 
+make "${make_flags[@]}" "${device_id_lowercase}_defconfig"
 make "${make_flags[@]}"
+
 filter_package_files <"${buildroot_path}/output/build/packages-file-list.txt" | \
 tar -c -C "${buildroot_path}/output/target/" --owner=root --group=root -T - |\
 do_mount --write tar -xp

configure-buildroot.sh

@@ -5,7 +5,6 @@
 buildroot_path="buildroot/$(get_buildroot_version)"
 
 #./clone-buildroot.sh
-cp -v buildroot-config/.config "$buildroot_path"
 
 config_target="${1:-}"
 if [ -z "$config_target" ]; then
@@ -30,10 +29,16 @@ done
 make_flags=(
   -C "${buildroot_path}"
   BR2_EXTERNAL=../../buildroot-customizations
+  BR2_DEFCONFIG="${SCRIPT_DIR}/buildroot-customizations/configs/${device_id_lowercase}_defconfig"
   BR2_GLOBAL_PATCH_DIR="${BR2_GLOBAL_PATCH_DIR}"
 )
 
+make \
+  "${make_flags[@]}" \
+  "${device_id_lowercase}_defconfig"
 make \
   "${make_flags[@]}" \
   "$config_target"
-cp -v "$buildroot_path/.config" buildroot-config
+make \
+  "${make_flags[@]}" \
+  savedefconfig

extract-ikconfig.sh

@@ -6,5 +6,5 @@ buildroot_path="buildroot/$(get_buildroot_version)"
 
 # TODO - detect linux-headers version
 
-do_mount cat /boot/zImage > zImage
-"${buildroot_path}"/output/build/linux-headers-*/scripts/extract-ikconfig zImage > buildroot-config/kernel.config
+do_mount cat /boot/zImage >zImage
+"${buildroot_path}"/output/build/linux-headers-*/scripts/extract-ikconfig zImage >"buildroot-customizations/boards/inmusic/common/linux.config"

functions.sh

@@ -4,6 +4,8 @@ set -e
 set -u
 set -o pipefail
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 log() {
   echo "$@" >&2
 }
@@ -87,6 +89,8 @@ if [ -z "$device_id" ]; then
   exit 1
 fi
 
+device_id_lowercase=$(tr '[[:upper:]]' '[[:lower:]]' <<<"$device_id")
+
 device_update_download_filename="${device_update_download_url##*/}"
 device_updater_win_download_filename="${device_updater_win_download_url##*/}"
 device_updater_win_download_filename="${device_updater_win_download_filename//+/ }"