sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rt-tests: fix redo install error 

Currently gzip on host is used. If host gzip is provided by pigz, it
fails to redo install that pigz can't handle the option after file name.
When run command for target install in Makefile:

gzip src/backfire/backfire.4 -c > OUTPUT_FILE

File src/backfire/backfire.4 is zipped into backfire.4.gz but the
OUTPUT_FILE is empty. When rerun do_install, it shows warning:

| gzip: src/backfire/backfire.4 does not exist -- skipping

and empty manual gzip files are created:

$ file image/usr/share/man/man4/backfire.4.gz
image/usr/share/man/man4/backfire.4.gz: empty

Fix it by putting option '-c' before the file name.

(From OE-Core rev: a172c208c821af7f9527fe25f337f51c52ba8793)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang 2015-08-04 11:25:35 +08:00 committed by Richard Purdie
parent 44bbb402af
commit 800ebee9c5
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch Normal file
View File

@ -0,0 +1,48 @@
Currently gzip on host is used. If host gzip is provided by pigz, it fails to
redo install that pigz can't handle the option after file name. When run:
gzip src/backfire/backfire.4 -c > OUTPUT_FILE
File src/backfire/backfire.4 is zipped into backfire.4.gz but the OUTPUT_FILE
is empty. When rerun do_install, it shows warning:
| gzip: src/backfire/backfire.4 does not exist -- skipping
and empty manual gzip files are created:
$ file image/usr/share/man/man4/backfire.4.gz
image/usr/share/man/man4/backfire.4.gz: empty
Fix it by putting option '-c' before the file name.
Upstream-Status: Pending
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
--- git/Makefile.orig 2014-11-14 15:47:26.406638419 +0800
+++ git/Makefile 2014-11-14 15:46:53.890637533 +0800
@@ -127,15 +127,15 @@
cp $(TARGETS) "$(DESTDIR)$(bindir)"
install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
- gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
- gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
- gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
- gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
- gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
- gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
- gzip src/pmqtest/pmqtest.8 -c >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
- gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
- gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
+ gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
+ gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
+ gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
+ gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
+ gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
+ gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
+ gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
+ gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
+ gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
.PHONY: install_hwlatdetect
install_hwlatdetect: hwlatdetect

1
meta/recipes-rt/rt-tests/rt-tests.inc
View File

@ -8,6 +8,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
file://added-missing-dependencies.patch \
file://hackbench-fix-error-check.patch \
file://Makefile-fix-gzip-command.patch \
file://fix-re-install-failure.patch \
"
S = "${WORKDIR}/git"