| Message ID | 1412310682-25979-1-git-send-email-trevor.woerner@linaro.org |
|---|---|
| State | New |
| Headers | show |
Yes, Ridish mentioned it yesterday, please raise it on gerrit -----Original Message----- From: Trevor Woerner <trevor.woerner@linaro.org> Date: Thursday, October 2, 2014 at 9:31 PM To: "Raj, Khem" <Khem_Raj@cable.comcast.com>, "Ra, Ridish" <RIDISH.RA@LNTTECHSERVICES.COM>, "Punnuru, Balaji" <Balaji_Punnuru@cable.comcast.com> Cc: "patches@linaro.org" <patches@linaro.org> Subject: [PATCH] sample media: include in image >Make sure the sample media files are included in the emulator image. > >Change-Id: If0fb65a08323f93f5dfd7903e41d2272a3a9478e >Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> >--- > conf/machine/include/qemux86-soc.inc | 2 +- > recipes-multimedia/samplemedia/comcast-samplemedia.bb | 1 + > recipes-multimedia/samplemedia/linaro-samplemedia.bb | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > > >Hi, > >I noticed that the sample media files from virtual/samplemedia aren't >being >included into the image. I'm proposing the following change to fix this. >The >last time I made a change to the comcast-samplemedia.bb recipe it didn't >work >and caused your builds to fail. Unfortunately there is no way for me to >test >this change from your point of view beforehand. > >Therefore I'm emailing this patch to you and hoping you can either look it >over or try building it before I submit it for inclusion. > >I'm sorry for breaking your build last time. I know everyone is very >busy, but >if someone who has access to the nexus server could give this patch a try >I'd >appreciate it. > >Thanks and best regards, > Trevor > > > > >diff --git a/conf/machine/include/qemux86-soc.inc >b/conf/machine/include/qemux86-soc.inc >index 2b05171..a4cacb7 100644 >--- a/conf/machine/include/qemux86-soc.inc >+++ b/conf/machine/include/qemux86-soc.inc >@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/iarmmgrs-hal = >"iarmmgrs-hal-emulator" > PREFERRED_PROVIDER_virtual/devicesettings-hal = >"devicesettings-hal-emulator" > > # Qemu / RDK Emulator config >-MACHINE_EXTRA_RDEPENDS += "vboxguestdrivers kernel-module-snd-intel8x0" >+MACHINE_EXTRA_RDEPENDS += "vboxguestdrivers kernel-module-snd-intel8x0 >virtual/samplemedia" > > APPEND_append_qemux86 = " quiet splash" >diff --git a/recipes-multimedia/samplemedia/comcast-samplemedia.bb >b/recipes-multimedia/samplemedia/comcast-samplemedia.bb >index a202a6e..1d3f6c5 100644 >--- a/recipes-multimedia/samplemedia/comcast-samplemedia.bb >+++ b/recipes-multimedia/samplemedia/comcast-samplemedia.bb >@@ -12,6 +12,7 @@ > SUMMARY = "Sample media for the RDK Browser" > LICENSE = "CLOSED" > PROVIDES = "virtual/samplemedia" >+RPROVIDES_${PN} = "virtual/samplemedia" > > SRC_URI += >"https://${NEXUS_RDKEMULATOR_BASE}/components/media/mpts/2.1/mpts-2.1.tgz; >name=mpts" > SRC_URI[mpts.md5sum] = "ca041f7a4a56fb5df1f9030f909ec9ba" >diff --git a/recipes-multimedia/samplemedia/linaro-samplemedia.bb >b/recipes-multimedia/samplemedia/linaro-samplemedia.bb >index 302d694..fe80e70 100644 >--- a/recipes-multimedia/samplemedia/linaro-samplemedia.bb >+++ b/recipes-multimedia/samplemedia/linaro-samplemedia.bb >@@ -4,6 +4,7 @@ SUMMARY = "Sample media for the RDK Browser" > LICENSE = "CC-BY-3.0" > LIC_FILES_CHKSUM = >"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629 >022e267f10b9c0a2ab7" > PROVIDES = "virtual/samplemedia" >+RPROVIDES_${PN} = "virtual/samplemedia" > > SRC_URI = >"http://samplemedia.linaro.org/MPEG2/big_buck_bunny_720p_MPEG2_MP2_25fps_3 >600K_short.MPG" > SRC_URI[md5sum] = "c15b6204f769588bf0641285eeec262f" >-- >1.8.4.5 > >
diff --git a/conf/machine/include/qemux86-soc.inc b/conf/machine/include/qemux86-soc.inc index 2b05171..a4cacb7 100644 --- a/conf/machine/include/qemux86-soc.inc +++ b/conf/machine/include/qemux86-soc.inc @@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/iarmmgrs-hal = "iarmmgrs-hal-emulator" PREFERRED_PROVIDER_virtual/devicesettings-hal = "devicesettings-hal-emulator" # Qemu / RDK Emulator config -MACHINE_EXTRA_RDEPENDS += "vboxguestdrivers kernel-module-snd-intel8x0" +MACHINE_EXTRA_RDEPENDS += "vboxguestdrivers kernel-module-snd-intel8x0 virtual/samplemedia" APPEND_append_qemux86 = " quiet splash" diff --git a/recipes-multimedia/samplemedia/comcast-samplemedia.bb b/recipes-multimedia/samplemedia/comcast-samplemedia.bb index a202a6e..1d3f6c5 100644 --- a/recipes-multimedia/samplemedia/comcast-samplemedia.bb +++ b/recipes-multimedia/samplemedia/comcast-samplemedia.bb @@ -12,6 +12,7 @@ SUMMARY = "Sample media for the RDK Browser" LICENSE = "CLOSED" PROVIDES = "virtual/samplemedia" +RPROVIDES_${PN} = "virtual/samplemedia" SRC_URI += "https://${NEXUS_RDKEMULATOR_BASE}/components/media/mpts/2.1/mpts-2.1.tgz;name=mpts" SRC_URI[mpts.md5sum] = "ca041f7a4a56fb5df1f9030f909ec9ba" diff --git a/recipes-multimedia/samplemedia/linaro-samplemedia.bb b/recipes-multimedia/samplemedia/linaro-samplemedia.bb index 302d694..fe80e70 100644 --- a/recipes-multimedia/samplemedia/linaro-samplemedia.bb +++ b/recipes-multimedia/samplemedia/linaro-samplemedia.bb @@ -4,6 +4,7 @@ SUMMARY = "Sample media for the RDK Browser" LICENSE = "CC-BY-3.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" PROVIDES = "virtual/samplemedia" +RPROVIDES_${PN} = "virtual/samplemedia" SRC_URI = "http://samplemedia.linaro.org/MPEG2/big_buck_bunny_720p_MPEG2_MP2_25fps_3600K_short.MPG" SRC_URI[md5sum] = "c15b6204f769588bf0641285eeec262f"
Make sure the sample media files are included in the emulator image. Change-Id: If0fb65a08323f93f5dfd7903e41d2272a3a9478e Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> --- conf/machine/include/qemux86-soc.inc | 2 +- recipes-multimedia/samplemedia/comcast-samplemedia.bb | 1 + recipes-multimedia/samplemedia/linaro-samplemedia.bb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) Hi, I noticed that the sample media files from virtual/samplemedia aren't being included into the image. I'm proposing the following change to fix this. The last time I made a change to the comcast-samplemedia.bb recipe it didn't work and caused your builds to fail. Unfortunately there is no way for me to test this change from your point of view beforehand. Therefore I'm emailing this patch to you and hoping you can either look it over or try building it before I submit it for inclusion. I'm sorry for breaking your build last time. I know everyone is very busy, but if someone who has access to the nexus server could give this patch a try I'd appreciate it. Thanks and best regards, Trevor