From 20b903c771ca258e092df3767967b1ea225e3901 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Tue, 13 Jun 2023 21:29:51 +0200 Subject: [PATCH] Simplify systemd-timesyncd management. Buster was the only one with timesyncd shipped directly in systemd. --- generate-recipe.py | 4 ---- raspi_master.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/generate-recipe.py b/generate-recipe.py index e0fef2c..a83376f 100755 --- a/generate-recipe.py +++ b/generate-recipe.py @@ -104,9 +104,6 @@ else: # deb http://deb.debian.org/debian %s main %s """ % (backports_suite, firmware_component) -# Buster shipped timesyncd directly into systemd: -systemd_timesyncd = 'systemd-timesyncd' - gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ") buildtime = subprocess.getoutput("date --utc +'%Y-%m-%d %H:%M'") @@ -141,7 +138,6 @@ with open('raspi_master.yaml', 'r') as in_file: .replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \ .replace('__LINUX_IMAGE__', linux) \ .replace('__DTB__', dtb) \ - .replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \ .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \ .replace('__BLUETOOTH_FIRMWARE__', bluetooth_firmware) \ .replace('__SERIAL_CONSOLE__', serial) \ diff --git a/raspi_master.yaml b/raspi_master.yaml index 178e86c..bb3edc3 100644 --- a/raspi_master.yaml +++ b/raspi_master.yaml @@ -77,7 +77,7 @@ steps: - parted - ssh - wpasupplicant - - __SYSTEMD_TIMESYNCD__ + - systemd-timesyncd - __LINUX_IMAGE__ - raspi-firmware - __WIRELESS_FIRMWARE__