From 8856cfddb96537c1880afac9abac4b0113b1edd5 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 17 Mar 2014 16:06:46 +0100 Subject: [PATCH 1/6] make: don't ignore failures in for loops apply 9b61d95545446675ae136cf64f5c3af2d1cc6e22 to oonf_api --- pkg/oonf_api/0001-add-RIOT-support.patch | Bin 15045 -> 15054 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pkg/oonf_api/0001-add-RIOT-support.patch b/pkg/oonf_api/0001-add-RIOT-support.patch index 971a8a24a0c72b3a267ef97c8abeea86dc916e55..bbfe37dc7ce8a0fa7094c618863def29da81c4a4 100644 GIT binary patch delta 22 dcmX?FdaiUs5j$s1jY4WgW{HB~<|6iBV*qb-2!#Lu delta 12 TcmX?CdbD&y5&Pz9_F!WGDXRry From 740f43cb9911f233e38dd6b3099ce3efab9bee09 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 17 Mar 2014 16:14:11 +0100 Subject: [PATCH 2/6] remove trailing whitespaces --- pkg/oonf_api/0001-add-RIOT-support.patch | Bin 15054 -> 15021 bytes pkg/oonf_api/0002-port-tests-to-riot.patch | Bin 5925 -> 5913 bytes pkg/oonf_api/0003-port-example-to-riot.patch | Bin 2429 -> 2423 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pkg/oonf_api/0001-add-RIOT-support.patch b/pkg/oonf_api/0001-add-RIOT-support.patch index bbfe37dc7ce8a0fa7094c618863def29da81c4a4..7a297c9e8a90c60197d84362b6bb2f8c37fe1897 100644 GIT binary patch delta 180 zcmV;l089VQb**)9~1G7O6Is%ja4K=f|5P$=-G87mA zvr82@0h5ImbhG*vRRWV$8QznH79W#S8e_A!8hZi*3N0X$fD$5;yAd<9iyg=TlZhZP zvxOg@0+S^om6N+7mjenQAd~DP8MALAngp{7C>sHjCMi#|b}0e@0Sc3QD)5tRD_S%6F@o(n)yh}R29#_+xes`2J) fVghoIHEhlkn#aPgz@@9Jz-6dsp=YdT#Ki>wv#l2* diff --git a/pkg/oonf_api/0003-port-example-to-riot.patch b/pkg/oonf_api/0003-port-example-to-riot.patch index 20c862344c6cab74be4e8775759e7c4cec811db5..30737a5ece974338113d41282f5d1935af939a0d 100644 GIT binary patch delta 48 zcmew>^j&B}5HlN>wlWZGj$%$_+@yjGj4fPThI$ry#(G9vTmWwX B4V3@@ delta 57 zcmew^^jBy@5Hp7Ym$otxC~S^kPGw|N*u0m;l!;Mc@=gxD%?j)@fg(WW7H$PDLp=*U JV?84-E&#-z4oCn1 From 068b4746b07bb699d4f782aba485265f81eb0071 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 17 Mar 2014 16:18:29 +0100 Subject: [PATCH 3/6] silence git warning about detached head use reset --hard to check out the desired revision --- pkg/oonf_api/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile index 826f84b4ba..aa27fce085 100644 --- a/pkg/oonf_api/Makefile +++ b/pkg/oonf_api/Makefile @@ -31,7 +31,7 @@ $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME) $(CURDIR)/$(PKG_NAME)/: git clone $(PKG_URL) $@ && \ - cd $@ && git checkout $(PKG_VERSION) + cd $@ && git reset --hard $(PKG_VERSION) clean:: # Reset package to checkout state. From 86244410b5946df7cc9c9da4185c307d5f6584e0 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 17 Mar 2014 16:19:58 +0100 Subject: [PATCH 4/6] remove unnecessary comments from Makefile remove leftovers from the example Makefile, they are unnededly printed during the build --- pkg/oonf_api/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile index aa27fce085..42944c5642 100644 --- a/pkg/oonf_api/Makefile +++ b/pkg/oonf_api/Makefile @@ -20,13 +20,8 @@ all: patch make $(BINDIR)$(MODULE).a patch: $(CURDIR)/$(PKG_NAME)/Makefile - # Dependancy might be changed accordingly though we think the Makefile - # will be the first thing you want to change - # - # Here might not happen anything besides dependancy checks $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME) - # Here you apply your patch. $(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "../$(patch)";) $(CURDIR)/$(PKG_NAME)/: From 4dfce522df1795cabd8a1c59fc1fdbcf4b283362 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 18 Mar 2014 14:50:35 +0100 Subject: [PATCH 5/6] fix oonf_api build with GNU Make 4.0 fixes #884 --- pkg/oonf_api/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile index 42944c5642..316b48cd88 100644 --- a/pkg/oonf_api/Makefile +++ b/pkg/oonf_api/Makefile @@ -24,7 +24,7 @@ patch: $(CURDIR)/$(PKG_NAME)/Makefile $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME) $(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "../$(patch)";) -$(CURDIR)/$(PKG_NAME)/: +$(CURDIR)/$(PKG_NAME): git clone $(PKG_URL) $@ && \ cd $@ && git reset --hard $(PKG_VERSION) From 633f65c062457626d84d28231034e373a39ec310 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 18 Mar 2014 18:16:10 +0100 Subject: [PATCH 6/6] abort on error when patching oonf_api --- pkg/oonf_api/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile index 316b48cd88..b86ec884f4 100644 --- a/pkg/oonf_api/Makefile +++ b/pkg/oonf_api/Makefile @@ -22,7 +22,7 @@ all: patch patch: $(CURDIR)/$(PKG_NAME)/Makefile $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME) - $(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "../$(patch)";) + $(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "../$(patch)" || { git am --abort; exit 1; };) $(CURDIR)/$(PKG_NAME): git clone $(PKG_URL) $@ && \