From 7be4706552845824888b58054120dfac99bfdf63 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 21 Aug 2023 00:40:35 +0100 Subject: unify build/defconfig and modify/defconfig they fundamentally perform the same action: copy the .config file and run make, but build runs make-all, while modify runs make-oldconfig or make-menuconfig merge this functionality together also: ./handle config file ^ this is the new syntax, not: ./build defconfig for for example: ./handle config file -b coreboot x200_8mb <-- build x200 rom ./handle config file -m coreboot x200_8mb <-- modify configs ./handle config file -u coreboot x200_8mb <-- make-oldconfig ./handle config file -u seabios ./handle config file -b u-boot yes, 1 script and a sloccount reduction of 52. and the audit? it continues. Signed-off-by: Leah Rowe --- handle | 1 + resources/scripts/build/boot/roms_helper | 7 +- resources/scripts/build/defconfig/for | 240 --------------------------- resources/scripts/handle/config/file | 256 +++++++++++++++++++++++++++++ resources/scripts/modify/defconfig/options | 107 ------------ 5 files changed, 261 insertions(+), 350 deletions(-) create mode 120000 handle delete mode 100755 resources/scripts/build/defconfig/for create mode 100755 resources/scripts/handle/config/file delete mode 100755 resources/scripts/modify/defconfig/options diff --git a/handle b/handle new file mode 120000 index 00000000..012b4ec0 --- /dev/null +++ b/handle @@ -0,0 +1 @@ +lbmk \ No newline at end of file diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 8fcc81b6..5e2085d9 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -166,7 +166,7 @@ if [ ! -f "${seavgabiosrom}" ] \ || [ ! -f elf/seabios/default/vgarom/bios.bin.elf ] \ || [ ! -f elf/seabios/default/normal/bios.bin.elf ]; then [ "${payload_seabios}" = "y" ] && \ - ./build defconfig for seabios + ./handle config file -b seabios fi [ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ] && \ @@ -211,7 +211,7 @@ if [ "${payload_grub}" = "y" ] \ fi if [ "${payload_uboot}" = "y" ]; then - ./build defconfig for u-boot ${board} + ./handle config file -b u-boot ${board} ubdir="elf/u-boot/${board}/${uboot_config}" ubootelf="${ubdir}/u-boot.elf" [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot.bin" ] && \ @@ -497,7 +497,8 @@ mkRoms() return 0 fi - ./build defconfig for coreboot ${board} + ./handle config file -b coreboot ${board} + _corebootrom="elf/coreboot/${board}/${initmode}_${displaymode}" [ "${initmode}" = "normal" ] && \ _corebootrom="${_corebootrom%_${displaymode}}" diff --git a/resources/scripts/build/defconfig/for b/resources/scripts/build/defconfig/for deleted file mode 100755 index 93eae3f1..00000000 --- a/resources/scripts/build/defconfig/for +++ /dev/null @@ -1,240 +0,0 @@ -#!/usr/bin/env sh - -# helper script: build elf files on build systems that use defconfig/kconfig -# -# Copyright (C) 2022 Alper Nebi Yasak -# Copyright (C) 2022 Ferass El Hafidi -# Copyright (C) 2023 Leah Rowe -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# 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 . - -# you could probably build *linux* with this script! - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -projectname="$(cat projectname)" -our_version="$(cat version)" - -export LOCALVERSION="-${projectname}-${our_version}" - -arch="" -cfgsdir="" -codedir="" -config="" -config_name="" -crossgcc_ada="" -elfdir="" -listfile="" -project="" -target="" -target_dir="" -tree="" - -main() -{ - [ $# -lt 1 ] && err "Project name not specified" - project="${1}" - elfdir="elf/${project}" - shift 1 - - cfgsdir="resources/${project}" - [ -d "${cfgsdir}" ] || err "directory, ${cfgsdir}, does not exist" - - listfile="${cfgsdir}/build.list" - [ -f "${listfile}" ] || err "list file, ${listfile}, does not exist" - - printf "Building %s binaries (elf files)\n" ${project} - - # Build for all targets if no argument is given - if [ "$#" -eq 0 ]; then - for target_dir in "${cfgsdir}"/*; do - [ ! -d "${target_dir}/config/" ] && \ - continue - set -- "$@" "${target_dir#${cfgsdir}/}" - done - fi - - [ ! -d "${elfdir}" ] && \ - mkdir -p ${elfdir}/ - - for x in "$@"; do - target="${x}" - if [ "${project}" = "coreboot" ]; then - ./update blobs download ${target} || err "blobutil" - fi - build_defconfig || exit 1 - done - - printf "Done! The files are stored under %s/\n\n" ${elfdir} -} - -build_defconfig() -{ - handle_dependencies "${target}" || return 1 - - for y in "${target_dir}/config"/*; do - [ ! -f "${y}" ] && continue - config="${y}" - config_name="${config#$target_dir/config/}" - - printf "build/defconfig/%s %s: build config %s\n" \ - ${project} ${target} ${config_name} - - check_config || continue - build_elf - copy_elf - done -} - -handle_dependencies() -{ - target_dir="${cfgsdir}/${target}" - mkdir -p "${elfdir}/${target}" - - tree="undefined" - arch="undefined" - - [ ! -f "${target_dir}/target.cfg" ] && \ - err "build/${project} ${target}: Missing target.cfg" - - # Override the above defaults using target.cfg - . "${target_dir}/target.cfg" # source - - [ "${tree}" = "undefined" ] && \ - err "build/${project} %{target}: tree undefined" - [ "${arch}" = "undefined" ] && \ - err "build/${project} ${target}: undefined cpu type" - - codedir="${project}/${tree}" - [ -d "${codedir}" ] || \ - ./fetch_trees "${project}" "$target" || exit 1 - - # u-boot and coreboot are both compiled with coreboot's crossgcc - if [ "${project}" = "coreboot" ] || [ "${project}" = "u-boot" ]; then - check_cross_compiler || err "crossgcc fail" - fi -} - -# set up cross-compiler (coreboot crossgcc) for u-boot and coreboot -# (seabios and grub currently use hostcc, not crossgcc) -check_cross_compiler() -{ - [ "${crossgcc_ada}" = "y" ] || [ "${crossgcc_ada}" = "n" ] || \ - crossgcc_ada="y" - [ "${crossgcc_ada}" != "y" ] && \ - export BUILD_LANGUAGES=c - - cbdir="coreboot/${tree}" - [ "${project}" != "coreboot" ] && \ - cbdir="coreboot/default" # not u-boot (e.g. linux will use it) - [ "${project}" = "u-boot" ] && \ - cbdir="coreboot/cros" # u-boot only used on coreboot/cros - # only true if not building coreboot: - [ -d "${cbdir}" ] || \ - ./fetch_trees coreboot ${cbdir#coreboot/} || \ - err "check_cross_compiler" - - if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then - if [ ! -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ]; then - # Even for 64-bit machines, coreboot builds 32-bit ROM - # images, so we only need to worry about i386-elf - make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc) || \ - return 1 - fi - case "$(uname -m)" in - x86*|i*86|amd64) : ;; - *) export CROSS_COMPILE=i386-elf- ;; - esac - elif [ "${arch}" = "ARMv7" ]; then - if [ ! -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ]; then - make -C "${cbdir}" crossgcc-arm CPUS=$(nproc) || \ - return 1 - fi - case "$(uname -m)" in - arm|arm32|armv6*|armv7*) : ;; - *) export CROSS_COMPILE=arm-eabi- ;; - esac - elif [ "${arch}" = "AArch64" ]; then - if [ ! -d "${cbdir}/util/crossgcc/xgcc/aarch64-elf/" ]; then - make -C "${cbdir}" crossgcc-aarch64 CPUS=$(nproc) || \ - return 1 - fi - # aarch64 also needs armv7 toolchain for arm-trusted-firmware - if [ ! -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ]; then - make -C "${cbdir}" crossgcc-arm CPUS=$(nproc) || \ - return 1 - fi - case "$(uname -m)" in - arm64|aarch64) : ;; - *) export CROSS_COMPILE=aarch64-elf- ;; - esac - fi - - # we *must* ensure that u-boot's build system uses crossgcc first - export PATH="$(pwd)/${cbdir}/util/crossgcc/xgcc/bin:$PATH" -} - -check_config() -{ - [ ! -f "${config}" ] && \ - err "build/${project} ${target}: configs missing" - - dest_dir="${elfdir}/${target}/${config_name}" - for elftest in "${dest_dir}"/*; do - if [ -f "${elftest}" ]; then - printf "Build already exists, so skipping build\n" 1>&2 - return 1 - fi - done - mkdir -p "${dest_dir}" - - printf "build/%s %s: building config %s).\n" \ - ${project} ${target} ${config_name} -} - -build_elf() -{ - make -C "${codedir}" distclean || err "build_elf" - - cp "${config}" "${codedir}/.config" || err "build_elf" - make -C "${codedir}" silentoldconfig || \ - make -C "${codedir}" oldconfig || : # don't error on oldconfig - - [ "${project}" = "coreboot" ] && \ - printf "%s\n" "${our_version}" > "${codedir}/.coreboot-version" - make -C "${codedir}" -j"$(nproc)" all || err "build_elf" -} - -copy_elf() -{ - for f in $(cat "${listfile}"); do - [ -f "${codedir}/$f" ] && cp "${codedir}/${f}" "${dest_dir}/" - done - - make -C "${codedir}" distclean || \ - make -C "${codedir}" clean || err "copy_elf" -} - -err() -{ - [ -z "${codedir}" ] || \ - make -C "${codedir}" distclean \ - || make -C "${codedir}" clean || : - - printf "build/defconfig error %s\n" "${1}" 1>&2 - exit 1 -} - -main $@ diff --git a/resources/scripts/handle/config/file b/resources/scripts/handle/config/file new file mode 100755 index 00000000..6c4bd86e --- /dev/null +++ b/resources/scripts/handle/config/file @@ -0,0 +1,256 @@ +#!/usr/bin/env sh + +# helper script: build elf files on build systems that use defconfig/kconfig +# +# Copyright (C) 2022 Alper Nebi Yasak +# Copyright (C) 2022 Ferass El Hafidi +# Copyright (C) 2023 Leah Rowe +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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 . + +# you could probably build *linux* with this script! + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +projectname="$(cat projectname)" +our_version="$(cat version)" + +export LOCALVERSION="-${projectname}-${our_version}" + +arch="" +cfgsdir="" +codedir="" +config="" +config_name="" +crossgcc_ada="" +elfdir="" +listfile="" +mode="" +project="" +target="" +target_dir="" +tree="" + +main() +{ + while getopts b:m:u: option + do + case "${1}" in + -b) + mode="all" + shift ;; + -u) + mode="oldconfig" + shift ;; + -m) + mode="menuconfig" + shift ;; + *) + err "Invalid option" ;; + esac + project="${OPTARG}" + shift + done + [ -z "${mode}" ] && err "mode not given (-m menuconfig or -u oldconfig)" + + elfdir="elf/${project}" + + cfgsdir="resources/${project}" + [ -d "${cfgsdir}" ] || err "directory, ${cfgsdir}, does not exist" + + listfile="${cfgsdir}/build.list" + [ -f "${listfile}" ] || err "list file, ${listfile}, does not exist" + + # Build for all targets if no argument is given + if [ "$#" -eq 0 ]; then + for target_dir in "${cfgsdir}"/*; do + [ ! -d "${target_dir}/config/" ] && \ + continue + set -- "$@" "${target_dir#${cfgsdir}/}" + done + fi + + [ ! -d "${elfdir}" ] && [ "${mode}" = "all" ] && \ + mkdir -p ${elfdir}/ + + for x in "$@"; do + target="${x}" + printf "Running 'make %s' for project '%s, target '%s''\n" \ + "${mode}" "${project}" "${target}" + if [ "${project}" = "coreboot" ] && [ "${mode}" = "all" ]; then + ./update blobs download ${target} || err "blobutil" + fi + handle_defconfig || exit 1 + done + + [ "${mode}" = "all" ] && \ + printf "Done! The files are stored under %s/\n\n" ${elfdir} +} + +handle_defconfig() +{ + handle_dependencies "${target}" || return 1 + + for y in "${target_dir}/config"/*; do + [ ! -f "${y}" ] && continue + config="${y}" + config_name="${config#$target_dir/config/}" + + printf "build/defconfig/%s %s: handling config %s\n" \ + ${project} ${target} ${config_name} + + [ "${mode}" != "all" ] || check_config || continue + run_make_command + [ "${mode}" != "all" ] || copy_elf + done +} + +handle_dependencies() +{ + target_dir="${cfgsdir}/${target}" + mkdir -p "${elfdir}/${target}" + + tree="undefined" + arch="undefined" + + [ ! -f "${target_dir}/target.cfg" ] && \ + err "build/${project} ${target}: Missing target.cfg" + + # Override the above defaults using target.cfg + . "${target_dir}/target.cfg" # source + + [ "${tree}" = "undefined" ] && \ + err "build/${project} %{target}: tree undefined" + [ "${arch}" = "undefined" ] && \ + err "build/${project} ${target}: undefined cpu type" + + codedir="${project}/${tree}" + [ -d "${codedir}" ] || \ + ./fetch_trees "${project}" "$target" || exit 1 + + # u-boot and coreboot are both compiled with coreboot's crossgcc + if [ "${project}" = "coreboot" ] || [ "${project}" = "u-boot" ]; then + [ "${mode}" != "all" ] || check_cross_compiler || err "crossgcc" + fi +} + +# set up cross-compiler (coreboot crossgcc) for u-boot and coreboot +# (seabios and grub currently use hostcc, not crossgcc) +check_cross_compiler() +{ + [ "${crossgcc_ada}" = "y" ] || [ "${crossgcc_ada}" = "n" ] || \ + crossgcc_ada="y" + [ "${crossgcc_ada}" != "y" ] && \ + export BUILD_LANGUAGES=c + + cbdir="coreboot/${tree}" + [ "${project}" != "coreboot" ] && \ + cbdir="coreboot/default" # not u-boot (e.g. linux will use it) + [ "${project}" = "u-boot" ] && \ + cbdir="coreboot/cros" # u-boot only used on coreboot/cros + # only true if not building coreboot: + [ -d "${cbdir}" ] || \ + ./fetch_trees coreboot ${cbdir#coreboot/} || \ + err "check_cross_compiler" + + if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then + if [ ! -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ]; then + # Even for 64-bit machines, coreboot builds 32-bit ROM + # images, so we only need to worry about i386-elf + make -C "${cbdir}" crossgcc-i386 CPUS=$(nproc) || \ + return 1 + fi + case "$(uname -m)" in + x86*|i*86|amd64) : ;; + *) export CROSS_COMPILE=i386-elf- ;; + esac + elif [ "${arch}" = "ARMv7" ]; then + if [ ! -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ]; then + make -C "${cbdir}" crossgcc-arm CPUS=$(nproc) || \ + return 1 + fi + case "$(uname -m)" in + arm|arm32|armv6*|armv7*) : ;; + *) export CROSS_COMPILE=arm-eabi- ;; + esac + elif [ "${arch}" = "AArch64" ]; then + if [ ! -d "${cbdir}/util/crossgcc/xgcc/aarch64-elf/" ]; then + make -C "${cbdir}" crossgcc-aarch64 CPUS=$(nproc) || \ + return 1 + fi + # aarch64 also needs armv7 toolchain for arm-trusted-firmware + if [ ! -d "${cbdir}/util/crossgcc/xgcc/arm-eabi/" ]; then + make -C "${cbdir}" crossgcc-arm CPUS=$(nproc) || \ + return 1 + fi + case "$(uname -m)" in + arm64|aarch64) : ;; + *) export CROSS_COMPILE=aarch64-elf- ;; + esac + fi + + # we *must* ensure that u-boot's build system uses crossgcc first + export PATH="$(pwd)/${cbdir}/util/crossgcc/xgcc/bin:$PATH" +} + +check_config() +{ + [ ! -f "${config}" ] && \ + err "build/${project} ${target}: configs missing" + + dest_dir="${elfdir}/${target}/${config_name}" + for elftest in "${dest_dir}"/*; do + if [ -f "${elftest}" ]; then + printf "Build already exists, so skipping build\n" 1>&2 + return 1 + fi + done + mkdir -p "${dest_dir}" +} + +run_make_command() +{ + make -C "${codedir}" distclean || err "run_make_command" + + cp "${config}" "${codedir}/.config" || err "run_make_command" + [ "${mode}" != "all" ] || make -C "${codedir}" silentoldconfig || \ + make -C "${codedir}" oldconfig || : # don't error on oldconfig + + [ "${project}" = "coreboot" ] && [ "${mode}" = "all" ] && \ + printf "%s\n" "${our_version}" > "${codedir}/.coreboot-version" + make -C "${codedir}" -j$(nproc) ${mode} || err "run_make_command" +} + +copy_elf() +{ + for f in $(cat "${listfile}"); do + [ -f "${codedir}/$f" ] && cp "${codedir}/${f}" "${dest_dir}/" + done + + make -C "${codedir}" distclean || \ + make -C "${codedir}" clean || err "copy_elf" +} + +err() +{ + [ -z "${codedir}" ] || \ + make -C "${codedir}" distclean \ + || make -C "${codedir}" clean || : + + printf "build/defconfig error %s\n" "${1}" 1>&2 + exit 1 +} + +main $@ diff --git a/resources/scripts/modify/defconfig/options b/resources/scripts/modify/defconfig/options deleted file mode 100755 index 2f5c2f61..00000000 --- a/resources/scripts/modify/defconfig/options +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env sh - -# -# helper script: update project configs (based on defconfig) -# -# Copyright (C) 2021, 2023 Leah Rowe -# Copyright (C) 2022 Ferass El Hafidi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -cfgsdir="" -mode="" -project="" - -main() -{ - while getopts m:u: option - do - case "${1}" in - -u) - mode="oldconfig" - shift ;; - -m) - mode="menuconfig" - shift ;; - *) - err "Invalid option" ;; - esac - project="${OPTARG}" - shift - done - [ -z "${mode}" ] && err "mode not given (-m menuconfig or -u oldconfig)" - cfgsdir="resources/${project}" - [ -f "${cfgsdir}/build.list" ] || err "Invalid project name given" - - printf "Updating %s configs using: make %s\n\n" "${project}" "${mode}" - - if [ $# -gt 0 ]; then - for target in "${@}"; do - configure_target "${target}" - done - else - for target in ${cfgsdir}/*; do - [ ! -d "${target}" ] && continue - configure_target "${target##*/}" - done - fi -} - -configure_target() -{ - target=${1} - - targetdir="${cfgsdir}/${target}" - - if [ ! -f "${targetdir}/target.cfg" ]; then - printf "\nmodify/defconfig %s: no target.cfg for %s. SKIP!\n" \ - "${project}" "${target}" - return 0 - fi - - tree="undefined" - . "${targetdir}/target.cfg" - [ "${tree}" = "undefined" ] && return 0 - - codedir="${project}/${tree}" - [ -d "${codedir}" ] || ./fetch_trees ${project} ${tree} || \ - err "cant download $project" - - for cfg in "${targetdir}/config/"*; do - [ ! -f "${cfg}" ] && continue - make distclean -BC "${codedir}" - - [ -f "${cfg}_" ] && err "${cfg}_ exists from old run" - cp "${cfg}" "${cfg}_" - - cp "${cfg}_" "${codedir}/.config" - make ${mode} -BC "${codedir}" - mv "${codedir}/.config" "${cfg}" - - make distclean -BC "${codedir}" - rm -f "${cfg}_" - done -} - -err() -{ - printf "ERROR: modify/defconfig: %s\n" "${1}" 1>&2 - exit 1 -} - -main $@ -- cgit v1.2.1