Update for bookworm (WIP)

Author: PeterJohnson

Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=debian:bullseye
+ARG BASE_IMAGE=debian:bookworm
 FROM ${BASE_IMAGE}
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ RUN apt-get -y update && \
         libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
         binfmt-support ca-certificates qemu-utils kpartx fdisk gpg pigz\
         crossbuild-essential-arm64 \
-        build-essential cmake python3 python3-distutils python3-jinja2 ant sudo openjdk-17-jdk \
+        build-essential cmake ninja-build protobuf-compiler python3 python3-distutils python3-jinja2 ant sudo openjdk-17-jdk \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /pi-gen/

build-docker.sh

@@ -95,7 +95,7 @@ fi
 # Modify original build-options to allow config file to be mounted in the docker container
 BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 
-${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}"
+${DOCKER} build --build-arg BASE_IMAGE=debian:bookworm -t pi-gen "${DIR}"
 
 if [ "${CONTAINER_EXISTS}" != "" ]; then
   DOCKER_CMDLINE_NAME="${CONTAINER_NAME}_cont"

deps/tools/configServer/src/Application.h

@@ -11,10 +11,7 @@
 #include <string_view>
 
 #include <wpi/Signal.h>
-
-namespace wpi {
-class json;
-}  // namespace wpi
+#include <wpi/json_fwd.h>
 
 class UploadHelper;
 

deps/tools/configServer/src/NetworkSettings.cpp

@@ -6,6 +6,7 @@
 
 #include <unistd.h>
 
+#include <bit>
 #include <string>
 #include <vector>
 
