17 replies to this topic

[christophecvr]

@pieterg

Hello with this message git patch for oscam.

Problem off breaking down nightly builds should be solved, was related to SVNDIR location.
Changed sequence, should avoid download problems.

gr christophe

Attached Files

•  oscamgitpatch.tar.gz   1.45KB   40 downloads

Edited by christophecvr, 1 October 2012 - 18:15.

[Erik Slagter]

Here the patch inline for easy review:

From bbb1fe5e0c36cd6f50e8197ee91d924047360339 Mon Sep 17 00:00:00 2001
From: christophecvr <stefansat@telenet.be>
Date: Mon, 1 Oct 2012 18:55:56 +0200
Subject: [PATCH] Sets  Oscam utils,stable and experimental to autorev Fetch
 error which breaks down nightly builds should be fixed
 branch softcams

modified:   meta-openpli/conf/distro/include/openpli-unstable-versions.inc
modified:   meta-openpli/recipes-openpli/enigma2-softcams/oscam-experimental.bb
modified:   meta-openpli/recipes-openpli/enigma2-softcams/oscam-stable.bb
modified:   meta-openpli/recipes-openpli/enigma2-softcams/oscam-unstable.bb
modified:   meta-openpli/recipes-openpli/enigma2-softcams/oscam-util-list-smargo.bb
modified:   meta-openpli/recipes-openpli/enigma2-softcams/softcams-enigma2-meta.bb
---
 .../distro/include/openpli-unstable-versions.inc   |    7 ++++---
 .../enigma2-softcams/oscam-experimental.bb         |    1 +
 .../enigma2-softcams/oscam-stable.bb               |    4 ++--
 .../enigma2-softcams/oscam-unstable.bb             |    1 +
 .../enigma2-softcams/oscam-util-list-smargo.bb     |    4 +++-
 .../enigma2-softcams/softcams-enigma2-meta.bb      |    5 +----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/meta-openpli/conf/distro/include/openpli-unstable-versions.inc b/meta-openpli/conf/distro/include/openpli-unstable-versions.inc
index 7a2f198..30e0065 100644
--- a/meta-openpli/conf/distro/include/openpli-unstable-versions.inc
+++ b/meta-openpli/conf/distro/include/openpli-unstable-versions.inc
@@ -45,9 +45,10 @@ SRCREV_pn-tuxbox-common ?= "${AUTOREV}"
 SRCREV_pn-tuxterm ?= "${AUTOREV}"
 SRCREV_pn-enigma2-plugin-extensions-tuxcom ?= "${AUTOREV}"
 SRCREV_pn-enigma2-plugin-extensions-tuxterm ?= "${AUTOREV}"
-SRCREV_pn-oscam-experimental ?= "7365"
-SRCREV_pn-oscam-unstable = "6089"
-SRCREV_pn-oscam-util-list-smargo = "7363"
+SRCREV_pn-oscam-experimental ?= "${AUTOREV}"
+SRCREV_pn-oscam-unstable ?= "7550"
+SRCREV_pn-oscam-util-list-smargo ?= "${AUTOREV}"
+SRCREV_pn-oscam-stable ?= "${AUTOREV}"

 RYTECSETTINGS_SRCDATE ?= "20120614"
 SRCDATE_enigma2-plugin-settings-rytec-13e19e23e28e ?= "${RYTECSETTINGS_SRCDATE}"
diff --git a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-experimental.bb b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-experimental.bb
index 075d7c9..1b17eac 100644
--- a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-experimental.bb
+++ b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-experimental.bb
@@ -2,6 +2,7 @@ MODULE = "trunk"
 OSCAMBIN = "oscam-experimental"
 LIBUSB = "-DHAVE_LIBUSB=1"

+SVNDIR= "${DL_DIR}/svn/experimental"
 SUBURI = "svn/oscam;module=trunk;proto=http;scmdata=keep"

 ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-stable.bb b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-stable.bb
index 9b7bd46..f6c628d 100644
--- a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-stable.bb
+++ b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-stable.bb
@@ -1,9 +1,9 @@
-SRCREV = "5741"
 MODULE = "1.10"
 OSCAMBIN = "oscam-stable"
 LIBUSB = "-DHAVE_LIBUSB=0"

