diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-extended/wipe/files | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/wipe/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch | 36 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch new file mode 100644 index 0000000000..fac1b31dcc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +diff --git a/Makefile b/Makefile +index 9e74cdf..cad8109 100644 +--- a/Makefile ++++ b/Makefile +@@ -151,7 +151,7 @@ generic : + $(MAKE) $(TARGETS) "CC=$(CC_GENERIC)" "CCO=$(CCO_GENERIC)" "CCOC=$(CCOC_GENERIC)" + + wipe : $(OBJECTS) +- $(CC) $(CCO) $(OBJECTS) -o wipe ++ $(CC) $(CCO) $(LDFLAGS) $(OBJECTS) -o wipe + + wipe.o : wipe.c random.h misc.h version.h + $(CC) $(CCO) $(CCOC) wipe.c -o wipe.o diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch b/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch new file mode 100644 index 0000000000..fb3aee8067 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch @@ -0,0 +1,36 @@ +From 35f14bd5aba2ed6cee258e11eab42c408afc04d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 4 Nov 2015 02:29:05 -0500 +Subject: [PATCH] Makefile: support cross compile for linux + +Upstream-Status: Pending +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 17d9758..9e74cdf 100644 +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + # Linux 2.0.x + # + +-CC_LINUX=gcc ++CC_LINUX=$(CC) + CCO_LINUX=-Wall -DHAVE_DEV_URANDOM -DHAVE_OSYNC -DHAVE_STRCASECMP -DHAVE_RANDOM -DWEAK_RC6 -DSYNC_WAITS_FOR_SYNC -DFIND_DEVICE_SIZE_BY_BLKGETSIZE -DSIXTYFOUR -D__USE_LARGEFILE -D_FILE_OFFSET_BITS=64 + # default should be to turn off debugging and to turn on optimization. + #CCO_LINUX+=-O9 -pipe -fomit-frame-pointer -finline-functions -funroll-loops -fstrength-reduce +@@ -185,6 +185,7 @@ clean : + rm -f wipe $(OBJECTS) wipe.tr-asc.1 version.h + + install: +- install -m755 -o root -g root wipe $(DESTDIR)/usr/bin ++ [ -e $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir) ++ install -m755 -o root -g root wipe $(DESTDIR)$(bindir) + + .PHONY: always clean install +-- +1.9.1 + |