Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiP: all boards: CONFIG_CRYPTESTUP changed to CONFIG_CRYPTSETUP2. #1124

Closed
wants to merge 3 commits into from
Closed

WiP: all boards: CONFIG_CRYPTESTUP changed to CONFIG_CRYPTSETUP2. #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0fab00
WiP: Pass all modules from O2 to Os to optimize for space.
tlaurion Feb 21, 2022
f30c576
all boards: CONFIG_CRYPTESTUP changed to CONFIG_CRYPTSETUP2.
tlaurion Feb 23, 2022
2a1fe47
CircleCI cache: have all cache layers caching packages directory.
tlaurion Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,19 @@ jobs:
#CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
key: heads-musl-cross-{{ checksum "./tmpDir/musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
paths:
- packages
- crossgcc
- build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
- save_cache:
#Generate cache for the same coreboot mnd musl-cross-make modules definition if hash is not previously existing
#CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
key: heads-coreboot-musl-cross-{{ checksum "./tmpDir/coreboot_musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
paths:
- packages
- build/coreboot-4.11
- build/coreboot-4.13
- build/coreboot-4.14
- build/coreboot-4.15
- crossgcc
- build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
- save_cache:
#Generate cache for the exact same modules definitions if hash is not previously existing
key: heads-modules-and-patches-{{ checksum "./tmpDir/all_modules_and_patches.sha256sums" }}{{ .Environment.CACHE_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export CONFIG_LINUX_VERSION=5.10.5
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/kgpe-d16_server/kgpe-d16_server.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export CONFIG_LINUX_VERSION=5.10.5
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export CONFIG_LINUX_VERSION=5.10.5
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/kgpe-d16_workstation/kgpe-d16_workstation.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export CONFIG_LINUX_VERSION=5.10.5
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/leopard/leopard.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CONFIG_ZLIB=n
CONFIG_MUSL=n
else
# These don't fit if u-root is turned on
#CONFIG_CRYPTSETUP=y
#CONFIG_CRYPTSETUP2=y
#CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
#CONFIG_GPG=y
Expand Down
2 changes: 1 addition & 1 deletion boards/qemu-linuxboot/qemu-linuxboot.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
ifeq "$(CONFIG_UROOT)" "y"
CONFIG_BUSYBOX=n
else
CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_PCIUTILS=y
Expand Down
2 changes: 1 addition & 1 deletion boards/r630/r630.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config

export CONFIG_LINUX_VERSION=4.14.62

#CONFIG_CRYPTSETUP=y
#CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
#CONFIG_GPG=y
CONFIG_KEXEC=y
Expand Down
2 changes: 1 addition & 1 deletion boards/s2600wf/s2600wf.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config

export CONFIG_LINUX_VERSION=4.14.62

#CONFIG_CRYPTSETUP=y
#CONFIG_CRYPTSETUP2=y
#CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t520-hotp-maximized/t520-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t520-maximized/t520-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-dgpu-maximized/t530-dgpu-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-hotp-maximized/t530-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/t530-maximized/t530-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/tioga/tioga.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CONFIG_ZLIB=n
CONFIG_MUSL=n
else
# These don't fit if u-root is turned on
#CONFIG_CRYPTSETUP=y
#CONFIG_CRYPTSETUP2=y
#CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
#CONFIG_GPG=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-hotp-maximized/w530-hotp-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/w530-maximized/w530-maximized.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

CONFIG_CRYPTSETUP=y
CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
Expand Down
2 changes: 1 addition & 1 deletion boards/winterfell/winterfell.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CONFIG_ZLIB=n
CONFIG_MUSL=n
else
# These don't fit if u-root is turned on
#CONFIG_CRYPTSETUP=y
#CONFIG_CRYPTSETUP2=y
#CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG=y
Expand Down
1 change: 1 addition & 0 deletions modules/busybox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ busybox_config := config/busybox.config
busybox_output := busybox
busybox_target := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
$(MAKE_JOBS) \

# Install symlinks when the busybox program is installed
Expand Down
2 changes: 1 addition & 1 deletion modules/cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cairo_hash := 8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16

cairo_configure := \
$(CROSS_TOOLS) \
CFLAGS="-DCAIRO_NO_MUTEX=1 -O3" \
CFLAGS="-DCAIRO_NO_MUTEX=1 -Os" \
./configure \
--host i386-elf-linux \
--prefix="/" \
Expand Down
4 changes: 3 additions & 1 deletion modules/cryptsetup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ cryptsetup_hash := af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6ad

# Use an empty prefix so that the executables will not include the
# build path.
cryptsetup_configure := ./configure \
cryptsetup_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
./configure \
--host i386-elf-linux \
--prefix "/" \
--disable-gcrypt-pbkdf2 \
Expand Down
1 change: 1 addition & 0 deletions modules/cryptsetup2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cryptsetup2_hash := 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e
# build path.
cryptsetup2_configure := ./configure \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
--host i386-elf-linux \
--prefix "/" \
--disable-rpath \
Expand Down
1 change: 1 addition & 0 deletions modules/flashrom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ flashrom_url := https://github.com/flashrom/flashrom/archive/$(flashrom_version)
flashrom_hash := 4873ad50f500629c244fc3fbee64b56403a82307d7f555dfa235336a200c336c

flashrom_target := \
CFLAGS="-Os" \
$(MAKE_JOBS) \
$(CROSS_TOOLS) \
WARNERROR=no \
Expand Down
1 change: 1 addition & 0 deletions modules/gpg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ gpg_hash := 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276
#
gpg_configure := ./configure \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
--build i386-elf-linux \
--host x86_64-linux-musl \
--with-libusb="$(INSTALL)" \
Expand Down
1 change: 1 addition & 0 deletions modules/libgcrypt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ libgcrypt_hash := 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b9

libgcrypt_configure := ./configure \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
--host=x86_64-linux-musl \
--prefix "/" \
--disable-static \
Expand Down
4 changes: 3 additions & 1 deletion modules/libgpg-error
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ libgpg-error_tar := libgpg-error-$(libgpg-error_version).tar.bz2
libgpg-error_url := https://gnupg.org/ftp/gcrypt/libgpg-error/$(libgpg-error_tar)
libgpg-error_hash := b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763

libgpg-error_configure := ./configure \
libgpg-error_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
./configure \
--prefix "/" \
--host=x86_64-linux-musl \
--disable-static \
Expand Down
1 change: 1 addition & 0 deletions modules/libpng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ libpng_hash := 574623a4901a9969080ab4a2df9437026c8a87150dfd5c235e28c94b212964a7

libpng_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
./configure \
--host i386-elf-linux \
--prefix="/" \
Expand Down
1 change: 1 addition & 0 deletions modules/lvm2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ lvm2_hash := 23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d
# so we force it via the configure cache.
lvm2_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
PKG_CONFIG=/bin/false \
MODPROBE_CMD=/bin/false \
ac_cv_func_malloc_0_nonnull=yes \
Expand Down
1 change: 1 addition & 0 deletions modules/pixman
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ pixman_hash := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e

pixman_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
./configure \
--host i386-elf-linux \
--prefix="/" \
Expand Down
2 changes: 1 addition & 1 deletion modules/tpmtotp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tpmtotp_hash := 1082f2b0e4af833e04220dddedcc21a39eb39ee4dc5668bb010e7bcc795c606c

tpmtotp_target := \
$(CROSS_TOOLS) \
CFLAGS="-I$(INSTALL)/include" \
CFLAGS="-I$(INSTALL)/include -Os" \
LDFLAGS="-L$(INSTALL)/lib" \

tpmtotp_output := \
Expand Down
1 change: 1 addition & 0 deletions modules/util-linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ util-linux_hash := accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe

util-linux_configure := ./configure \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
--host i386-elf-linux \
--prefix "/" \
--oldincludedir "$(INSTALL)/include" \
Expand Down
1 change: 1 addition & 0 deletions modules/zlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ zlib_hash := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1

zlib_configure := \
$(CROSS_TOOLS) \
CFLAGS="-Os" \
./configure \
--prefix="/" \

Expand Down