include/rom.sh: use ccache when building coreboot

ccache now required, in build dependencies

Signed-off-by: Leah Rowe <leah@libreboot.org>
quackboot
Leah Rowe 2024-07-21 07:39:47 +01:00
parent fd29c8fd1a
commit ab2a9c3709
10 changed files with 18 additions and 9 deletions

View File

@ -4,7 +4,7 @@ acpica arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
autogen base-devel bison cmake curl device-mapper doxygen \ autogen base-devel bison cmake curl device-mapper doxygen \
dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \ dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \
help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \ help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \
ncurses openssl p7zip \ ncurses openssl p7zip ccache \
pandoc parted pciutils perl perl-libwww python python-setuptools rsync \ pandoc parted pciutils perl perl-libwww python python-setuptools rsync \
sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib \ sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib \
" "

View File

@ -11,5 +11,5 @@ libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0 libusb-1.0-0-dev \
libusb-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted pciutils \ libusb-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted pciutils \
perl pkg-config python3 python3-distutils python3-pkg-resources python3-pycryptodome \ perl pkg-config python3 python3-distutils python3-pkg-resources python3-pycryptodome \
python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \ python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \
unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev \ unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev ccache \
" "

View File

@ -8,5 +8,5 @@ innoextract intltool libftdi-devel libselinux-devel libusb1 libusb1-devel \
nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \ nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \
pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \ pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \
python3-setuptools rsync sharutils subversion texinfo unar unifont \ python3-setuptools rsync sharutils subversion texinfo unar unifont \
unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel \ unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel ccache \
" "

View File

@ -9,5 +9,5 @@ libselinux-devel libusb1 libusb1-devel nasm ncurses-devel openssl-devel \
p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \ p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \ python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts \ subversion systemd-devel texinfo unar unifont unifont-fonts \
unifont-ttf-fonts unzip wget xz zlib-devel unifont-ttf-fonts unzip wget xz zlib-devel ccache
" "

View File

@ -7,5 +7,5 @@ help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \
ncurses openssl p7zip \ ncurses openssl p7zip \
pandoc parted pciutils perl perl-libwww python python-setuptools rsync \ pandoc parted pciutils perl perl-libwww python python-setuptools rsync \
sharutils subversion swig texinfo ttf-dejavu unarchiver unifont-utils unzip \ sharutils subversion swig texinfo ttf-dejavu unarchiver unifont-utils unzip \
wget xz zlib \ wget xz zlib ccache \
" "

View File

@ -5,7 +5,7 @@ bison build-essential cmake curl device-tree-compiler doxygen e2fsprogs efitools
flex gawk gcc-arm-linux-gnueabi gcc-arm-none-eabi gdb gettext git gnat help2man \ flex gawk gcc-arm-linux-gnueabi gcc-arm-none-eabi gdb gettext git gnat help2man \
innoextract libdevmapper-dev libfdt-dev libfont-freetype-perl libfreetype6-dev \ innoextract libdevmapper-dev libfdt-dev libfont-freetype-perl libfreetype6-dev \
libftdi-dev libfuse-dev libgnutls28-dev libgpiod-dev libjaylink-dev liblz4-tool \ libftdi-dev libfuse-dev libgnutls28-dev libgpiod-dev libjaylink-dev liblz4-tool \
liblzma-dev libncurses5-dev \ liblzma-dev libncurses5-dev ccache \
libncurses-dev libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev \ libncurses-dev libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev \
libpython3-dev libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 \ libpython3-dev libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 \
libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \ libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \

View File

@ -10,5 +10,5 @@ libpython3-dev libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 \
libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \ libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \
pciutils perl pkg-config python3 python3-distutils python3-pkg-resources \ pciutils perl pkg-config python3 python3-distutils python3-pkg-resources \
python3-pycryptodome python3-pyelftools python3-setuptools python-is-python3 \ python3-pycryptodome python3-pyelftools python3-setuptools python-is-python3 \
sharutils swig ttf-unifont unar unifont unzip uuid-dev wget zlib1g-dev \ sharutils swig ttf-unifont unar unifont unzip uuid-dev wget zlib1g-dev ccache \
" "

View File

@ -10,5 +10,5 @@ libpython3-dev libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 \
libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \ libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \
pciutils perl pkg-config python3 python3-pkg-resources python3-pycryptodome \ pciutils perl pkg-config python3 python3-pkg-resources python3-pycryptodome \
python3-pyelftools python3-setuptools python-is-python3 sharutils swig \ python3-pyelftools python3-setuptools python-is-python3 sharutils swig \
fonts-unifont unar unifont unzip uuid-dev wget zlib1g-dev \ fonts-unifont unar unifont unzip uuid-dev wget zlib1g-dev ccache \
" "

View File

@ -8,5 +8,5 @@ freetype freetype-devel fuse gawk gcc-ada gdb gettext gettext-devel git \
help2man innoextract libftdi1 libpciaccess libusb nasm ncurses \ help2man innoextract libftdi1 libpciaccess libusb nasm ncurses \
ncurses-devel openssl openssl-devel p7zip parted pciutils perl perl-LWP \ ncurses-devel openssl openssl-devel p7zip parted pciutils perl perl-LWP \
python python3 python3-setuptools rsync sharutils subversion texinfo \ python python3 python3-setuptools rsync sharutils subversion texinfo \
unar unzip wget xz zlib unar unzip wget xz zlib ccache
" "

View File

@ -23,11 +23,20 @@ mkpayload_grub()
mkvendorfiles() mkvendorfiles()
{ {
[ -z "$mode" ] && $dry cook_coreboot_config
check_cbfstool "$tree"; printf "69\n" > "$srcdir/.coreboot-version" \ check_cbfstool "$tree"; printf "69\n" > "$srcdir/.coreboot-version" \
|| $err "!cbver $srcdir"; [ -z "$mode" ] && \ || $err "!cbver $srcdir"; [ -z "$mode" ] && \
[ "$target" != "$tree" ] && x_ ./vendor download $target; return 0 [ "$target" != "$tree" ] && x_ ./vendor download $target; return 0
} }
cook_coreboot_config()
{
[ -f "$srcdir/.config" ] || return 0
printf "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || \
$err "$srcdir/.config: Could not enable ccache"
make -C "$srcdir" oldconfig || $err "Could not cook $srcdir/.config"; :
}
check_cbfstool() check_cbfstool()
{ {
[ "$badhash" = "n" ] || rm -f "elf/cbfstool/$1/cbfstool" || \ [ "$badhash" = "n" ] || rm -f "elf/cbfstool/$1/cbfstool" || \