From 5a97297282699d6bb5e83c6b35a2fc7ba64649a6 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 25 May 2023 08:11:36 +0200 Subject: [PATCH] fiasco: gather patch files with sort + wildcard Using $(shell find $(REP_DIR)/patches -name *.patch) fails if the current working directory contains *.patch files due to shell wildcard expansion before execution. Additionally, the patch list was unstable because it was not sorted resulting in divergent hashes. --- repos/base-fiasco/ports/fiasco.hash | 2 +- repos/base-fiasco/ports/fiasco.port | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/base-fiasco/ports/fiasco.hash b/repos/base-fiasco/ports/fiasco.hash index 822c5efe57..f1ef205c25 100644 --- a/repos/base-fiasco/ports/fiasco.hash +++ b/repos/base-fiasco/ports/fiasco.hash @@ -1 +1 @@ -3cad5953cefcd6818145ea05f96bf7b37efa5024 +59024a8cc4daef24ba5c5eea8b5b7cde701247d4 diff --git a/repos/base-fiasco/ports/fiasco.port b/repos/base-fiasco/ports/fiasco.port index f268997e7f..a77c4e42f2 100644 --- a/repos/base-fiasco/ports/fiasco.port +++ b/repos/base-fiasco/ports/fiasco.port @@ -4,7 +4,7 @@ DOWNLOADS := fiasco.archive URL(fiasco) := http://downloads.sourceforge.net/project/genode/3rd/3rd_fiasco.tar.bz2 SHA(fiasco) := b5737901001e6ab09adecf03914c0a7e04f03a2d561e9b2c7a12f3c92edc7dd0 DIR(fiasco) := src/kernel/fiasco -PATCHES := $(shell find $(REP_DIR)/patches -name *.patch) +PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) PATCH_OPT := -p0 -d src/kernel/fiasco $(call check_tool,wget)