POMdev wrote:
> I don't know how to do this. I don't have an original file to diff with
> my modified file. What exactly should I diff?
>
> The best I can do for now is from the new edited File:
> poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass starting
> line 45/50:
>
> squeezeos_version() {
> echo "${DISTRO_RELEASE} r${@squeezeos_squeezeplay_revision(d)}"
> > ${IMAGE_ROOTFS}/etc/squeezeos.version
> echo `whoami`@`hostname` `date` >>
> ${IMAGE_ROOTFS}/etc/squeezeos.version
> echo "Base build revision: " "${METADATA_REVISION}" >>
> ${IMAGE_ROOTFS}/etc/squeezeos.version
> }
>
> line 48 was originally:
> echo "Base build revision: " ${METADATA_REVISION} >>
> ${IMAGE_ROOTFS}/etc/squeezeos.version
>
> This caused problems because ${METADATA_REVISION} had the value
> "<unknown>". When substituted by inclusion into
> home/squeezeos/poky/build/tmp-baby/work/baby-none-linux-gnueabi/squeezeos-image-1.0-r1/temp/log.do_configure.29941:
> echo "Base build revision: " <unknown> >>
> /home/squeezeos/poky/build/tmp-baby/rootfs/etc/squeezeos.version
> it resulted in a "line 202: syntax error near unexpected token `>>"
> fatal error.
>
> BTW, perhaps the problem lies earlier with the version functions
> returning "<unknown>" (I changed these to "(unknown)"), fixing my issue
> two ways.)
>
> New to poky and bitbake, etc., I don't know the source of this
> "poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass", so I need
> directions on how to do the diff you want.
That's ok, what you've provided is great, thanks.
For reference, running
git diff poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
from the squeezeos folder would produce the output below, which can be
redirected to a file.
Code:
--------------------
diff --git a/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
b/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
index 02d1caf6d..6bd1db7b4 100644
--- a/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
+++ b/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
@@ -45,5 +45,5 @@ addtask squeezeos_image after do_rootfs before do_build
squeezeos_version() {
echo "${DISTRO_RELEASE} r${@squeezeos_squeezeplay_revision(d)}" >
${IMAGE_ROOTFS}/etc/squeezeos.version
echo `whoami`@`hostname` `date` >> ${IMAGE_ROOTFS}/etc/squeezeos.version
- echo "Base build revision: " ${METADATA_REVISION} >>
${IMAGE_ROOTFS}/etc/squeezeos.version
+ echo "Base build revision: " "${METADATA_REVISION}" >>
${IMAGE_ROOTFS}/etc/squeezeos.version
}
--------------------
Ralphy
*1*-Touch, *5*-Classics, *3*-Booms, *2*-UE Radio
'Squeezebox client builds'
(https://sourceforge.net/projects/lmsclients/files/) 'donations'
(https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=LL5P6365KQEXN&lc=CA&item_name=Squeezebox%20client%20builds¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
always appreciated.
------------------------------------------------------------------------
ralphy's Profile: http://forums.slimdevices.com/member.php?userid=3484
View this thread: http://forums.slimdevices.com/showthread.php?t=111663
_______________________________________________
Radio mailing list
Radio@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/radio