-SUBURI = "svn/oscam/tags;module=1.10;proto=http;scmdata=keep;rev=${SRCREV}"
+SVNDIR= "${DL_DIR}/svn/stable"
+SUBURI = "svn/oscam/tags;module=1.10;proto=http;scmdata=keep"

 ALTERNATIVE_PRIORITY = "10"

diff --git a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-unstable.bb b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-unstable.bb
index 64d65b1..3027c08 100644
--- a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-unstable.bb
+++ b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-unstable.bb
@@ -2,6 +2,7 @@ MODULE = "1.10"
 OSCAMBIN = "oscam-unstable"
 LIBUSB = "-DHAVE_LIBUSB=0"

+SVNDIR= "${DL_DIR}/svn/unstable"
 SUBURI = "svn/oscam/tags;module=1.10;proto=http;scmdata=keep"

 ALTERNATIVE_PRIORITY = "10"
diff --git a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-util-list-smargo.bb b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-util-list-smargo.bb
index 159098c..0022838 100644
--- a/meta-openpli/recipes-openpli/enigma2-softcams/oscam-util-list-smargo.bb
+++ b/meta-openpli/recipes-openpli/enigma2-softcams/oscam-util-list-smargo.bb
@@ -4,12 +4,14 @@ LICENSE = "GPLv3"
 PV = "svn${SRCPV}"
 PR = "r1"

-DEPENDS = "libusb"
+DEPENDS = "libusb enigma2-plugin-softcams-oscam-unstable enigma2-plugin-softcams-oscam-experimental enigma2-plugin-softcams-oscam-unstable-cs enigma2-plugin-softcams-oscam-experimental-cs"
+#DEPENDS = "

 INHIBIT_PACKAGE_STRIP = "1"

 include oscamurl.inc

+SVNDIR= "${DL_DIR}/svn/utils"
 SRC_URI = " \
  svn://${OSCAMHOST}/svn/oscam/trunk;module=utils;proto=http;scmdata=keep \
  "
diff --git a/meta-openpli/recipes-openpli/enigma2-softcams/softcams-enigma2-meta.bb b/meta-openpli/recipes-openpli/enigma2-softcams/softcams-enigma2-meta.bb
index cdacb8a..1896412 100644
--- a/meta-openpli/recipes-openpli/enigma2-softcams/softcams-enigma2-meta.bb
+++ b/meta-openpli/recipes-openpli/enigma2-softcams/softcams-enigma2-meta.bb
@@ -11,12 +11,9 @@ DEPENDS = "\
  enigma2-plugin-softcams-mgcamd \
  enigma2-plugin-softcams-evocamd \
  enigma2-plugin-softcams-newcs \
+ oscam-util-list-smargo \
  enigma2-plugin-softcams-oscam-stable \
- enigma2-plugin-softcams-oscam-unstable \
- enigma2-plugin-softcams-oscam-experimental \
  enigma2-plugin-softcams-oscam-stable-cs \
- enigma2-plugin-softcams-oscam-unstable-cs \
- enigma2-plugin-softcams-oscam-experimental-cs \
  enigma2-plugin-softcams-rqcamd \
  enigma2-plugin-softcams-scam \
  "
-- 
1.7.9.5

[pieterg]

the oscam-util-list-smargo.bb DEPENDS are a copy/paste error I presume?

[christophecvr]

the oscam-util-list-smargo.bb DEPENDS are a copy/paste error I presume?

No it was initially meant like that, But now I changed it all, As large test done by me did reveal that problem was only the svn location of oscam in sources versus the LHIC check and make of tar.gz file.
Now that every version and utils are using different location no error does occur anymore also no ssh error anymore.

