From 00d8cdf92b68789c6a28a3368f514d313af81a7d Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sun, 19 Jan 2025 13:19:45 +0000 Subject: [PATCH] treewide: fix whitespace --- README.md | 1 - ...0001-Add-apple_set_os-EFI-boot-service.patch | 11 +++++------ hosts/library/README.md | 1 - hosts/mail/README.md | 1 - hosts/skycam/README.md | 1 - hosts/vps1/README.md | 1 - ...01-Update-device-ID-for-PreSonus-1824c.patch | 17 ++++++++--------- overlays/0001-Ignore-IPA-signing.patch | 7 +++---- .../0001-Remove-relative-config-lookups.patch | 17 ++++++++--------- .../0001-Disable-libdatachannel.patch | 5 ++--- 10 files changed, 26 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 8ff49e8..bef68f5 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,3 @@ tailscale up --login-server https://headscale.vimium.net then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key `. The new node can optionally be given a friendly name with `headscale node rename -i `. - diff --git a/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch b/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch index 386270a..4ae069d 100644 --- a/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch +++ b/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch @@ -15,7 +15,7 @@ index d5a8182cf..be722c43a 100644 @@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params) } } - + +typedef struct { + u64 version; + void (*set_os_version) (const char *os_version); @@ -73,13 +73,13 @@ index d5a8182cf..be722c43a 100644 + + return status; +} - + static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status) { @@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle, - + setup_unaccepted_memory(); - + + apple_set_os(); + status = exit_boot(boot_params, handle); @@ -97,6 +97,5 @@ index d59b0947f..81158014f 100644 #define EFI_TCG2_PROTOCOL_GUID EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f) #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) #define EFI_LOAD_FILE_PROTOCOL_GUID EFI_GUID(0x56ec3091, 0x954c, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) --- +-- 2.42.0 - diff --git a/hosts/library/README.md b/hosts/library/README.md index 3a50fb1..a0bc4ac 100644 --- a/hosts/library/README.md +++ b/hosts/library/README.md @@ -43,4 +43,3 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase ### Networks - DHCP on `10.0.1.0/24` subnet. - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`. - diff --git a/hosts/mail/README.md b/hosts/mail/README.md index 08ba3e0..0d7ec2c 100644 --- a/hosts/mail/README.md +++ b/hosts/mail/README.md @@ -15,4 +15,3 @@ NVMe | `/dev/sda1` (ext4, NixOS Root) ### Networks - DHCP on `10.0.1.0/24` subnet. - Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`. - diff --git a/hosts/skycam/README.md b/hosts/skycam/README.md index 29f932d..c1cfed8 100644 --- a/hosts/skycam/README.md +++ b/hosts/skycam/README.md @@ -26,4 +26,3 @@ To generate a compressed SD card image for Skycam, run: Once a card is imaged, the existing SSH host keys should be copied to `/etc/ssh` manually to enable secret decryption. - diff --git a/hosts/vps1/README.md b/hosts/vps1/README.md index f6f9f30..a87c2b7 100644 --- a/hosts/vps1/README.md +++ b/hosts/vps1/README.md @@ -15,4 +15,3 @@ NVMe | `/dev/sda1` (ext4, NixOS Root) ### Networks - DHCP on `10.0.1.0/24` subnet. - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`. - diff --git a/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch index 4bcb484..35a6425 100644 --- a/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch +++ b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch @@ -15,16 +15,16 @@ index ab5fed9f55b6..da50a4782414 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip, - + for (rate = min; rate <= max; rate += res) { - + - /* Filter out invalid rates on Presonus Studio 1810c */ - if (chip->usb_id == USB_ID(0x194f, 0x010c) && + /* Filter out invalid rates on Presonus Studio 1824c */ + if (chip->usb_id == USB_ID(0x194f, 0x010d) && !s1810c_valid_sample_rate(fp, rate)) goto skip_rate; - + diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 898bc3baca7b..c3135459c38c 100644 --- a/sound/usb/mixer_quirks.c @@ -32,7 +32,7 @@ index 898bc3baca7b..c3135459c38c 100644 @@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_rme_controls_create(mixer); break; - + - case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */ + case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */ err = snd_sc1810_init_mixer(mixer); @@ -44,7 +44,7 @@ index fac4bbc6b275..5bc2e66d452c 100644 +++ b/sound/usb/mixer_s1810c.c @@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer) return 0; - + dev_info(&dev->dev, - "Presonus Studio 1810c, device_setup: %u\n", chip->setup); + "Presonus Studio 1824c, device_setup: %u\n", chip->setup); @@ -64,8 +64,7 @@ index ab2b938502eb..b86832edaaa0 100644 + /* presonus studio 1824c: skip altsets incompatible with device_setup */ + if (chip->usb_id == USB_ID(0x194f, 0x010d)) return s1810c_skip_setting_quirk(chip, iface, altno); - - --- -2.42.0 + +-- +2.42.0 diff --git a/overlays/0001-Ignore-IPA-signing.patch b/overlays/0001-Ignore-IPA-signing.patch index 1c8cd66..bb78031 100644 --- a/overlays/0001-Ignore-IPA-signing.patch +++ b/overlays/0001-Ignore-IPA-signing.patch @@ -14,12 +14,11 @@ index 6d5bbd05..43004175 100644 @@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const if (data.empty()) return false; - + - bool valid = pubKey_.verify(data, ipa->signature()); + bool valid = true; - + LOG(IPAManager, Debug) << "IPA module " << ipa->path() << " signature is " --- +-- 2.44.1 - diff --git a/overlays/0001-Remove-relative-config-lookups.patch b/overlays/0001-Remove-relative-config-lookups.patch index 61a6e92..ace53cc 100644 --- a/overlays/0001-Remove-relative-config-lookups.patch +++ b/overlays/0001-Remove-relative-config-lookups.patch @@ -16,7 +16,7 @@ index f4e0b633..6d5bbd05 100644 @@ -131,22 +131,6 @@ IPAManager::IPAManager() << "No IPA found in '" << modulePaths << "'"; } - + - /* - * When libcamera is used before it is installed, load IPAs from the - * same build directory as the libcamera library itself. @@ -35,7 +35,7 @@ index f4e0b633..6d5bbd05 100644 - /* Finally try to load IPAs from the installed system path. */ ipaCount += addDir(IPA_MODULE_DIR); - + diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index 69975d8f..cd9284a3 100644 --- a/src/libcamera/ipa_proxy.cpp @@ -43,7 +43,7 @@ index 69975d8f..cd9284a3 100644 @@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name, } } - + - std::string root = utils::libcameraSourcePath(); - if (!root.empty()) { - /* @@ -74,12 +74,12 @@ index 69975d8f..cd9284a3 100644 - return confPath; - } } - + if (fallbackName.empty()) { @@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const } } - + - /* - * When libcamera is used before it is installed, load proxy workers - * from the same build directory as the libcamera directory itself. @@ -112,7 +112,7 @@ index 5ea2ca78..fd8555ca 100644 @@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir, struct stat statbuf; int ret; - + - std::string root = utils::libcameraSourcePath(); - if (!root.empty()) { - /* @@ -134,9 +134,8 @@ index 5ea2ca78..fd8555ca 100644 - } + confPath = std::string(LIBCAMERA_DATA_DIR) + + "/pipeline/" + subdir + '/' + name; - + ret = stat(confPath.c_str(), &statbuf); if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG) --- +-- 2.44.1 - diff --git a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch index 0c41498..4bf1a50 100644 --- a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch +++ b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch @@ -17,9 +17,8 @@ index d5029bd..e50ba1a 100644 USE_RTSP ?= $(shell pkg-config live555 && echo 1) -USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1) +USE_LIBDATACHANNEL ?= 0 - + ifeq (1,$(DEBUG)) CFLAGS += -g --- +-- 2.44.1 -