@@ -56,8 +57,8 @@ bool NetmaskToCidr(std::string_view netmask, unsigned int* cidr) {
   in_addr addr;
   if (wpi::uv::NameToAddr(netmask, &addr) != 0) return false;
   uint32_t hostAddr = ntohl(addr.s_addr);
-  auto leadingOnes = wpi::countLeadingOnes(hostAddr);
-  auto trailingZeros = wpi::countTrailingZeros(hostAddr);
+  auto leadingOnes = std::countl_one(hostAddr);
+  auto trailingZeros = std::countr_zero(hostAddr);
   if (leadingOnes + trailingZeros != 32) return false;
   *cidr = leadingOnes;
   return true;
@@ -123,19 +124,19 @@ static std::string BuildDhcpcdSetting(
       break;
     case NetworkSettings::kStatic:
       fmt::print(os, "interface {}\n", iface);
-      fmt::print(os, "static ip_address={}/{}\n", addressOut, cidr);
+      fmt::print(os, "static ip_address={}/{}\n", addressOut.str(), cidr);
       if (!gatewayOut.empty())
-        fmt::print(os, "static routers={}\n", gatewayOut);
+        fmt::print(os, "static routers={}\n", gatewayOut.str());
       if (!dnsOut.empty())
-        fmt::print(os, "static domain_name_servers={}\n", dnsOut);
+        fmt::print(os, "static domain_name_servers={}\n", dnsOut.str());
       break;
     case NetworkSettings::kDhcpStatic:
       fmt::print(os, "profile static_{}\n", iface);
-      fmt::print(os, "static ip_address={}/{}\n", addressOut, cidr);
+      fmt::print(os, "static ip_address={}/{}\n", addressOut.str(), cidr);
       if (!gatewayOut.empty())
-        fmt::print(os, "static routers={}\n", gatewayOut);
+        fmt::print(os, "static routers={}\n", gatewayOut.str());
       if (!dnsOut.empty())
-        fmt::print(os, "static domain_name_servers={}\n", dnsOut);
+        fmt::print(os, "static domain_name_servers={}\n", dnsOut.str());
       fmt::print(os, "interface {}\n", iface);
       fmt::print(os, "fallback static_{}\n", iface);
       break;

deps/tools/configServer/src/NetworkSettings.h

@@ -10,12 +10,9 @@
 #include <string_view>
 
 #include <wpi/Signal.h>
+#include <wpi/json_fwd.h>
 #include <wpinet/uv/Loop.h>
 
-namespace wpi {
-class json;
-}  // namespace wpi
-
 class NetworkSettings {
   struct private_init {};
 

deps/tools/configServer/src/RomiStatus.cpp

@@ -14,6 +14,7 @@
 #include <string_view>
 
 #include <fmt/format.h>
+#include <wpi/MemoryBuffer.h>
 #include <wpi/SmallString.h>
 #include <wpi/fmt/raw_ostream.h>
 #include <wpi/fs.h>
@@ -237,17 +238,18 @@ wpi::json RomiStatus::ReadRomiConfigFile(
     std::function<void(std::string_view)> onFail) {
   // Read config file
   std::error_code ec;
-  wpi::raw_fd_istream is(ROMI_JSON, ec);
+  std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
+      wpi::MemoryBuffer::GetFile(ROMI_JSON, ec);
 
-  if (ec) {
+  if (fileBuffer == nullptr || ec) {
     onFail("Could not read romi config file");
     fmt::print(stderr, "could not read {}\n", ROMI_JSON);
     return wpi::json();
   }
 
   wpi::json j;
   try {
-    j = wpi::json::parse(is);
+    j = wpi::json::parse(fileBuffer->GetCharBuffer());
   } catch(const wpi::json::parse_error& e) {
     onFail("Parse error in config file");
     fmt::print(stderr, "Parse error in {}: byte {}: {}\n", ROMI_JSON, e.byte,

deps/tools/configServer/src/RomiStatus.h

@@ -12,15 +12,12 @@
 
 #include <cscore.h>
 #include <wpi/Signal.h>
+#include <wpi/json_fwd.h>
 #include <wpinet/uv/Loop.h>
 
-namespace wpi {
-class json;
-
-namespace uv {
+namespace wpi::uv {
 class Buffer;
-}  // namespace uv
-}  // namespace wpi
+}  // namespace wpi::uv
 
 class RomiStatus {
   struct private_init {};

deps/tools/configServer/src/SystemStatus.h

@@ -8,13 +8,10 @@
 #include <memory>
 
 #include <wpi/Signal.h>
+#include <wpi/json_fwd.h>
 
 #include "DataHistory.h"
 
-namespace wpi {
-class json;
-}  // namespace wpi
-
 class SystemStatus {
   struct private_init {};
 

deps/tools/configServer/src/VisionSettings.cpp

@@ -5,6 +5,7 @@
 #include "VisionSettings.h"
 
 #include <fmt/format.h>
+#include <wpi/MemoryBuffer.h>
 #include <wpi/fs.h>
 #include <wpi/json.h>
 #include <wpi/raw_istream.h>
@@ -41,15 +42,17 @@ void VisionSettings::UpdateStatus() { status(GetStatusJson()); }
 
 wpi::json VisionSettings::GetStatusJson() {
   std::error_code ec;
-  wpi::raw_fd_istream is(FRC_JSON, ec);
-  if (ec) {
+  std::unique_ptr<wpi::MemoryBuffer> fileBuffer =
+      wpi::MemoryBuffer::GetFile(FRC_JSON, ec);
+
+  if (fileBuffer == nullptr || ec) {
     fmt::print(stderr, "could not read {}\n", FRC_JSON);
     return wpi::json();
   }
 
   try {
     wpi::json j = {{"type", "visionSettings"},
-                   {"settings", wpi::json::parse(is)}};
+                   {"settings", wpi::json::parse(fileBuffer->GetCharBuffer())}};
     return j;
   } catch (wpi::json::exception& e) {
     fmt::print(stderr, "could not parse {}\n", FRC_JSON);

deps/tools/configServer/src/VisionSettings.h

@@ -10,10 +10,7 @@
 #include <string_view>
 
 #include <wpi/Signal.h>
-
-namespace wpi {
-class json;
-}  // namespace wpi
+#include <wpi/json_fwd.h>
 
 class VisionSettings {
   struct private_init {};