Skip to contentSkip to conversation

fetch2/local.py: avoid using PREMIRROR

PATCH In review Robert Yang 2 participants 6 messages Jan 4, 2016 – Jan 13, 2016

lore
Share & tools
lore
#0 lore raw

cover fetch2/local.py: avoid using PREMIRROR

The following changes since commit 2cd061a29a94fdcdfec86732e6bcbb71c12c4afc:

bluez5: include the patch only for 5.36 (2015-12-28 13:02:11 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib rbt/local
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/local

Robert Yang (1):
fetch2/local.py: avoid using PREMIRROR

 bitbake/lib/bb/fetch2/local.py |    5 +++++
 1 file changed, 5 insertions(+)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 fetch2/local.py: avoid using PREMIRROR

The PREMIRROR isn't useful for "file://", so avoid using it, this is good for searching speed and can reduce useless lines in log.do_fetch.

---
 bitbake/lib/bb/fetch2/local.py |    5 +++++
 1 file changed, 5 insertions(+)
bitbake/lib/bb/fetch2/local.py +5 -0
index 2d921f7..7245651 100644
@@ -126,3 +126,8 @@ class Local(FetchMethod):
     def clean(self, urldata, d):
         return
 
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return False
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 15 lines · Robert Yang

The PREMIRROR isn't useful for "file://", so avoid using it, this is good for searching speed and can reduce useless lines in log.do_fetch.

---
 bitbake/lib/bb/fetch2/local.py |    5 +++++
 1 file changed, 5 insertions(+)
bitbake/lib/bb/fetch2/local.py +0 -0
index 2d921f7..7245651 100644

bitbake/lib/bb/fetch2/local.py class Local(FetchMethod): · line 133

Quoted 8 lines
bitbake/lib/bb/fetch2/local.py +5 -0
@@ -126,3 +126,8 @@ class Local(FetchMethod):
     def clean(self, urldata, d):
         return
 
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return False

Hi Robert,

I applied this but I think I'm going to have to revert this since it is in fact a valid use case.

The sstate.bbclass code sets up SSTATE_MIRRORS as PREMIRRORS. Its quite common to map those file:// urls to remote http:// urls and with the above change, this no longer works.

Cheers,

Richard

#3 lore raw
Quoted 27 lines · Richard Purdie
Quoted 15 lines · Robert Yang

The PREMIRROR isn't useful for "file://", so avoid using it, this is good for searching speed and can reduce useless lines in log.do_fetch.

---
  bitbake/lib/bb/fetch2/local.py |    5 +++++
  1 file changed, 5 insertions(+)
bitbake/lib/bb/fetch2/local.py +0 -0
index 2d921f7..7245651 100644

bitbake/lib/bb/fetch2/local.py class Local(FetchMethod): · line 133

Quoted 8 lines
bitbake/lib/bb/fetch2/local.py +5 -0
@@ -126,3 +126,8 @@ class Local(FetchMethod):
      def clean(self, urldata, d):
          return
 
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return False

Hi Robert,

Quoted 6 lines

I applied this but I think I'm going to have to revert this since it is in fact a valid use case.

The sstate.bbclass code sets up SSTATE_MIRRORS as PREMIRRORS. Its quite common to map those file:// urls to remote http:// urls and with the above change, this no longer works.

Sorry, I didn't realize that sstate.bbclass code sets up SSTATE_MIRRORS as PREMIRRORS. If file:// urls map to http://, I think that it should use bitbake/lib/bb/fetch2/wget.py ? Here is a patch for wget.py:

git://git.pokylinux.org/poky-contrib rbt/local.py
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/local.py

Robert Yang (1):
wget.py: use PREMIRROR

Subject: [PATCH 1/1] wget.py: use PREMIRROR

---
 bitbake/lib/bb/fetch2/wget.py |    7 +++++++
 1 file changed, 7 insertions(+)
bitbake/lib/bb/fetch2/wget.py +7 -0
index c8c6d5c..200f9aa 100644
@@ -540,3 +540,10 @@ class Wget(FetchMethod):
 
         return (self._check_latest_version(uri, package, package_regex,
                 current_version, ud, d), '')
+
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return True
+
Signature · 4 lines
1.7.9.5


// Robert
Quoted 7 lines

Cheers,

Richard

#4 lore raw
Quoted 66 lines · Robert Yang
Quoted 32 lines · Richard Purdie
Quoted 16 lines · Robert Yang

The PREMIRROR isn't useful for "file://", so avoid using it, this is
good for searching speed and can reduce useless lines in log.do_fetch.

---
  bitbake/lib/bb/fetch2/local.py |    5 +++++
  1 file changed, 5 insertions(+)
bitbake/lib/bb/fetch2/local.py +0 -0
index 2d921f7..7245651 100644

bitbake/lib/bb/fetch2/local.py class Local(FetchMethod): · line 133

Quoted 8 lines
bitbake/lib/bb/fetch2/local.py +5 -0
@@ -126,3 +126,8 @@ class Local(FetchMethod):
      def clean(self, urldata, d):
          return
 
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return False

Hi Robert,

I applied this but I think I'm going to have to revert this since it is
in fact a valid use case.

Quoted 5 lines

The sstate.bbclass code sets up SSTATE_MIRRORS as PREMIRRORS. Its quite
common to map those file:// urls to remote http:// urls and with the
above change, this no longer works.

Sorry, I didn't realize that sstate.bbclass code sets up SSTATE_MIRRORS
as PREMIRRORS. If file:// urls map to http://, I think that it should use
bitbake/lib/bb/fetch2/wget.py ? Here is a patch for wget.py:

git://git.pokylinux.org/poky-contrib rbt/local.py
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/local.py

Robert Yang (1):
wget.py: use PREMIRROR

Subject: [PATCH 1/1] wget.py: use PREMIRROR

---
  bitbake/lib/bb/fetch2/wget.py |    7 +++++++
  1 file changed, 7 insertions(+)
bitbake/lib/bb/fetch2/wget.py +0 -0
index c8c6d5c..200f9aa 100644
@@ -540,3 +540,10 @@ class Wget(FetchMethod):
 

bitbake/lib/bb/fetch2/wget.py class Wget(FetchMethod): · line 549

Quoted 10 lines
bitbake/lib/bb/fetch2/wget.py +7 -0
          return (self._check_latest_version(uri, package,
 package_regex,
                  current_version, ud, d), '')
+
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return True
+

With your patch reverted, sstate works as it should. The above is also the default so this second patcg doesn't change anything that I can see?

Cheers,

Richard

#5 lore raw
Quoted 67 lines · Richard Purdie
Quoted 66 lines · Robert Yang
Quoted 32 lines · Richard Purdie
Quoted 16 lines · Robert Yang

The PREMIRROR isn't useful for "file://", so avoid using it, this is
good for searching speed and can reduce useless lines in log.do_fetch.

---
   bitbake/lib/bb/fetch2/local.py |    5 +++++
   1 file changed, 5 insertions(+)
bitbake/lib/bb/fetch2/local.py +0 -0
index 2d921f7..7245651 100644

bitbake/lib/bb/fetch2/local.py class Local(FetchMethod): · line 133

Quoted 8 lines
bitbake/lib/bb/fetch2/local.py +5 -0
@@ -126,3 +126,8 @@ class Local(FetchMethod):
       def clean(self, urldata, d):
           return
 
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return False

Hi Robert,

I applied this but I think I'm going to have to revert this since it is
in fact a valid use case.

Quoted 5 lines

The sstate.bbclass code sets up SSTATE_MIRRORS as PREMIRRORS. Its quite
common to map those file:// urls to remote http:// urls and with the
above change, this no longer works.

Sorry, I didn't realize that sstate.bbclass code sets up SSTATE_MIRRORS
as PREMIRRORS. If file:// urls map to http://, I think that it should use
bitbake/lib/bb/fetch2/wget.py ? Here is a patch for wget.py:

git://git.pokylinux.org/poky-contrib rbt/local.py
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/local.py

Robert Yang (1):
wget.py: use PREMIRROR

Subject: [PATCH 1/1] wget.py: use PREMIRROR

---
   bitbake/lib/bb/fetch2/wget.py |    7 +++++++
   1 file changed, 7 insertions(+)
bitbake/lib/bb/fetch2/wget.py +0 -0
index c8c6d5c..200f9aa 100644
@@ -540,3 +540,10 @@ class Wget(FetchMethod):
 
Quoted 14 lines

bitbake/lib/bb/fetch2/wget.py class Wget(FetchMethod): · line 549

Quoted 10 lines
bitbake/lib/bb/fetch2/wget.py +7 -0
           return (self._check_latest_version(uri, package,
 package_regex,
                   current_version, ud, d), '')
+
+    def try_premirror(self, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        return True
+

With your patch reverted, sstate works as it should. The above is also the default so this second patcg doesn't change anything that I can see?

Yes, you're right, it doesn't change anything, I had misunderstood. Please revert it.

// Robert

Quoted 6 lines

Cheers,

Richard