diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-30 17:49:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-30 18:11:06 +0200 |
| commit | 5c1d9fe88d50d5491d8bdee3c0d5d7e32e16d4cf (patch) | |
| tree | e920c6bbaaef02b0ce7d0e489fd01d5fe3a22fed /patches | |
| parent | ba6f1e986317674222fbabee8d976e91271afce8 (diff) | |
| download | ptxdist-5c1d9fe88d50d5491d8bdee3c0d5d7e32e16d4cf.tar.gz ptxdist-5c1d9fe88d50d5491d8bdee3c0d5d7e32e16d4cf.tar.xz | |
bonnie++: cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 41 insertions, 4 deletions
diff --git a/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch index adf144f90..3d78119f8 100644 --- a/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch +++ b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch @@ -8,7 +8,7 @@ Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index f92f0ab8ea8f..f156f0b8d8c5 100644 +index f92f0ab8ea8f..015e8ba82e71 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,7 @@ void * thread_func(void * param) { return NULL; } @@ -25,8 +25,8 @@ index f92f0ab8ea8f..f156f0b8d8c5 100644 return 0; -}], large_file="yes") -if [[ -n "$large_file" ]]; then -+}], large_file="yes")) -+if [[ "x$bonnie_cv_sys_largefile" = "xyes" ]] || [[ -n "$large_file" ]]; then ++}], bonnie_cv_sys_largefile=yes, bonnie_cv_sys_largefile=no)) ++if [[ "x$bonnie_cv_sys_largefile" = "xyes" ]]; then large_file="#define _LARGEFILE64_SOURCE" fi diff --git a/patches/bonnie++-1.97/0002-use-DESTDIR-during-make-install.patch b/patches/bonnie++-1.97/0002-use-DESTDIR-during-make-install.patch new file mode 100644 index 000000000..0d7848bac --- /dev/null +++ b/patches/bonnie++-1.97/0002-use-DESTDIR-during-make-install.patch @@ -0,0 +1,36 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 30 Apr 2015 17:47:05 +0200 +Subject: [PATCH] use DESTDIR during 'make install' + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + Makefile.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 4f14819dd35c..14ac33ca54bb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o + $(LINK) generate_randfile.o -o generate_randfile + + install-bin: $(EXE) $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin +- @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin ++ mkdir -p $(eprefix)/bin $(DESTDIR)$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin ++ @INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin + + install: install-bin +- mkdir -p @mandir@/man1 @mandir@/man8 +- @INSTALL_DATA@ $(MAN1) @mandir@/man1 +- @INSTALL_DATA@ $(MAN8) @mandir@/man8 ++ mkdir -p @mandir@/man1 $(DESTDIR)@mandir@/man8 ++ @INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1 ++ @INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8 + + %.o: %.cpp + $(CXX) -c $< diff --git a/patches/bonnie++-1.97/series b/patches/bonnie++-1.97/series index 9b7237ceb..b34bb5c9b 100644 --- a/patches/bonnie++-1.97/series +++ b/patches/bonnie++-1.97/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-configure-cache-result-of-large-file-test.patch -# fed4790f562b273d16ba0fc3f085bb40 - git-ptx-patches magic +0002-use-DESTDIR-during-make-install.patch +# 484f49264861fb7df4a305cb4508383f - git-ptx-patches magic |