[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Minios-devel] [UNIKRAFT PATCH] build: use -p1 instead of -p0 in patch command



Hey Yuri,

I will take it, your arguments are reasonable and may make it easier to produce patch files. Can you update the documentation with the v2 of this patch, too [doc/guides/developers-app.rst]?

Thanks,

Simon

On 11.06.2018 23:30, Yuri Volchkov wrote:
The -p1 is more commonly used. And, what is more important, this is
the way git generates patches.

Getting unikraft build system compatible with git patches will save as
some headache in the feature. Better to change it now, before we got
tremendous amount of external libs.

Signed-off-by: Yuri Volchkov <yuri.volchkov@xxxxxxxxx>
---
  support/build/Makefile.rules | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
index 0fee0d7..844cb4b 100644
--- a/support/build/Makefile.rules
+++ b/support/build/Makefile.rules
@@ -237,7 +237,7 @@ define patch =
  $(BUILD_DIR)/$(1)/.patched: $(BUILD_DIR)/$(1)/.origin
        @$(foreach P,$(sort $(wildcard $(2)/*)), \
          $(call verbose_cmd_inner,PATCH,$(1)':' $(notdir $(P)), \
-         $(PATCH) -sd $(BUILD_DIR)/$(1)/origin/$(3)/ -p0 < $(P)) &&)\
+         $(PATCH) -sd $(BUILD_DIR)/$(1)/origin/$(3)/ -p1 < $(P)) &&)\
        $(TOUCH) $(BUILD_DIR)/$(1)/.patched
  UK_FETCH-y += $(BUILD_DIR)/$(1)/.patched
  endef


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.