Organized configs a bit better, to keep customizations between boards better in sync. Not including repartd in rpi4 build since repartd is currently broken

Author: dereulenspiegel

configs/craftbeerpi_rpi3_defconfig

@@ -178,8 +178,6 @@ BR2_TOOLCHAIN_HAS_SYNC_8=y
 BR2_TOOLCHAIN_HAS_LIBATOMIC=y
 BR2_TOOLCHAIN_HAS_ATOMIC=y
 BR2_ROOTFS_SKELETON_DEFAULT=y
-BR2_TARGET_GENERIC_HOSTNAME="craftbeerpi"
-BR2_TARGET_GENERIC_ISSUE="Welcome to CraftBeerPi"
 BR2_TARGET_GENERIC_PASSWD_SHA256=y
 BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
 BR2_INIT_SYSTEMD=y
@@ -194,13 +192,11 @@ BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=n
 BR2_SYSTEM_DHCP="eth0"
 BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_GENERATE_LOCALE=""
 BR2_TARGET_TZ_INFO=y
 BR2_TARGET_TZ_ZONELIST="default"
 BR2_TARGET_LOCALTIME="Etc/UTC"
 BR2_ROOTFS_USERS_TABLES=""
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/rootfs-overlay"
 BR2_ROOTFS_PRE_BUILD_SCRIPT=""
 BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
 BR2_ROOTFS_POST_SCRIPT_ARGS=""
@@ -255,7 +251,6 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
-BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt"
 BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
 BR2_PACKAGE_CPUBURN_ARM_ARCH_SUPPORTS=y
 BR2_PACKAGE_DBUS=y
@@ -377,7 +372,6 @@ BR2_PACKAGE_SYSTEMD_HOSTNAMED=y
 BR2_PACKAGE_SYSTEMD_HWDB=y
 BR2_PACKAGE_SYSTEMD_MYHOSTNAME=y
 BR2_PACKAGE_SYSTEMD_NETWORKD=y
-BR2_PACKAGE_SYSTEMD_REPART=n
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_TIMEDATED=y
 BR2_PACKAGE_SYSTEMD_TIMESYNCD=y
@@ -437,12 +431,20 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES=0
 BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=0
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
+# Customization
+BR2_PACKAGE_SYSTEMD_REPART=n
+BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt"
+BR2_TARGET_GENERIC_HOSTNAME="craftbeerpi"
+BR2_TARGET_GENERIC_ISSUE="Welcome to CraftBeerPi"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/rootfs-overlay"
+BR2_ENABLE_LOCALE_WHITELIST="C en_US de_DE"
 BR2_PACKAGE_F2FS_TOOLS=y
 BR2_TARGET_ENABLE_ROOT_LOGIN=n
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/raspberrypi3-64/post-image.sh"
 BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/usertable"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/raspberrypi3-64/kernel.config"
+# CraftBeerPi
 BR2_PACKAGE_CRAFTBEERPI=y
 BR2_PACKAGE_CRAFTBEERPI_UI=y
 BR2_PACKAGE_CBPI4_BUZZER=y
@@ -456,6 +458,7 @@ BR2_PACKAGE_CBPI4_PIDBOIL=y
 BR2_PACKAGE_CBPI4_PIDHERMS=y
 BR2_PACKAGE_CBPI4_PT100X=y
 BR2_PACKAGE_CBPI4_SYSTEM=y
+# Networking
 BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_AUTOIPD=n

configs/craftbeerpi_rpi4_defconfig

@@ -188,8 +188,6 @@ BR2_TOOLCHAIN_HAS_SYNC_8=y
 BR2_TOOLCHAIN_HAS_LIBATOMIC=y
 BR2_TOOLCHAIN_HAS_ATOMIC=y
 BR2_ROOTFS_SKELETON_DEFAULT=y
-BR2_TARGET_GENERIC_HOSTNAME="craftbeerpi"
-BR2_TARGET_GENERIC_ISSUE="Welcome to CraftBeerPi"
 BR2_TARGET_GENERIC_PASSWD_SHA256=y
 BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
 BR2_INIT_SYSTEMD=y
@@ -206,13 +204,11 @@ BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_GENERATE_LOCALE=""
 BR2_TARGET_TZ_INFO=y
 BR2_TARGET_TZ_ZONELIST="default"
 BR2_TARGET_LOCALTIME="Etc/UTC"
 BR2_ROOTFS_USERS_TABLES=""
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/rootfs-overlay"
 BR2_ROOTFS_PRE_BUILD_SCRIPT=""
 BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
 BR2_ROOTFS_POST_SCRIPT_ARGS=""
@@ -266,7 +262,6 @@ BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y
 BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
-BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt"
 BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
 BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_PROVIDES_UDEV="systemd"
@@ -391,7 +386,6 @@ BR2_PACKAGE_SYSTEMD_HOSTNAMED=y
 BR2_PACKAGE_SYSTEMD_HWDB=y
 BR2_PACKAGE_SYSTEMD_MYHOSTNAME=y
 BR2_PACKAGE_SYSTEMD_NETWORKD=y
-BR2_PACKAGE_SYSTEMD_REPART=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_TIMEDATED=y
 BR2_PACKAGE_SYSTEMD_TIMESYNCD=y
@@ -454,14 +448,20 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES=0
 BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=0
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
-
+# Customization
+BR2_PACKAGE_SYSTEMD_REPART=n
+BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt"
+BR2_TARGET_GENERIC_HOSTNAME="craftbeerpi"
+BR2_TARGET_GENERIC_ISSUE="Welcome to CraftBeerPi"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/rootfs-overlay"
+BR2_ENABLE_LOCALE_WHITELIST="C en_US de_DE"
 BR2_PACKAGE_F2FS_TOOLS=y
 BR2_TARGET_ENABLE_ROOT_LOGIN=n
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/raspberrypi4-64/post-image.sh"
 BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/common/usertable"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CRAFTBEERPI_PATH)/board/raspberrypi4-64/kernel.config"
-
+# CraftBeerPi
 BR2_PACKAGE_CRAFTBEERPI=y
 BR2_PACKAGE_CRAFTBEERPI_UI=y
 BR2_PACKAGE_CBPI4_BUZZER=y
@@ -475,7 +475,7 @@ BR2_PACKAGE_CBPI4_PIDBOIL=y
 BR2_PACKAGE_CBPI4_PIDHERMS=y
 BR2_PACKAGE_CBPI4_PT100X=y
 BR2_PACKAGE_CBPI4_SYSTEM=y
-
+# Networking
 BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_AUTOIPD=n