librem15v4 support + generic x86_64 for iso

config/buildroot/board/qemu/post-build.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-
-echo "post-build.sh was run"

config/buildroot/configs/airgap_x86_64_defconfig

@@ -87,7 +87,7 @@ BR2_BZCAT="bzcat"
 BR2_XZCAT="xzcat"
 BR2_LZCAT="lzip -d -c"
 BR2_TAR_OPTIONS=""
-BR2_DEFCONFIG="/home/build/build/buildroot/configs/librem13v4_x86_defconfig"
+BR2_DEFCONFIG="/home/build/build/buildroot/configs/x86_64_x86_defconfig"
 BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_HOST_DIR="$(BASE_DIR)/host"
 
@@ -335,9 +335,9 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 # BR2_TARGET_TZ_INFO is not set
 BR2_ROOTFS_USERS_TABLES=""
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_Airgap_PATH)/rootfs_overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_Airgap_PATH)/board/librem13v4/post-build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_Airgap_PATH)/board/x86_64/post-build.sh"
 BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_Airgap_PATH)/board/librem13v4/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_Airgap_PATH)/board/x86_64/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
 
 #
@@ -357,7 +357,7 @@ BR2_LINUX_KERNEL_PATCH=""
 # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
 # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_Airgap_PATH)/board/librem13v4/linux.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_Airgap_PATH)/board/x86_64/linux.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES=""
 BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH=""
 BR2_LINUX_KERNEL_BZIMAGE=y
@@ -3329,7 +3329,7 @@ BR2_TARGET_ROOTFS_CPIO_NONE=y
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_GRUB2=y
-BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_Airgap_PATH)/board/librem13v4/grub.cfg"
+BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_Airgap_PATH)/board/x86_64/grub.cfg"
 BR2_TARGET_ROOTFS_ISO9660_INITRD=y
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

scripts/build-fw

@@ -0,0 +1,11 @@
+#!/bin/bash
+[ -f /.dockerenv ] || { echo "please run in supplied container"; exit 1; }
+set -e; source environment
+
+devices=${DEVICES?}
+build_dir="${BUILD_DIR?}"
+heads_dir="${build_dir}/heads"
+
+for device in ${devices}; do
+	(cd "${heads_dir}"; make BOARD="$device")
+done

scripts/build-os

@@ -2,11 +2,7 @@
 [ -f /.dockerenv ] || { echo "please run in supplied container"; exit 1; }
 set -e; source environment
 
-target=${TARGET?}
 build_dir="${BUILD_DIR?}"
 buildroot_dir="${build_dir}/buildroot"
-heads_dir="${build_dir}/heads"
-
-(cd "${heads_dir}"; make BOARD="$TARGET")
 
 (cd "${buildroot_dir}"; make )

scripts/fetch

@@ -31,5 +31,5 @@ make source
 [ "$(ls -A "${heads_dir}")" ] \
 	|| git clone "$heads_repo" "$heads_dir"
 git -C "$heads_dir" checkout "$heads_ref"
-[ "$TARGET" == "librem13v4" ] \
+[[ "$DEVICES" =~ "librem" ]] \
 	&& (cd "$heads_dir/blobs/librem_kbl" && ./get_blobs.sh)