28 replies to this topic

[yousif666]

Hi

I would like to know the right way to make changes in enigma2 i know that the folder is /tmp/work/dm500hd-oe-linux/../git/data

there i see all the enigma2 files so now i would like to make changed i just make the changes there and then bitbake -D enigma2 and then bitbake openpli-enigma2-image ??


also i know that i have to make patch file and i have to put that patch file in /enigma2/enigma2 and call it in enigma2.bb.

and for the patch file i make diff -Naur menu.xml for example i dont know where i direct the file to?

i saw this post and i tried to do the same but it didn't work for me.

http://www.pli-images.org/forum/viewthread.php?forum_id=48&thread_id=11476&pid=120194#post_120194

[andyblac]

hi

do a

diff -Naur menu.xml.orig menu.xml >menu.xml.patch

then make sure the to file headers in the patch file are pointing the file to patch ie

--- /data/menu.xml.orig    2010-07-28 14:13:01.000000000 +0100
+++ /data/menu.xml    2010-08-29 10:42:28.000000000 +0100

then just call it in the enigma2.bb as

SRC_URI = "git://openpli.git.sourceforge.net/gitroot/openpli/enigma2;protocol=git \
		 file://menu.xml.patch"

hope it helps

Andy.

Hi

I would like to know the right way to make changes in enigma2 i know that the folder is /tmp/work/dm500hd-oe-linux/../git/data

there i see all the enigma2 files so now i would like to make changed i just make the changes there and then bitbake -D enigma2 and then bitbake openpli-enigma2-image ??


also i know that i have to make patch file and i have to put that patch file in /enigma2/enigma2 and call it in enigma2.bb.

and for the patch file i make diff -Naur menu.xml for example i dont know where i direct the file to?

i saw this post and i tried to do the same but it didn't work for me.

http://www.pli-images.org/forum/viewthread.php?forum_id=48&thread_id=11476&pid=120194#post_120194

[yousif666]

Thanks alot andy but i have a question, now i cd to /data folder and there i run the command diff -Naur menu.xml.orig menu.xml >menu.xml.patch right ???? and then i copy the menu.xml.patch to enigma2/enigma2 folder right ?

[andyblac]

Thanks alot andy but i have a question, now i cd to /data folder and there i run the command diff -Naur menu.xml.orig menu.xml >menu.xml.patch right ???? and then i copy the menu.xml.patch to enigma2/enigma2 folder right ?

correct , just make sure the file headers in the patch file match the ones i posted above

[yousif666]

I have 1 more question.

when i go to /tmp/work/dm500hd-oe-linux

i go to enigma2-2.7+git0+7e3d9dec732abba8aa238c1170dc3a29a2e09b28-r26

and enigma2-2.7+git0+b6d08ae589550c6e96c5c61acdfee4bfec0bea28-r26

and also i went to openpli-enigma2-image-1.0-r0

but all i see is temp folder i dont see the git folder to enter it and there should be the data folder i dont know why i dont have the other files, i did built the image with bitbake openpli-enigma2-image

and its in deploy/images/dm500hd

[pieterg]

remove rm_work from your local.conf

[yousif666]

Thanks alot

[andyblac]

or just do a

bitbake -c fetch enigma2

then

bitbake -c clean enigma2

when ready to test patch and rebuild

[yousif666]

I saw few patch files have a/ and /b

for example:

in the top of the patch file:

diff --git a/mytube/src/plugin.py b/mytube/src/plugin.py
index 8f9c71d..4420fe2 100755
--- a/mytube/src/plugin.py
+++ b/mytube/src/plugin.py

what does the a and b mean and the diff --git ??

[xener]

first line is command which made diff file, a is old and b is new file.

man diff

[yousif666]

Yes i know this but the a folder and b folder i have to create and put the original files in a and the modified files in b?

because i see diff --git

what does this mean? in alot of patch files i see the a and b i still dont understand how its created by it self or i have to create it.

[ims]

Yes i know this but the a folder and b folder i have to create and put the original files in a and the modified files in b?

because i see diff --git

what does this mean? in alot of patch files i see the a and b i still dont understand how its created by it self or i have to create it.

Try this in some your dir:

git clone git://openpli.git.sourceforge.net/gitroot/openpli/enigma2 => will be downloaded source files ( "a")

then edit some files or replace it

then: git add files => after adding it will be "b"

after it you can see, what will be commited with: git diff HEAD