(the # depends was an typo)

With this the message I included the full reworked oscam.

Oscam stable is the old tag 1.10 which very very occasionally does has a change backported from 1.20 if it's a security isue or bug. It's set to autorev to have this changes.

Oscam unstable is now a fixed working revision of trunk (1.20) currently I used 7560. Libusb support is added to oscam-unstable as revision is high enough.

Oscam experimental is autorev now (it did not stole the name experimental)

The start script was buggy I adapted this and corrected the error. (The tmp file needs to be removed before stop sequence is initiated killall not needed)
It does work perfect by me like that. (The only thing is that there is need for a small correction in the softcams.py file which I will pas later on)

Attached Files

•  oscam.patch.txt   12.29KB   23 downloads

[pieterg]

from what I remember, we got connection servers on the buildserver, the errors did not really appear to be related to the svn download directory?

[christophecvr]

from what I remember, we got connection servers on the buildserver, the errors did not really appear to be related to the svn download directory?

By me this was also my first impression. I've been working and testing on it for more then a week, it always ended up with similar strange issues like ssh error (and ssh is not used by svn ) but well with the LHIC type check.

I initially thaught it was related to acces from same ip several times at the oscam svn webserver, but at the end I just first tried another way and strated a scripts over multiple terminals to download oscam and that is going whitout any problem. At last I discovered that source from different versions ended up to be written to same location in sources directory. and so screw up the check's . Now that every type is on another directory the problem does not occur anymore.

[Erik Slagter]

Every time when I completely rebuild an image at home, it breaks at compilation of oscam, simply because of connection issues with oscam svn. It is simply that and nothing else.

For that and because it simply works easier, I switched to the git mirror. I don't think that will be a solution for an official image though, the mirror is not officially endorsed by the authors and it doesn't feature the "stable" "unstable" and "experimental" trunks, it's just plain last of the bill.

[christophecvr]

Every time when I completely rebuild an image at home, it breaks at compilation of oscam, simply because of connection issues with oscam svn. It is simply that and nothing else.

For that and because it simply works easier, I switched to the git mirror. I don't think that will be a solution for an official image though, the mirror is not officially endorsed by the authors and it doesn't feature the "stable" "unstable" and "experimental" trunks, it's just plain last of the bill.

Sorry but this is now just solved with my patch,

If You do not believe it,

First just do a new fresh build of image (and a complete one)
Then apply this patch.
And then do the feed build , You will see it does work out.

Just like You all I lost more then a month in trying to find a solution to it because a was misleaded and thaught it was the acces to oscam server but it wasn't . It spend hours and hours and rebuilds and rebuilds. To find it out.
The only reason was the similar location of svn repo into source.

Edited by christophecvr, 2 October 2012 - 21:16.

[littlesat]

That is why.....

simply because of connection issues with oscam svn.

a lot of times our nightly builds are not build.....
The connection to oscam's svn is intermittent.... (possibly espicially at night).

[Erik Slagter]

I have had network probes on it. The SVN server simply does not respond to a connection setup (SYN packets), there are no ACK packets coming back, period.

It's intermittently both at day and at night.

[christophecvr]

Then just take this patch to one fix oscam

Attached Files

•  oscam.patch.txt   111.32KB   19 downloads

[christophecvr]

It was actually so big fle I put the patch in tar bal

Attached Files

•  ToOneOscamGitpatch.tar.gz   12.5KB   8 downloads

[Erik Slagter]

I don't understand how a patch to the build environment wil solve connectivity issues with the svn server? Unless it means another svn server is used?

[christophecvr]

I don't understand how a patch to the build environment wil solve connectivity issues with the svn server? Unless it means another svn server is used?

Indeed that oscam server drops down now and then it's possible.

But I just removed all autorev, and removed all different oscam's .

Now only just one oscam which is trunk fixed revision.

That's all

[Erik Slagter]

But we don't want a fixed revision, we want nightly builds...

[christophecvr]

But we don't want a fixed revision, we want nightly builds...

Dan hier de git patch met autorev

Alle oscam-experimental,stable,unstable en niet meer nodige files zijn verwijderd.

Er is enkel een oscam genaamd oscam en deze is de trunk (1.20) en zal altijd de laatst beschikbare zijn op ogenblik van build.

Deze patch kan niet geëditeerd worden met text verwerker. Enkel uitpakken is mogelijk vandaar dat hij in tar.gz is

en dan toepassen vanuit de .../ openpli-oe-core map met git apply <mapwaar patch is>/oscam.patch

meer kan ik ook niet doen.

Attached Files

•  ToOneOscamGitpatchAutorev.tar.gz   12.6KB   11 downloads

[BuGless]

For that and because it simply works easier, I switched to the git mirror. I don't think that will be a solution for an official image though, the mirror is not officially endorsed by the authors and it doesn't feature the "stable" "unstable" and "experimental" trunks, it's just plain last of the bill.

If the official SVN repository supports different trunks *and* one would like to have all of these trunks available on the git mirror, I can arrange for that. As far as "official mirror" is concerned, no it's not, it's a private mirror, but available for public use.

[Erik Slagter]

All of this is no problem. I don't want any other version than the "nightly build" in the image and I don't care whether the mirror is "official", actually, as long as the owner has no objections, which "he" doesn't, we now know.