Skip to contentSkip to conversation

omxplayer: Add patch to fix host-user-contaminated QA

PATCH Applied Andrei Gherzan 1 participant 2 messages Feb 28, 2016 – Feb 29, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omxplayer: Add patch to fix host-user-contaminated QA

---
 .../don-t-preserve-file-attributes-when-cp.patch       | 18 ++++++++++++++++++
 recipes-multimedia/omxplayer/omxplayer_git.bb          |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch new file +18 -0
new file mode 100644
index 0000000..08df12e
@@ -0,0 +1,18 @@
+When running install (fakeroot) host-user-contaminated will fail because dist
+rule copies files while preserving file attributes like user ID.
+
+Upstream-Status: Submitted [https://github.com/popcornmix/omxplayer/pull/431]
+Signed-off-by: Andrei Gherzan <[email protected]>
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -87,5 +87,5 @@ dist: omxplayer.bin omxplayer.1
+ 	cp COPYING $(DIST)/usr/share/doc/omxplayer
+ 	cp README.md $(DIST)/usr/share/doc/omxplayer/README
+ 	cp omxplayer.1 $(DIST)/usr/share/man/man1
+-	cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
++	cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ 	tar -czf omxplayer-dist.tar.gz $(DIST)
+\ No newline at end of file
recipes-multimedia/omxplayer/omxplayer_git.bb +1 -0
index a0690a0..c8251fe 100644
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
            file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
            file://fix-tar-command-with-DIST.patch \
            file://use-native-pkg-config.patch \
+           file://don-t-preserve-file-attributes-when-cp.patch \
            "
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.7.0
author Applied
#1 lore raw
Quoted 37 lines · Andrei Gherzan
---
 .../don-t-preserve-file-attributes-when-cp.patch       | 18 ++++++++++++++++++
 recipes-multimedia/omxplayer/omxplayer_git.bb          |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch new file +18 -0
new file mode 100644
index 0000000..08df12e
@@ -0,0 +1,18 @@
+When running install (fakeroot) host-user-contaminated will fail because dist
+rule copies files while preserving file attributes like user ID.
+
+Upstream-Status: Submitted [https://github.com/popcornmix/omxplayer/pull/431]
+Signed-off-by: Andrei Gherzan <[email protected]>
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -87,5 +87,5 @@ dist: omxplayer.bin omxplayer.1
+ 	cp COPYING $(DIST)/usr/share/doc/omxplayer
+ 	cp README.md $(DIST)/usr/share/doc/omxplayer/README
+ 	cp omxplayer.1 $(DIST)/usr/share/man/man1
+-	cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
++	cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ 	tar -czf omxplayer-dist.tar.gz $(DIST)
+\ No newline at end of file
recipes-multimedia/omxplayer/omxplayer_git.bb +0 -0
index a0690a0..c8251fe 100644

recipes-multimedia/omxplayer/omxplayer_git.bb SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master · line 24

Quoted 7 lines
recipes-multimedia/omxplayer/omxplayer_git.bb +1 -0
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
            file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
            file://fix-tar-command-with-DIST.patch \
            file://use-native-pkg-config.patch \
+           file://don-t-preserve-file-attributes-when-cp.patch \
            "
 S = "${WORKDIR}/git"
 

Merged to master. Thank you.

--
Andrei Gherzan