or you can continue with:
git commit
git format-patch HEAD~

[yousif666]

ok i saw the modified files but where i can find the diff file (patch) file with my edited things??

when i run the command git diff HEAD

i see the edits i made

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezone
diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezone
index 7f70915..97cf11a 100644
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -56,7 +56,7 @@ class Timezones:

	   def getDefaultTimezone(self):
			 # TODO return something more useful - depending on country-setti
-			t = "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
+			t = "(GMT+03:00) Kuwait, Riyadh"
			 for (a,b) in self.timezones:
				    if a == t:
						  return a
diff --git a/lib/python/Components/VolumeControl.py b/lib/python/Components/Volu
index e28a7cd..a4c4c4d 100644
--- a/lib/python/Components/VolumeControl.py
+++ b/lib/python/Components/VolumeControl.py
@@ -21,7 +21,7 @@ class VolumeControl:
			 VolumeControl.instance = self

			 config.audio = ConfigSubsection()
-			config.audio.volume = ConfigInteger(default = 50, limits = (0, 1
+			config.audio.volume = ConfigInteger(default = 70, limits = (0, 1

			 self.volumeDialog = session.instantiateDialog(Volume)
			 self.muteDialog = session.instantiateDialog(Mute)

but i dont know where i can find the patch file.and also i cant find folder "b" with the files i modified

[ims]

after "git format-patch HEAD~" will be your patch created in directory, whre was stored files with "git clone git://openpli.git.sourceforge.net/gitroot/openpli/enigma2"

[yousif666]

When i run "git format-patch HEAD~" i get this

0001-servicem2ts-Skip-when-libpassthrough-is-not-present.patch

[ims]

yes, this is your patch.

[yousif666]

this is strange i opened it and my changes are not in this file

this is what in the patch file.

From 541e4edf53c690e5bdde7b29c6b48a9d8c893fcd Mon Sep 17 00:00:00 2001
From: Mike Looijmans <milo-software@users.sourceforge.net>
Date: Fri, 4 Mar 2011 20:21:31 +0100
Subject: [PATCH] servicem2ts: Skip when libpassthrough is not present

---
 lib/service/servicem2ts.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/lib/service/servicem2ts.cpp b/lib/service/servicem2ts.cpp
index e79907d..5ab5b86 100644
--- a/lib/service/servicem2ts.cpp
+++ b/lib/service/servicem2ts.cpp
@@ -1,3 +1,5 @@
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 #include <lib/dvb/metaparser.h>
@@ -311,6 +313,12 @@ off_t eM2TSFile::length()
 
 eServiceFactoryM2TS::eServiceFactoryM2TS()
 {
+    struct stat dummy;
+    if (stat("/usr/lib/libpassthrough.so", &dummy) != 0)
+    {
+	   eDebug("eServiceFactoryM2TS aborted, no /usr/lib/libpassthrough.so");
+	   return;
+    }
	ePtr<eServiceCenter> sc;
	eServiceCenter::getPrivInstance(sc);
	if (sc)
-- 
1.7.1

[xener]

may be you need to read this:
http://www.kernel.or...ser-manual.html

[yousif666]

i saw the section where i am having problem with and after reading still.

[yousif666]

and when i run the command git show

this show up.

commit 541e4edf53c690e5bdde7b29c6b48a9d8c893fcd
Author: Mike Looijmans <milo-software@users.sourceforge.net>
Date:   Fri Mar 4 20:21:31 2011 +0100

    servicem2ts: Skip when libpassthrough is not present

diff --git a/lib/service/servicem2ts.cpp b/lib/service/servicem2ts.cpp
index e79907d..5ab5b86 100644
--- a/lib/service/servicem2ts.cpp
+++ b/lib/service/servicem2ts.cpp
@@ -1,3 +1,5 @@
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 #include <lib/dvb/metaparser.h>
@@ -311,6 +313,12 @@ off_t eM2TSFile::length()
 
 eServiceFactoryM2TS::eServiceFactoryM2TS()
 {
+	  struct stat dummy;
+	  if (stat("/usr/lib/libpassthrough.so", &dummy) != 0)
+	  {
+			eDebug("eServiceFactoryM2TS aborted, no /usr/lib/libpassthrough.
+			return;
+	  }
	   ePtr<eServiceCenter> sc;
	   eServiceCenter::getPrivInstance(sc);
	   if (sc)

it dont show my changes.