diff options
| author | Andrew Robbins <contact@andrewrobbins.info> | 2017-05-31 02:21:11 -0400 |
|---|---|---|
| committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-05-31 06:24:24 -0400 |
| commit | 1ea8d09af262ddeed87acf5916cec42d9a002da1 (patch) | |
| tree | 195dc287813bdf9ee8240092a56f19bbad68dd1e /projects/bucts/patches | |
| parent | 10aa44585ed4dd1495f47229daa2db4831694c9c (diff) | |
| download | librebootfr-1ea8d09af262ddeed87acf5916cec42d9a002da1.tar.gz librebootfr-1ea8d09af262ddeed87acf5916cec42d9a002da1.zip | |
Patching now works. bucts can be patched & built.
Modified the function git_project_patch_recursive (in libs/git) to
enable patching with diff files, which uses the new function
diff_patch_file located in libs/common. A generic action script for
bucts is in projects/bucts/. Install/revision/target files are in
projects/bucts/configs/. bucts' merge into the new build system should
be nearly, if not already, complete.
Diffstat (limited to 'projects/bucts/patches')
| -rw-r--r-- | projects/bucts/patches/0001-Makefile-don-t-use-git.patch | 24 | ||||
| -rw-r--r-- | projects/bucts/patches/staticlink.diff | 13 |
2 files changed, 37 insertions, 0 deletions
diff --git a/projects/bucts/patches/0001-Makefile-don-t-use-git.patch b/projects/bucts/patches/0001-Makefile-don-t-use-git.patch new file mode 100644 index 00000000..9a0e719c --- /dev/null +++ b/projects/bucts/patches/0001-Makefile-don-t-use-git.patch @@ -0,0 +1,24 @@ +From 63312528ea81207865077ab2c75963e3660859f0 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <info@minifree.org> +Date: Sat, 14 Feb 2015 00:56:43 +0000 +Subject: [PATCH] Makefile: don't use git + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 68541e6..b5f43d5 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + CC:=gcc + OBJ:=bucts.o +-VERSION:=$(shell git describe) ++VERSION:=withoutgit + + ifeq ($(shell uname), FreeBSD) + CFLAGS = -I/usr/local/include +-- +1.9.1 + diff --git a/projects/bucts/patches/staticlink.diff b/projects/bucts/patches/staticlink.diff new file mode 100644 index 00000000..52da8cc8 --- /dev/null +++ b/projects/bucts/patches/staticlink.diff @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 68541e6..b8579eb 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ endif + all: bucts + + bucts: $(OBJ) +- $(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci ++ $(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci -lz -static + + %.o: %.c + $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $< |